From e9600b4a0771ae2fb5645c2767f684e7ec4adb0f Mon Sep 17 00:00:00 2001
From: Dmitry Nehaychik <4dmitr@gmail.com>
Date: Tue, 2 Jul 2019 16:18:09 +0300
Subject: [PATCH] feat: update to Angular 8, Nebular 4 (#2114)

---
 .travis.yml                                   |    2 -
 angular.json                                  |    1 +
 browserslist                                  |   12 +
 package-lock.json                             | 9416 +++++++----------
 package.json                                  |   57 +-
 src/app/@core/core.module.ts                  |    6 +-
 src/app/@core/mock/traffic-list.service.ts    |    4 +-
 .../components/footer/footer.component.scss   |    4 +-
 .../components/footer/footer.component.ts     |    2 +-
 .../components/header/header.component.html   |   39 +-
 .../components/header/header.component.scss   |  196 +-
 .../components/header/header.component.ts     |   75 +-
 src/app/@theme/components/index.ts            |    6 -
 .../layout-direction-switcher.component.ts    |   42 -
 .../search-input/search-input.component.scss  |    2 +-
 .../search-input/search-input.component.ts    |    2 +-
 .../switcher/switcher.component.scss          |  112 -
 .../components/switcher/switcher.component.ts |   60 -
 .../theme-settings.component.scss             |   91 -
 .../theme-settings.component.ts               |   70 -
 .../theme-switcher.component.html             |    7 -
 .../theme-switcher.component.scss             |   50 -
 .../theme-switcher.component.ts               |   19 -
 .../theme-switcher-list.component.scss        |   76 -
 .../themes-switcher-list.component.ts         |   51 -
 .../toggle-settings-button.component.scss     |  118 -
 .../toggle-settings-button.component.ts       |   37 -
 src/app/@theme/layouts/index.ts               |    1 -
 .../layouts/one-column/one-column.layout.scss |  152 +-
 .../layouts/one-column/one-column.layout.ts   |   39 +-
 .../@theme/layouts/sample/sample.layout.scss  |  182 -
 .../@theme/layouts/sample/sample.layout.ts    |  152 -
 .../three-columns/three-columns.layout.scss   |  152 +-
 .../three-columns/three-columns.layout.ts     |   33 +-
 .../two-columns/two-columns.layout.scss       |  153 +-
 .../layouts/two-columns/two-columns.layout.ts |   33 +-
 src/app/@theme/pipes/eva-icons.pipe.ts        |   50 -
 src/app/@theme/pipes/index.ts                 |    1 -
 .../window-mode-block-scroll.service.ts       |  132 +
 src/app/@theme/styles/_overrides.scss         |   68 +
 src/app/@theme/styles/font-size.scss          |    3 -
 src/app/@theme/styles/pace.theme.scss         |    6 +-
 src/app/@theme/styles/styles.scss             |    9 +-
 src/app/@theme/styles/theme.corporate.ts      |  340 +-
 src/app/@theme/styles/theme.cosmic.ts         |  370 +-
 src/app/@theme/styles/theme.dark.ts           |  350 +
 src/app/@theme/styles/theme.default.ts        |  343 +-
 src/app/@theme/styles/themes.scss             |  183 +-
 src/app/@theme/theme.module.ts                |  116 +-
 src/app/app-routing.module.ts                 |    8 +-
 src/app/app.module.ts                         |   28 +-
 .../bootstrap/bootstrap-routing.module.ts     |   33 -
 src/app/pages/bootstrap/bootstrap.module.ts   |   36 -
 .../block-level-buttons.component.html        |   16 -
 .../block-level-buttons.component.ts          |    8 -
 .../button-groups.component.html              |  144 -
 .../button-groups.component.scss              |   67 -
 .../button-groups/button-groups.component.ts  |   44 -
 .../bootstrap/buttons/buttons.component.html  |   23 -
 .../bootstrap/buttons/buttons.component.scss  |  103 -
 .../bootstrap/buttons/buttons.component.ts    |    9 -
 .../pages/bootstrap/buttons/buttons.module.ts |   38 -
 .../default-buttons.component.html            |   48 -
 .../default-buttons.component.scss            |  126 -
 .../default-buttons.component.ts              |  101 -
 .../dropdown-button.component.html            |   44 -
 .../dropdown-button.component.scss            |   13 -
 .../dropdown-button.component.ts              |   10 -
 .../hero-buttons/hero-buttons.component.html  |   72 -
 .../hero-buttons/hero-buttons.component.scss  |  135 -
 .../hero-buttons/hero-buttons.component.ts    |  180 -
 .../icon-buttons/icon-buttons.component.html  |   43 -
 .../icon-buttons/icon-buttons.component.scss  |   30 -
 .../icon-buttons/icon-buttons.component.ts    |    9 -
 .../shape-buttons.component.html              |   43 -
 .../shape-buttons.component.scss              |   30 -
 .../shape-buttons/shape-buttons.component.ts  |    9 -
 .../size-buttons/size-buttons.component.html  |   50 -
 .../size-buttons/size-buttons.component.scss  |   26 -
 .../size-buttons/size-buttons.component.ts    |    9 -
 .../form-inputs/form-inputs.component.html    |  235 -
 .../form-inputs/form-inputs.component.scss    |  130 -
 .../form-inputs/form-inputs.component.ts      |   12 -
 .../modals/modal/modal.component.html         |    1 -
 .../bootstrap/modals/modal/modal.component.ts |   33 -
 .../bootstrap/modals/modals.component.html    |   12 -
 .../bootstrap/modals/modals.component.scss    |    8 -
 .../bootstrap/modals/modals.component.ts      |   38 -
 .../charts/chartjs/chartjs.component.scss     |    2 +-
 src/app/pages/charts/charts.module.ts         |   10 +-
 src/app/pages/charts/d3/d3.component.scss     |   26 +-
 .../charts/echarts/echarts.component.scss     |    2 +-
 .../contacts/contacts.component.html          |   25 +-
 .../contacts/contacts.component.scss          |   61 +-
 .../dashboard/contacts/contacts.component.ts  |   14 +-
 .../pages/dashboard/dashboard.component.html  |    3 +-
 .../pages/dashboard/dashboard.component.scss  |    6 -
 .../pages/dashboard/dashboard.component.ts    |    4 +-
 src/app/pages/dashboard/dashboard.module.ts   |   26 +-
 .../electricity-chart.component.ts            |    2 +-
 .../electricity/electricity.component.html    |   82 +-
 .../electricity/electricity.component.scss    |  320 +-
 .../dashboard/kitten/kitten.component.html    |   25 +-
 .../dashboard/kitten/kitten.component.scss    |   52 +-
 .../rooms/player/player.component.html        |   95 +-
 .../rooms/player/player.component.scss        |  241 +-
 .../room-selector.component.html              |  166 +-
 .../room-selector.component.scss              |   57 +-
 .../room-selector/room-selector.component.ts  |   51 +-
 .../dashboard/rooms/rooms.component.scss      |   20 +-
 .../pages/dashboard/rooms/rooms.component.ts  |   21 +-
 .../security-cameras.component.html           |   65 +-
 .../security-cameras.component.scss           |  178 +-
 .../security-cameras.component.ts             |   38 +-
 .../dashboard/solar/solar.component.scss      |   47 +-
 .../pages/dashboard/solar/solar.component.ts  |    6 +-
 .../status-card/status-card.component.scss    |  150 +-
 .../status-card/status-card.component.ts      |    4 +-
 .../pages/dashboard/team/team.component.html  |   35 -
 .../pages/dashboard/team/team.component.scss  |   66 -
 .../pages/dashboard/team/team.component.ts    |    9 -
 .../temperature-dragger.component.html        |   21 +-
 .../temperature-dragger.component.scss        |   55 +-
 .../temperature-dragger.component.ts          |   37 +-
 .../temperature/temperature.component.html    |   70 +-
 .../temperature/temperature.component.scss    |  123 +-
 .../temperature/temperature.component.ts      |    8 +-
 .../traffic/traffic-chart.component.ts        |    6 +-
 .../dashboard/traffic/traffic.component.scss  |   36 +-
 .../dashboard/traffic/traffic.component.ts    |   21 +-
 .../dashboard/weather/weather.component.html  |   63 +-
 .../dashboard/weather/weather.component.scss  |  148 +-
 .../chart-panel-header.component.html         |   25 +-
 .../chart-panel-header.component.scss         |   44 +-
 .../chart-panel-summary.component.scss        |   42 +-
 .../chart-panel-summary.component.ts          |    6 +-
 .../charts-panel/charts-panel.component.scss  |   16 +-
 .../charts-panel/charts-panel.component.ts    |    4 +-
 .../charts/charts-common.component.scss       |    4 +-
 .../charts/orders-chart.component.ts          |    2 +-
 .../chart/country-orders-chart.component.scss |   19 +-
 .../chart/country-orders-chart.component.ts   |    4 +-
 .../country-orders.component.ts               |    2 +-
 .../map/country-orders-map.component.scss     |   45 +-
 .../map/country-orders-map.service.ts         |    2 +-
 src/app/pages/e-commerce/e-commerce.module.ts |   18 +
 .../earning-card-back.component.html          |    6 +-
 .../earning-card-back.component.scss          |   19 +-
 .../earning-card/earning-card.component.html  |    8 +-
 .../earning-card/earning-card.component.scss  |   27 +-
 .../earning-card/earning-card.component.ts    |    2 +-
 .../earning-card-front.component.html         |   22 +-
 .../earning-card-front.component.scss         |   90 +-
 .../legend-chart/legend-chart.component.html  |   10 +-
 .../legend-chart/legend-chart.component.scss  |   25 +-
 .../back-side/stats-area-chart.component.ts   |    5 +-
 .../back-side/stats-card-back.component.html  |   24 +-
 .../back-side/stats-card-back.component.scss  |   89 +-
 .../stats-card-front.component.html           |    8 +-
 .../stats-card-front.component.scss           |   72 +-
 .../profit-card/profit-card.component.html    |    8 +-
 .../profit-card/profit-card.component.scss    |   13 +-
 .../progress-section.component.html           |    4 +-
 .../progress-section.component.scss           |   42 +-
 .../slide-out/slide-out.component.html        |    9 +-
 .../slide-out/slide-out.component.scss        |   43 +-
 .../traffic-back-card.component.scss          |   18 +-
 .../back-side/traffic-bar-chart.component.ts  |    3 +-
 .../traffic-bar/traffic-bar.component.html    |   21 +-
 .../traffic-bar/traffic-bar.component.scss    |   94 +-
 .../traffic-front-card.component.html         |   28 +-
 .../traffic-front-card.component.scss         |  131 +-
 .../traffic-cards-header.component.html       |   16 +-
 .../traffic-cards-header.component.scss       |   10 +-
 .../traffic-reveal-card.component.html        |    4 +-
 .../traffic-reveal-card.component.scss        |   15 +-
 .../traffic-reveal-card.component.ts          |    2 +-
 .../user-activity.component.html              |   33 +
 .../user-activity.component.scss              |  148 +-
 .../user-activity/user-activity.component.ts  |   42 +-
 .../visitors-analytics-chart.component.scss   |    2 +-
 .../visitors-analytics-chart.component.ts     |    2 +-
 .../visitors-analytics.component.html         |    2 +-
 .../visitors-analytics.component.scss         |   18 +-
 .../visitors-statistics.component.html        |   11 +-
 .../visitors-statistics.component.scss        |   30 +-
 src/app/pages/editors/editors.module.ts       |    2 +
 .../accordion/accordion.component.scss        |   18 -
 .../alert/alert.component.html                |   18 +-
 .../calendar/calendar.component.html          |   20 +-
 .../calendar/calendar.component.scss          |   47 +-
 .../calendar/day-cell/day-cell.component.html |    6 +-
 .../calendar/day-cell/day-cell.component.scss |   15 +-
 .../extra-components/chat/chat.component.html |    2 +-
 .../extra-components/chat/chat.component.scss |    4 +-
 .../pages/extra-components/chat/messages.ts   |    2 +-
 .../extra-components-routing.module.ts        |   50 -
 .../extra-components.module.ts                |   61 +-
 .../infinite-list.component.scss              |   11 -
 .../interactive-progress-bar.component.html   |   12 +-
 .../interactive-progress-bar.component.scss   |    1 +
 .../interactive-progress-bar.component.ts     |   24 +-
 .../progress-bar/progress-bar.component.html  |   64 +-
 .../spinner-color.component.html              |   22 +-
 .../spinner-in-buttons.component.html         |    2 +-
 .../spinner-in-buttons.component.scss         |    4 +-
 .../spinner-in-tabs.component.html            |    4 +-
 .../spinner-sizes.component.html              |   22 +-
 .../spinner/spinner.component.scss            |    2 +-
 .../stepper/stepper.component.scss            |   12 -
 .../extra-components/tabs/tabs.component.scss |   27 -
 .../extra-components/tree/tree.component.html |   10 -
 .../extra-components/tree/tree.component.scss |   20 -
 .../extra-components/tree/tree.component.ts   |   33 -
 .../action-groups.component.html              |   17 -
 .../action-groups.component.scss              |   77 -
 .../action-groups/action-groups.component.ts  |    9 -
 .../button-elements.component.html            |   17 -
 .../button-elements.component.scss            |   15 -
 .../button-elements.component.ts              |   12 -
 .../forms/buttons/buttons.component.html      |  123 +-
 .../forms/buttons/buttons.component.scss      |  103 +-
 .../pages/forms/buttons/buttons.component.ts  |    4 +
 src/app/pages/forms/buttons/buttons.module.ts |   38 -
 .../default-buttons.component.html            |   44 -
 .../default-buttons.component.scss            |  130 -
 .../default-buttons.component.ts              |   47 -
 .../hero-buttons/hero-buttons.component.html  |   72 -
 .../hero-buttons/hero-buttons.component.scss  |  144 -
 .../hero-buttons/hero-buttons.component.ts    |  166 -
 .../labeled-actions-group.component.html      |   18 -
 .../labeled-actions-group.component.scss      |   60 -
 .../labeled-actions-group.component.ts        |    9 -
 .../outline-buttons.component.html            |   45 -
 .../outline-buttons.component.scss            |  130 -
 .../outline-buttons.component.ts              |   47 -
 .../shape-buttons.component.html              |   43 -
 .../shape-buttons.component.scss              |   30 -
 .../shape-buttons/shape-buttons.component.ts  |    9 -
 .../size-buttons/size-buttons.component.html  |   50 -
 .../size-buttons/size-buttons.component.scss  |   26 -
 .../size-buttons/size-buttons.component.ts    |    9 -
 .../form-inputs/form-inputs.component.html    |  151 +-
 .../form-inputs/form-inputs.component.scss    |  140 +-
 .../form-layouts/form-layouts.component.html  |   93 +-
 .../form-layouts/form-layouts.component.scss  |   28 +-
 src/app/pages/forms/forms-routing.module.ts   |   63 +-
 src/app/pages/forms/forms.module.ts           |   36 +-
 .../accordion/accordion.component.html        |    0
 .../layout/accordion/accordion.component.scss |    7 +
 .../accordion/accordion.component.ts          |    2 +-
 .../infinite-list.component.html              |    0
 .../infinite-list.component.scss              |    7 +
 .../infinite-list/infinite-list.component.ts  |    2 +-
 .../news-post-placeholder.component.html      |    0
 .../news-post-placeholder.component.scss      |    6 +-
 .../news-post-placeholder.component.ts        |    0
 .../news-post/news-post.component.html        |    0
 .../news-post/news-post.component.ts          |    2 +-
 src/app/pages/layout/layout-routing.module.ts |   58 +
 .../layout.component.ts}                      |    4 +-
 src/app/pages/layout/layout.module.ts         |   56 +
 .../list/fruits-list.ts                       |    0
 .../list/list.component.html                  |    0
 .../list/list.component.scss                  |    0
 .../list/list.component.ts                    |    0
 .../services => layout}/news.service.ts       |    0
 .../stepper/stepper.component.html            |    0
 .../layout/stepper/stepper.component.scss     |    8 +
 .../stepper/stepper.component.ts              |    0
 .../tabs/tabs.component.html                  |   14 +-
 src/app/pages/layout/tabs/tabs.component.scss |   10 +
 .../tabs/tabs.component.ts                    |    4 +-
 .../maps/bubble/bubble-map.component.scss     |    2 +-
 .../pages/maps/bubble/bubble-map.component.ts |    8 +-
 src/app/pages/maps/gmaps/gmaps.component.scss |    2 +-
 .../pages/maps/leaflet/leaflet.component.scss |    4 +-
 src/app/pages/maps/maps.module.ts             |    2 +
 .../maps/search-map/map/map.component.scss    |    2 +-
 .../search-map/search/search.component.ts     |    2 +-
 .../miscellaneous-routing.module.ts           |   30 +-
 .../miscellaneous/miscellaneous.module.ts     |   10 +-
 .../dialog-name-prompt.component.html         |    2 +-
 .../dialog-name-prompt.component.scss         |    4 +-
 .../modal-overlays/modal-overlays.module.ts   |   23 +-
 .../popovers/popover-examples.component.ts    |    6 +
 .../popovers/popovers.component.html          |   60 +-
 .../popovers/popovers.component.scss          |   22 +-
 .../toastr/toastr.component.html              |   61 +-
 .../toastr/toastr.component.scss              |   25 +-
 .../modal-overlays/toastr/toastr.component.ts |   28 +-
 .../tooltip/tooltip.component.html            |    4 +-
 .../tooltip/tooltip.component.scss            |    4 +
 .../window-form/window-form.component.scss    |    2 +-
 .../window/window.component.html              |    2 +-
 .../modal-overlays/window/window.component.ts |    4 +-
 src/app/pages/pages-menu.ts                   |  103 +-
 src/app/pages/pages-routing.module.ts         |  113 +-
 src/app/pages/pages.component.scss            |    2 +-
 src/app/pages/pages.component.ts              |    4 +-
 src/app/pages/pages.module.ts                 |   10 +-
 .../smart-table/smart-table.component.scss    |   55 +
 .../smart-table/smart-table.component.ts      |    6 +-
 src/app/pages/tables/tables-routing.module.ts |   16 +-
 src/app/pages/tables/tables.module.ts         |    7 +
 .../tables/tree-grid/tree-grid.component.html |   34 +
 .../tables/tree-grid/tree-grid.component.scss |   55 +
 .../tables/tree-grid/tree-grid.component.ts   |   98 +
 .../ui-features/grid/grid.component.scss      |    2 +-
 .../ui-features/icons/icons.component.html    |   28 +-
 .../ui-features/icons/icons.component.scss    |   28 +-
 .../ui-features/icons/icons.component.ts      |   71 +-
 .../typography/typography.component.html      |  336 +-
 .../typography/typography.component.scss      |   63 +-
 .../pages/ui-features/ui-features.module.ts   |    6 +
 src/assets/images/kitten-dark.png             |  Bin 0 -> 48440 bytes
 src/assets/images/square_pattern_cosmic.svg   |    2 +-
 src/index.html                                |    2 +
 src/polyfills.ts                              |   25 +-
 src/tsconfig.app.json                         |    1 -
 src/tsconfig.spec.json                        |    2 -
 tsconfig.json                                 |    3 +-
 tslint.json                                   |    6 +-
 323 files changed, 8331 insertions(+), 15071 deletions(-)
 create mode 100644 browserslist
 delete mode 100644 src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.ts
 delete mode 100644 src/app/@theme/components/switcher/switcher.component.scss
 delete mode 100644 src/app/@theme/components/switcher/switcher.component.ts
 delete mode 100644 src/app/@theme/components/theme-settings/theme-settings.component.scss
 delete mode 100644 src/app/@theme/components/theme-settings/theme-settings.component.ts
 delete mode 100644 src/app/@theme/components/theme-switcher/theme-switcher.component.html
 delete mode 100644 src/app/@theme/components/theme-switcher/theme-switcher.component.scss
 delete mode 100644 src/app/@theme/components/theme-switcher/theme-switcher.component.ts
 delete mode 100644 src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
 delete mode 100644 src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts
 delete mode 100644 src/app/@theme/components/toggle-settings-button/toggle-settings-button.component.scss
 delete mode 100644 src/app/@theme/components/toggle-settings-button/toggle-settings-button.component.ts
 delete mode 100644 src/app/@theme/layouts/sample/sample.layout.scss
 delete mode 100644 src/app/@theme/layouts/sample/sample.layout.ts
 delete mode 100644 src/app/@theme/pipes/eva-icons.pipe.ts
 create mode 100644 src/app/@theme/services/window-mode-block-scroll.service.ts
 create mode 100644 src/app/@theme/styles/_overrides.scss
 delete mode 100644 src/app/@theme/styles/font-size.scss
 create mode 100644 src/app/@theme/styles/theme.dark.ts
 delete mode 100644 src/app/pages/bootstrap/bootstrap-routing.module.ts
 delete mode 100644 src/app/pages/bootstrap/bootstrap.module.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/button-groups/button-groups.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/button-groups/button-groups.component.scss
 delete mode 100644 src/app/pages/bootstrap/buttons/button-groups/button-groups.component.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/buttons.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/buttons.component.scss
 delete mode 100644 src/app/pages/bootstrap/buttons/buttons.component.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/buttons.module.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.scss
 delete mode 100644 src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.scss
 delete mode 100644 src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.scss
 delete mode 100644 src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.scss
 delete mode 100644 src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.scss
 delete mode 100644 src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.ts
 delete mode 100644 src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.html
 delete mode 100644 src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.scss
 delete mode 100644 src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.ts
 delete mode 100644 src/app/pages/bootstrap/form-inputs/form-inputs.component.html
 delete mode 100644 src/app/pages/bootstrap/form-inputs/form-inputs.component.scss
 delete mode 100644 src/app/pages/bootstrap/form-inputs/form-inputs.component.ts
 delete mode 100644 src/app/pages/bootstrap/modals/modal/modal.component.html
 delete mode 100644 src/app/pages/bootstrap/modals/modal/modal.component.ts
 delete mode 100644 src/app/pages/bootstrap/modals/modals.component.html
 delete mode 100644 src/app/pages/bootstrap/modals/modals.component.scss
 delete mode 100644 src/app/pages/bootstrap/modals/modals.component.ts
 delete mode 100644 src/app/pages/dashboard/team/team.component.html
 delete mode 100644 src/app/pages/dashboard/team/team.component.scss
 delete mode 100644 src/app/pages/dashboard/team/team.component.ts
 create mode 100644 src/app/pages/e-commerce/user-activity/user-activity.component.html
 delete mode 100644 src/app/pages/extra-components/accordion/accordion.component.scss
 delete mode 100644 src/app/pages/extra-components/infinite-list/infinite-list.component.scss
 delete mode 100644 src/app/pages/extra-components/stepper/stepper.component.scss
 delete mode 100644 src/app/pages/extra-components/tabs/tabs.component.scss
 delete mode 100644 src/app/pages/extra-components/tree/tree.component.html
 delete mode 100644 src/app/pages/extra-components/tree/tree.component.scss
 delete mode 100644 src/app/pages/extra-components/tree/tree.component.ts
 delete mode 100644 src/app/pages/forms/buttons/action-groups/action-groups.component.html
 delete mode 100644 src/app/pages/forms/buttons/action-groups/action-groups.component.scss
 delete mode 100644 src/app/pages/forms/buttons/action-groups/action-groups.component.ts
 delete mode 100644 src/app/pages/forms/buttons/button-elements/button-elements.component.html
 delete mode 100644 src/app/pages/forms/buttons/button-elements/button-elements.component.scss
 delete mode 100644 src/app/pages/forms/buttons/button-elements/button-elements.component.ts
 delete mode 100644 src/app/pages/forms/buttons/buttons.module.ts
 delete mode 100644 src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
 delete mode 100644 src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss
 delete mode 100644 src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
 delete mode 100644 src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
 delete mode 100644 src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss
 delete mode 100644 src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
 delete mode 100644 src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.html
 delete mode 100644 src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.scss
 delete mode 100644 src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.ts
 delete mode 100644 src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.html
 delete mode 100644 src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.scss
 delete mode 100644 src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.ts
 delete mode 100644 src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.html
 delete mode 100644 src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.scss
 delete mode 100644 src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.ts
 delete mode 100644 src/app/pages/forms/buttons/size-buttons/size-buttons.component.html
 delete mode 100644 src/app/pages/forms/buttons/size-buttons/size-buttons.component.scss
 delete mode 100644 src/app/pages/forms/buttons/size-buttons/size-buttons.component.ts
 rename src/app/pages/{extra-components => layout}/accordion/accordion.component.html (100%)
 create mode 100644 src/app/pages/layout/accordion/accordion.component.scss
 rename src/app/pages/{extra-components => layout}/accordion/accordion.component.ts (84%)
 rename src/app/pages/{extra-components => layout}/infinite-list/infinite-list.component.html (100%)
 create mode 100644 src/app/pages/layout/infinite-list/infinite-list.component.scss
 rename src/app/pages/{extra-components => layout}/infinite-list/infinite-list.component.ts (94%)
 rename src/app/pages/{extra-components => layout}/infinite-list/news-post-placeholder/news-post-placeholder.component.html (100%)
 rename src/app/pages/{extra-components => layout}/infinite-list/news-post-placeholder/news-post-placeholder.component.scss (85%)
 rename src/app/pages/{extra-components => layout}/infinite-list/news-post-placeholder/news-post-placeholder.component.ts (100%)
 rename src/app/pages/{extra-components => layout}/infinite-list/news-post/news-post.component.html (100%)
 rename src/app/pages/{extra-components => layout}/infinite-list/news-post/news-post.component.ts (78%)
 create mode 100644 src/app/pages/layout/layout-routing.module.ts
 rename src/app/pages/{bootstrap/bootstrap.component.ts => layout/layout.component.ts} (65%)
 create mode 100644 src/app/pages/layout/layout.module.ts
 rename src/app/pages/{extra-components => layout}/list/fruits-list.ts (100%)
 rename src/app/pages/{extra-components => layout}/list/list.component.html (100%)
 rename src/app/pages/{extra-components => layout}/list/list.component.scss (100%)
 rename src/app/pages/{extra-components => layout}/list/list.component.ts (100%)
 rename src/app/pages/{extra-components/services => layout}/news.service.ts (100%)
 rename src/app/pages/{extra-components => layout}/stepper/stepper.component.html (100%)
 create mode 100644 src/app/pages/layout/stepper/stepper.component.scss
 rename src/app/pages/{extra-components => layout}/stepper/stepper.component.ts (100%)
 rename src/app/pages/{extra-components => layout}/tabs/tabs.component.html (98%)
 create mode 100644 src/app/pages/layout/tabs/tabs.component.scss
 rename src/app/pages/{extra-components => layout}/tabs/tabs.component.ts (91%)
 create mode 100644 src/app/pages/tables/smart-table/smart-table.component.scss
 create mode 100644 src/app/pages/tables/tree-grid/tree-grid.component.html
 create mode 100644 src/app/pages/tables/tree-grid/tree-grid.component.scss
 create mode 100644 src/app/pages/tables/tree-grid/tree-grid.component.ts
 create mode 100644 src/assets/images/kitten-dark.png

diff --git a/.travis.yml b/.travis.yml
index d95112d759..40439dbbcd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ sudo: false
 dist: trusty
 
 node_js:
-  - '8'
-  - '9'
   - '10'
 
 branches:
diff --git a/angular.json b/angular.json
index 22fa665901..ca277cd492 100644
--- a/angular.json
+++ b/angular.json
@@ -12,6 +12,7 @@
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "preserveSymlinks": true,
+            "rebaseRootRelativeCssUrls": true,
             "outputPath": "dist",
             "index": "src/index.html",
             "main": "src/main.ts",
diff --git a/browserslist b/browserslist
new file mode 100644
index 0000000000..c4588a609b
--- /dev/null
+++ b/browserslist
@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+IE 11
diff --git a/package-lock.json b/package-lock.json
index 43e307a716..66b5ccd084 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-admin",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -10,19 +10,19 @@
       "integrity": "sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ=="
     },
     "@angular-devkit/architect": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.12.1.tgz",
-      "integrity": "sha512-1ozBP0ZAApkSfuPpZ7b9vShU8smNxb98jW+65S12cPOxv1bVVxCj5sTmC3sSfXapgq/pMzblbaVSKOG7Ajz0vQ==",
+      "version": "0.800.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.800.2.tgz",
+      "integrity": "sha512-251GOQwI3254AtnGWZoHmjOMFcz7h6M3fPmRHpYuuhRPIwZnQCKaszYI7gaP9zR7uArLUwsuPo+YYz8lb6Giwg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "7.2.1",
-        "rxjs": "6.3.3"
+        "@angular-devkit/core": "8.0.2",
+        "rxjs": "6.4.0"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -31,64 +31,66 @@
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.12.1.tgz",
-      "integrity": "sha512-TpaMgKECEm1Tta4jkvZVzWdbq2OakIwVyYSzZ/7ARVe0FXhEjVLgWB1pYAdhRx+Hv4/E2ZSPJW1J3N3DTE4W4Q==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.12.1",
-        "@angular-devkit/build-optimizer": "0.12.1",
-        "@angular-devkit/build-webpack": "0.12.1",
-        "@angular-devkit/core": "7.2.1",
-        "@ngtools/webpack": "7.2.1",
-        "ajv": "6.6.2",
-        "autoprefixer": "9.4.3",
+      "version": "0.800.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.800.2.tgz",
+      "integrity": "sha512-RlYPEp5FVKosgzWhbI7llM3lGIxAYuCwEPloeUL4XaDasNe2zmLNUlYDVTrF7GpZRoAgiIejmT0HvvKfEuZNZQ==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.800.2",
+        "@angular-devkit/build-optimizer": "0.800.2",
+        "@angular-devkit/build-webpack": "0.800.2",
+        "@angular-devkit/core": "8.0.2",
+        "@ngtools/webpack": "8.0.2",
+        "ajv": "6.10.0",
+        "autoprefixer": "9.5.1",
+        "browserslist": "4.5.5",
+        "caniuse-api": "3.0.0",
         "circular-dependency-plugin": "5.0.2",
         "clean-css": "4.2.1",
-        "copy-webpack-plugin": "4.6.0",
-        "file-loader": "2.0.0",
+        "copy-webpack-plugin": "5.0.2",
+        "core-js": "3.0.1",
+        "file-loader": "3.0.1",
         "glob": "7.1.3",
-        "istanbul": "0.4.5",
         "istanbul-instrumenter-loader": "3.0.1",
-        "karma-source-map-support": "1.3.0",
+        "karma-source-map-support": "1.4.0",
         "less": "3.9.0",
         "less-loader": "4.1.0",
-        "license-webpack-plugin": "2.0.4",
-        "loader-utils": "1.1.0",
-        "mini-css-extract-plugin": "0.4.4",
+        "license-webpack-plugin": "2.1.1",
+        "loader-utils": "1.2.3",
+        "mini-css-extract-plugin": "0.6.0",
         "minimatch": "3.0.4",
-        "node-sass": "4.10.0",
-        "opn": "5.3.0",
+        "open": "6.2.0",
         "parse5": "4.0.0",
-        "portfinder": "1.0.17",
-        "postcss": "7.0.5",
-        "postcss-import": "12.0.0",
+        "postcss": "7.0.14",
+        "postcss-import": "12.0.1",
         "postcss-loader": "3.0.0",
-        "raw-loader": "0.5.1",
-        "rxjs": "6.3.3",
+        "raw-loader": "1.0.0",
+        "rxjs": "6.4.0",
+        "sass": "1.19.0",
         "sass-loader": "7.1.0",
-        "semver": "5.5.1",
+        "semver": "6.0.0",
         "source-map-loader": "0.2.4",
-        "source-map-support": "0.5.9",
-        "speed-measure-webpack-plugin": "1.2.3",
+        "source-map-support": "0.5.12",
+        "speed-measure-webpack-plugin": "1.3.1",
         "stats-webpack-plugin": "0.7.0",
         "style-loader": "0.23.1",
         "stylus": "0.54.5",
         "stylus-loader": "3.0.2",
-        "terser-webpack-plugin": "1.1.0",
-        "tree-kill": "1.2.0",
-        "webpack": "4.23.1",
-        "webpack-dev-middleware": "3.4.0",
-        "webpack-dev-server": "3.1.14",
-        "webpack-merge": "4.1.4",
+        "terser-webpack-plugin": "1.2.3",
+        "tree-kill": "1.2.1",
+        "webpack": "4.30.0",
+        "webpack-dev-middleware": "3.6.2",
+        "webpack-dev-server": "3.3.1",
+        "webpack-merge": "4.2.1",
         "webpack-sources": "1.3.0",
-        "webpack-subresource-integrity": "1.1.0-rc.6"
+        "webpack-subresource-integrity": "1.1.0-rc.6",
+        "worker-plugin": "3.1.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.6.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz",
-          "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -97,6 +99,12 @@
             "uri-js": "^4.2.2"
           }
         },
+        "core-js": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.1.tgz",
+          "integrity": "sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==",
+          "dev": true
+        },
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
@@ -130,18 +138,18 @@
           "dev": true
         },
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
         },
         "semver": {
-          "version": "5.5.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
-          "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
           "dev": true
         },
         "source-map": {
@@ -151,9 +159,9 @@
           "dev": true
         },
         "source-map-support": {
-          "version": "0.5.9",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
-          "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
+          "version": "0.5.12",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
           "dev": true,
           "requires": {
             "buffer-from": "^1.0.0",
@@ -163,15 +171,15 @@
       }
     },
     "@angular-devkit/build-optimizer": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.12.1.tgz",
-      "integrity": "sha512-zYea22pJ5kvMud8UBrdzIcR9F1FDYWJ3vwj5WRUFM0sF7mbbrmTC+OsIvNI7qDJuXWNZGySwNlHw0e+rhv30gg==",
+      "version": "0.800.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.800.2.tgz",
+      "integrity": "sha512-A/lX7Fjfeh5PspGURV8fJeOsrIYM/7why7mC6v78zdxaErd4S18wUXJDfndjx3qiKyuq76Uu4cQcS7XfClpb8Q==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0",
+        "loader-utils": "1.2.3",
         "source-map": "0.5.6",
-        "typescript": "3.2.2",
-        "webpack-sources": "1.2.0"
+        "typescript": "3.4.4",
+        "webpack-sources": "1.3.0"
       },
       "dependencies": {
         "source-map": {
@@ -181,46 +189,29 @@
           "dev": true
         },
         "typescript": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz",
-          "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
+          "version": "3.4.4",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.4.tgz",
+          "integrity": "sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==",
           "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz",
-          "integrity": "sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.6.1",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-              "dev": true
-            }
-          }
         }
       }
     },
     "@angular-devkit/build-webpack": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.12.1.tgz",
-      "integrity": "sha512-eDNgR2EV9/l4xYTkvS3861TthUv8ERBroWpMkkniX3HhpyjgaLyI5P1OB7fVMcF3RvJsxIlqYGRZ6zx7PjCbcA==",
+      "version": "0.800.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.800.2.tgz",
+      "integrity": "sha512-Bd/sazcriUTFQCGFDyUkjXSmpn8hRLIyLIXBLAn+5coH4Y4xNy8PXt+hnr6ffwu92h/WnyxKIJi44+5aoUBURA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.12.1",
-        "@angular-devkit/core": "7.2.1",
-        "rxjs": "6.3.3"
+        "@angular-devkit/architect": "0.800.2",
+        "@angular-devkit/core": "8.0.2",
+        "rxjs": "6.4.0",
+        "webpack-merge": "4.2.1"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -229,22 +220,22 @@
       }
     },
     "@angular-devkit/core": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.2.1.tgz",
-      "integrity": "sha512-zOozPswSM1cTkltw5LeSPoZ/fJ2d3vN304IVgKgrM5/Fs54bd7nTaBcAK+HvjKS+5KmykYrXW47Q4CdFJikluQ==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.0.2.tgz",
+      "integrity": "sha512-S2OPYe6Qu7qTS8Q2lzf4qNjXdbN/J2YVnd3wGauMI8Tih5tY/NzUW3h5ds09nRcjsdBDuT0qgf3IMlCZWIABvQ==",
       "dev": true,
       "requires": {
-        "ajv": "6.6.2",
-        "chokidar": "2.0.4",
+        "ajv": "6.10.0",
         "fast-json-stable-stringify": "2.0.0",
-        "rxjs": "6.3.3",
+        "magic-string": "0.25.2",
+        "rxjs": "6.4.0",
         "source-map": "0.7.3"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.6.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz",
-          "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -253,6 +244,176 @@
             "uri-js": "^4.2.2"
           }
         },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "rxjs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/schematics": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.0.2.tgz",
+      "integrity": "sha512-v+g0MOPADJJ5QNNmojCyh2sw1GOzadlbHPdTFqZOm77b2Bi79dRm+yuYMuY6a2nUt7DIcioLRcOFwV8UctajRg==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "8.0.2",
+        "rxjs": "6.4.0"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        }
+      }
+    },
+    "@angular/animations": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.0.0.tgz",
+      "integrity": "sha512-hggSRi83rmocLwzrKZtmFcqPdivKSJqp2yiYaiNmJ2yQWJ1JW/Lurypv9H347RWxmwCCwC2kV8embTGbOXIFDQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/cdk": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-8.0.0.tgz",
+      "integrity": "sha512-2vsRWEHNARe0iRmqgzvM67gwfRy+aKvdef4Qu9L+ndSsTrrZT3tSgG8SMn1v9SfBHnx5G8mo4d1AMquXG69AuQ==",
+      "requires": {
+        "parse5": "^5.0.0",
+        "tslib": "^1.7.1"
+      },
+      "dependencies": {
+        "parse5": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
+          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+          "optional": true
+        }
+      }
+    },
+    "@angular/cli": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.0.2.tgz",
+      "integrity": "sha512-xXSCwTKonC6nMqKPDlEFhXjKBu85jVB+KYo2tLU+RKtgFeIF/hTaUWQTvWXRwRsQAfBhB1cwe0oijdljOItTgw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.800.2",
+        "@angular-devkit/core": "8.0.2",
+        "@angular-devkit/schematics": "8.0.2",
+        "@schematics/angular": "8.0.2",
+        "@schematics/update": "0.800.2",
+        "@yarnpkg/lockfile": "1.1.0",
+        "debug": "^4.1.1",
+        "ini": "1.3.5",
+        "inquirer": "6.3.1",
+        "npm-package-arg": "6.1.0",
+        "open": "6.2.0",
+        "pacote": "9.5.0",
+        "read-package-tree": "5.2.2",
+        "semver": "6.0.0",
+        "symbol-observable": "1.2.0",
+        "universal-analytics": "^0.4.20",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+          "dev": true
+        }
+      }
+    },
+    "@angular/common": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.0.0.tgz",
+      "integrity": "sha512-iOAJZ0+1zTRHnHE/5G30+4Q66W1pfZkSkxZIXvgijZ+wtuNloYdWNy/IdZ/m7ayBI7A6FsYEhyMUoWz2HVEJNw==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/compiler": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.0.0.tgz",
+      "integrity": "sha512-4rKsVFMNykF83tPL1VE1+j9kZ3cWHUsLOAB/VqmF64EcR/GsbjKog2v23rSso5kqUtPiVq/FWGYllW6qMdxtJA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/compiler-cli": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.0.0.tgz",
+      "integrity": "sha512-Z0U0Ih8A7V3J1gq7AXnXbrGAD2ERmz7JbREJJRHDWiUNxIqGQiV3Odo1V8FL5n/cKvLwSYM2Ubvk10gb0+3njA==",
+      "dev": true,
+      "requires": {
+        "canonical-path": "1.0.0",
+        "chokidar": "^2.1.1",
+        "convert-source-map": "^1.5.1",
+        "dependency-graph": "^0.7.2",
+        "magic-string": "^0.25.0",
+        "minimist": "^1.2.0",
+        "reflect-metadata": "^0.1.2",
+        "shelljs": "^0.8.1",
+        "source-map": "^0.6.1",
+        "tslib": "^1.9.0",
+        "yargs": "13.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
         "anymatch": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@@ -261,6 +422,17 @@
           "requires": {
             "micromatch": "^3.1.4",
             "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
           }
         },
         "arr-diff": {
@@ -305,24 +477,46 @@
           }
         },
         "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
           "dev": true,
           "requires": {
             "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
             "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
+            "inherits": "^2.0.3",
             "is-binary-path": "^1.0.0",
             "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
+            "normalize-path": "^3.0.0",
             "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+              "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+              "dev": true,
+              "requires": {
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^4.0.0"
+              }
+            }
           }
         },
         "expand-brackets": {
@@ -453,12 +647,6 @@
             }
           }
         },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -482,3143 +670,1065 @@
             }
           }
         },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
+            "locate-path": "^3.0.0"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "nan": "^2.12.1",
+            "node-pre-gyp": "^0.12.0"
           },
           "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extglob": "^2.1.0"
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
               }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
               }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@angular-devkit/schematics": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.7.tgz",
-      "integrity": "sha512-XHrr63E6p9kLNR83D4AcUkdBFLw4yxeQihual3I88eJUPJdHAvQYkp1sBThlMkNmBWPVagUD4efknkUFfRkFmg==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "7.3.7",
-        "rxjs": "6.3.3"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
-          "integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.9.1",
-            "chokidar": "2.0.4",
-            "fast-json-stable-stringify": "2.0.0",
-            "rxjs": "6.3.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
-          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            },
+            "chownr": {
+              "version": "1.1.1",
+              "bundled": true,
               "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
               "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
+              "optional": true
             },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            "debug": {
+              "version": "4.1.1",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "ms": "^2.1.1"
               }
             },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
               "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
+              "optional": true
             },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.5",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
+                "minipass": "^2.2.1"
               }
             },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
               }
             },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+            "glob": {
+              "version": "7.1.3",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-descriptor": "^1.0.0"
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
               }
             },
-            "extend-shallow": {
+            "has-unicode": {
               "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "safer-buffer": ">= 2.1.2 < 3"
               }
-            }
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            },
+            "ignore-walk": {
+              "version": "3.0.1",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "minimatch": "^3.0.4"
               }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extglob": "^2.1.0"
+                "once": "^1.3.0",
+                "wrappy": "1"
               }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+            },
+            "inherits": {
+              "version": "2.0.3",
+              "bundled": true,
+              "dev": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
               "dev": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "number-is-nan": "^1.0.0"
               }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@angular/animations": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.11.tgz",
-      "integrity": "sha512-YlZATC4Gnd3eOBuSW/QqsMPHeJWVKR8yfen2qKgFO3waK+6qXHXIdRF3j81l07jlUx5kBw+f1OCEeHl2QChBiw==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/cdk": {
-      "version": "7.3.6",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.3.6.tgz",
-      "integrity": "sha512-ZuOz8nQk0bdo8YyNFcwnmSl4MPaQDAFTbLK29w4Vd/LfPnhBI3pAr0wVuPFb0fl3eSvvUrfTb/+kPbQcE07A0A==",
-      "requires": {
-        "parse5": "^5.0.0",
-        "tslib": "^1.7.1"
-      },
-      "dependencies": {
-        "parse5": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-          "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
-          "optional": true
-        }
-      }
-    },
-    "@angular/cli": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.3.7.tgz",
-      "integrity": "sha512-b8YT+HXkhpK1A6lo56VvnUb07s2DWJSKdyhlJ3vIKwlYRg5svcmxh+AS6Oz0rzcQc++a0I5IODd9yWrMAkCBog==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.13.7",
-        "@angular-devkit/core": "7.3.7",
-        "@angular-devkit/schematics": "7.3.7",
-        "@schematics/angular": "7.3.7",
-        "@schematics/update": "0.13.7",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "1.3.5",
-        "inquirer": "6.2.1",
-        "npm-package-arg": "6.1.0",
-        "opn": "5.4.0",
-        "pacote": "9.4.0",
-        "semver": "5.6.0",
-        "symbol-observable": "1.2.0"
-      },
-      "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.13.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.7.tgz",
-          "integrity": "sha512-1N4R7cuwbbz7Z76v0Fi5nkxg6eS6FA58Y7SnTYCxI2HRJ1lqlafRjr89eoKzzbCH8ZGa7NG0wfRXtUwF/IrGmQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "7.3.7",
-            "rxjs": "6.3.3"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
-          "integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.9.1",
-            "chokidar": "2.0.4",
-            "fast-json-stable-stringify": "2.0.0",
-            "rxjs": "6.3.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
-          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
               "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
               "dev": true,
               "requires": {
-                "is-descriptor": "^0.1.0"
+                "brace-expansion": "^1.1.7"
               }
             },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true
+            },
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
               }
             },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+            "minizlib": {
+              "version": "1.2.1",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
+                "minipass": "^2.2.1"
               }
             },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
               "dev": true,
               "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
+                "minimist": "0.0.8"
               }
             },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+            "ms": {
+              "version": "2.1.1",
+              "bundled": true,
               "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
+              "optional": true
             },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+            "needle": {
+              "version": "2.3.0",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-descriptor": "^1.0.0"
+                "debug": "^4.1.0",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
               }
             },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            "node-pre-gyp": {
+              "version": "0.12.0",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4"
               }
-            }
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "abbrev": "1",
+                "osenv": "^0.1.4"
               }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+            },
+            "npm-bundled": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.1",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extglob": "^2.1.0"
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
               }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-buffer": "^1.1.5"
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
               }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "opn": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-          "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-          "dev": true,
-          "requires": {
-            "is-wsl": "^1.1.0"
-          }
-        },
-        "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@angular/common": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.11.tgz",
-      "integrity": "sha512-78T65tt3zD0Oss6pyRvzLhPlTJMhPpXMCsJdr1s821i+/xg8TUzgU3Cqxvz37r3dysnY08r6BmEqJg3+fGxEwA==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/compiler": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.11.tgz",
-      "integrity": "sha512-PptrtUgzuxLtBFxcmkkmhr16Pu9A3xqRQGmgTKL2mzwpt/fZswYEv4QT2E5Br8f94UP5XPv+K30kY+exjPnFjg==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/compiler-cli": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.11.tgz",
-      "integrity": "sha512-JlyJcRdD0oltKbFKGA83g4+vitF4e7ReqAHYTGbNTDIicWhCXYwwGAqj0HYAUHsv9KnP9F5ojZOJ7FRIN7mPgw==",
-      "dev": true,
-      "requires": {
-        "canonical-path": "1.0.0",
-        "chokidar": "^2.1.1",
-        "convert-source-map": "^1.5.1",
-        "dependency-graph": "^0.7.2",
-        "magic-string": "^0.25.0",
-        "minimist": "^1.2.0",
-        "reflect-metadata": "^0.1.2",
-        "shelljs": "^0.8.1",
-        "source-map": "^0.6.1",
-        "tslib": "^1.9.0",
-        "yargs": "9.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          },
-          "dependencies": {
-            "normalize-path": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
               "dev": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
               "dev": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "wrappy": "1"
               }
-            }
-          }
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "chokidar": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
-          "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
               "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
+              "optional": true
             },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-extendable": "^0.1.0"
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
               }
             },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
               "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
               "requires": {
-                "kind-of": "^3.0.2"
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
               },
               "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
                   "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
+                  "optional": true
                 }
               }
             },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
               }
             },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+            "rimraf": {
+              "version": "2.6.3",
+              "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
+                "glob": "^7.1.3"
               }
             },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
               "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
-          "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "nan": "^2.9.2",
-            "node-pre-gyp": "^0.10.0"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ansi-regex": {
-              "version": "2.1.1",
-              "bundled": true,
-              "dev": true
-            },
-            "aproba": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "are-we-there-yet": {
-              "version": "1.1.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              }
-            },
-            "balanced-match": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "brace-expansion": {
-              "version": "1.1.11",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-              }
             },
-            "chownr": {
-              "version": "1.1.1",
+            "safer-buffer": {
+              "version": "2.1.2",
               "bundled": true,
               "dev": true,
               "optional": true
             },
-            "code-point-at": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true
-            },
-            "concat-map": {
-              "version": "0.0.1",
-              "bundled": true,
-              "dev": true
-            },
-            "console-control-strings": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true
-            },
-            "core-util-is": {
-              "version": "1.0.2",
+            "sax": {
+              "version": "1.2.4",
               "bundled": true,
               "dev": true,
               "optional": true
             },
-            "debug": {
-              "version": "2.6.9",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "deep-extend": {
-              "version": "0.6.0",
+            "semver": {
+              "version": "5.7.0",
               "bundled": true,
               "dev": true,
               "optional": true
             },
-            "delegates": {
-              "version": "1.0.0",
+            "set-blocking": {
+              "version": "2.0.0",
               "bundled": true,
               "dev": true,
               "optional": true
             },
-            "detect-libc": {
-              "version": "1.0.3",
+            "signal-exit": {
+              "version": "3.0.2",
               "bundled": true,
               "dev": true,
               "optional": true
             },
-            "fs-minipass": {
-              "version": "1.2.5",
+            "string-width": {
+              "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
-                "minipass": "^2.2.1"
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
               }
             },
-            "fs.realpath": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "gauge": {
-              "version": "2.7.4",
+            "string_decoder": {
+              "version": "1.1.1",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
+                "safe-buffer": "~5.1.0"
               }
             },
-            "glob": {
-              "version": "7.1.3",
+            "strip-ansi": {
+              "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
+                "ansi-regex": "^2.0.0"
               }
             },
-            "has-unicode": {
+            "strip-json-comments": {
               "version": "2.0.1",
               "bundled": true,
               "dev": true,
               "optional": true
             },
-            "iconv-lite": {
-              "version": "0.4.24",
+            "tar": {
+              "version": "4.4.8",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.3.4",
+                "minizlib": "^1.1.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.2"
               }
             },
-            "ignore-walk": {
-              "version": "3.0.1",
+            "util-deprecate": {
+              "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
-              "requires": {
-                "minimatch": "^3.0.4"
-              }
+              "optional": true
             },
-            "inflight": {
-              "version": "1.0.6",
+            "wide-align": {
+              "version": "1.1.3",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
+                "string-width": "^1.0.2 || 2"
               }
             },
-            "inherits": {
-              "version": "2.0.3",
+            "wrappy": {
+              "version": "1.0.2",
               "bundled": true,
               "dev": true
             },
-            "ini": {
-              "version": "1.3.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
+            "yallist": {
+              "version": "3.0.3",
               "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
               "dev": true,
               "requires": {
-                "number-is-nan": "^1.0.0"
+                "is-extglob": "^2.1.0"
               }
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
+            }
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+          "dev": true
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
               "dev": true,
               "requires": {
-                "brace-expansion": "^1.1.7"
+                "is-buffer": "^1.1.5"
               }
-            },
-            "minimist": {
-              "version": "0.0.8",
-              "bundled": true,
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "dev": true,
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+          "dev": true,
+          "optional": true
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "shelljs": {
+          "version": "0.8.3",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
+          "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.0.0",
+            "interpret": "^1.0.0",
+            "rechoir": "^0.6.2"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
               "dev": true
             },
-            "minipass": {
-              "version": "2.3.5",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.0"
-              }
-            },
-            "minizlib": {
-              "version": "1.2.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "bundled": true,
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
               "dev": true,
               "requires": {
-                "minimist": "0.0.8"
+                "ansi-regex": "^4.1.0"
               }
-            },
-            "ms": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "needle": {
-              "version": "2.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "debug": "^2.1.2",
-                "iconv-lite": "^0.4.4",
-                "sax": "^1.2.4"
-              }
-            },
-            "node-pre-gyp": {
-              "version": "0.10.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "detect-libc": "^1.0.2",
-                "mkdirp": "^0.5.1",
-                "needle": "^2.2.1",
-                "nopt": "^4.0.1",
-                "npm-packlist": "^1.1.6",
-                "npmlog": "^4.0.2",
-                "rc": "^1.2.7",
-                "rimraf": "^2.6.1",
-                "semver": "^5.3.0",
-                "tar": "^4"
-              }
-            },
-            "nopt": {
-              "version": "4.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1",
-                "osenv": "^0.1.4"
-              }
-            },
-            "npm-bundled": {
-              "version": "1.0.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "npm-packlist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
-              }
-            },
-            "npmlog": {
-              "version": "4.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-              }
-            },
-            "number-is-nan": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true
-            },
-            "object-assign": {
-              "version": "4.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "once": {
-              "version": "1.4.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "wrappy": "1"
-              }
-            },
-            "os-homedir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "os-tmpdir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "osenv": {
-              "version": "0.1.5",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-              }
-            },
-            "path-is-absolute": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "process-nextick-args": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "rc": {
-              "version": "1.2.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-              },
-              "dependencies": {
-                "minimist": {
-                  "version": "1.2.0",
-                  "bundled": true,
-                  "dev": true,
-                  "optional": true
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "2.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "rimraf": {
-              "version": "2.6.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "glob": "^7.1.3"
-              }
-            },
-            "safe-buffer": {
-              "version": "5.1.2",
-              "bundled": true,
-              "dev": true
-            },
-            "safer-buffer": {
-              "version": "2.1.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "sax": {
-              "version": "1.2.4",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "semver": {
-              "version": "5.6.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "signal-exit": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "string_decoder": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "strip-json-comments": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "tar": {
-              "version": "4.4.8",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.1.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.3.4",
-                "minizlib": "^1.1.1",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.2",
-                "yallist": "^3.0.2"
-              }
-            },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "wide-align": {
-              "version": "1.1.3",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "string-width": "^1.0.2 || 2"
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "yallist": {
-              "version": "3.0.3",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-          "dev": true,
-          "requires": {
-            "execa": "^0.7.0",
-            "lcid": "^1.0.0",
-            "mem": "^1.1.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "dev": true,
-          "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "shelljs": {
-          "version": "0.8.3",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
-          "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.0.0",
-            "interpret": "^1.0.0",
-            "rechoir": "^0.6.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        },
-        "upath": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-          "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
-          "dev": true
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
-          "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^2.0.0",
-            "read-pkg-up": "^2.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^7.0.0"
-          }
-        }
-      }
-    },
-    "@angular/core": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.11.tgz",
-      "integrity": "sha512-2FUgXbGn75D6HQESVVmnrjqP1l2YNwwIZISembzpr4WvTm0lxzq/9WsuPFJNWggwCerajyjYz+kDJT3RsonGZg==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/forms": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.11.tgz",
-      "integrity": "sha512-S7qpaA4lP4yU5HsOvPuf4bpDGiqP6YjwcWHcTkm1kx9oiHGvmUoQAkFw06SMh2YCsGi413Qqys/4L0H8+8Za2A==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/http": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.11.tgz",
-      "integrity": "sha512-v2imS3q8kxXyHcYXrsv7K4Ot4ZinyYEzJiDPndmIWDLerSMriDahKx3akX6BXYyaJ+a22sEu8JfBuO3tqc+WqQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/language-service": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.2.11.tgz",
-      "integrity": "sha512-hq6ROxnqghmKXwJ8eIPb0wlz/PSmVTpFNQGrk3H6BFdRxPIHxvYU94mcLiV0/rMLZsSSSd4oANRUQToJR9upUA==",
-      "dev": true
-    },
-    "@angular/platform-browser": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.11.tgz",
-      "integrity": "sha512-M/XB1TQDHx2Ni+2NR75Zc1N+UuwfAMwNcBaOxtKRLkZhpyOAneA0ZyqT2GQm6XTGxDwQhz6Q3wG6SwGTm9aLYg==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/platform-browser-dynamic": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.11.tgz",
-      "integrity": "sha512-MDwNjH0BKfYabTJtfKAy87o+pRVcHsCwlrkp8/LBGNS42vDuzWWNUepMRTf2SloDUthL9Tsibdl1LfbMhUoGpw==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@angular/router": {
-      "version": "7.2.11",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.11.tgz",
-      "integrity": "sha512-6TcXQgTCPrOgkGWkxO879t+kcMovno6VfN4xfqr36IMBRxhmeWFEhLJmsVGPa/TT4XZjYQXyBk57ZXmneUqjQQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@asymmetrik/ngx-leaflet": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@asymmetrik/ngx-leaflet/-/ngx-leaflet-3.0.1.tgz",
-      "integrity": "sha512-rQaqLM/n9gIPMKkNDOd3+H1kiQiuXtY5KVOM5cPJCoetaN9oIJrCATQHPRO47j1os8Wqcv5I0BKEH/EtTtVuiA=="
-    },
-    "@compodoc/compodoc": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.0.1.tgz",
-      "integrity": "sha512-+hXITPup4tL4Jh3lo52YojXvshjcna95IzFm5FxEBM3vpXK4D+e1y6v7uUsVW2UopXfxv16uXBKm6b3GiaPTaQ==",
-      "dev": true,
-      "requires": {
-        "@compodoc/ngd-transformer": "^2.0.0-alpha.4",
-        "cheerio": "^1.0.0-rc.2",
-        "chokidar": "^1.7.0",
-        "colors": "^1.1.2",
-        "commander": "2.11.0",
-        "findit": "^2.0.0",
-        "fs-extra": "^4.0.1",
-        "glob": "^7.1.2",
-        "gulp-util": "^3.0.8",
-        "handlebars": "^4.0.10",
-        "html-entities": "^1.2.1",
-        "json5": "^0.5.1",
-        "live-server": "1.1.0",
-        "lodash": "^4.17.3",
-        "lunr": "1.0.0",
-        "marked": "^0.3.6",
-        "os-name": "^2.0.1",
-        "shelljs": "^0.7.8",
-        "typescript": "2.5.2"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-          "dev": true
-        },
-        "typescript": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz",
-          "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=",
-          "dev": true
-        }
-      }
-    },
-    "@compodoc/ngd-core": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
-      "integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^1.0.1",
-        "fancy-log": "^1.3.2",
-        "typescript": "^2.4.2"
-      },
-      "dependencies": {
-        "typescript": {
-          "version": "2.9.2",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-          "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
-          "dev": true
-        }
-      }
-    },
-    "@compodoc/ngd-transformer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
-      "integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
-      "dev": true,
-      "requires": {
-        "@compodoc/ngd-core": "~2.0.0",
-        "dot": "^1.1.1",
-        "fs-extra": "^4.0.1",
-        "viz.js": "^1.8.0"
-      }
-    },
-    "@fortawesome/fontawesome-free": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.2.0.tgz",
-      "integrity": "sha512-4pgStJx9UmydKc7wwF6Xjw4dFqzUnQejeuP2aUNHWazayWbmMbrx5rieN9+oob4bUwkf1thS3am0Ko+uhFHpNA==",
-      "dev": true
-    },
-    "@nebular/auth": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-3.4.2.tgz",
-      "integrity": "sha512-GiU4Su0LWNQsOggHAMYKdkAbXNJVW+jlQre1hGjUeMRqKTXqvn8BkVqrt4q3dz4onBv8z1uxxw4Fegpw93po6w=="
-    },
-    "@nebular/bootstrap": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@nebular/bootstrap/-/bootstrap-3.4.2.tgz",
-      "integrity": "sha512-W/U9XPPk4dIdyg8ohZP114JGh8Fxjh9HwlgpsCkp8PLvUhaZS4u2Zs9bjbFo/Z38+NX/5U5eqmWgC/VigLA5XA=="
-    },
-    "@nebular/security": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@nebular/security/-/security-3.4.2.tgz",
-      "integrity": "sha512-xsR/4X3IQBL1atU6ABAg2nUnPdid1OvaFsTop/stoLxqV3hbwfdV/wxKSkL5DIBljY3c8L9vz5cw+IXcpXDMuQ=="
-    },
-    "@nebular/theme": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-3.4.2.tgz",
-      "integrity": "sha512-PB17tkTdITYMvRrch0M0o8nQiKa2ULEsk0CaV1FVysyiSANwR4VIYGlDb4JkZPTyK4SlPZ1mwVMImWAK7jlzLw==",
-      "requires": {
-        "intersection-observer": "0.5.0"
-      }
-    },
-    "@ng-bootstrap/ng-bootstrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.0.0.tgz",
-      "integrity": "sha512-jWVHRDUYppOSvzclP9d3lVWGUO+y0X9W6jdfyYehDkJCY0MFgtwefLYMtQ/NJ4niPzm2d/zZn+Bte48iIn0nKw==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "@ngtools/webpack": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.2.1.tgz",
-      "integrity": "sha512-/mpXSyaHBP+wfiEt/ZYNsnUmnDmdUkLL1rcNxDyxMxlrL246CtNUcMzYSVqYiKp7ufz6GNklY2QqUa9pcOlW6Q==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "7.2.1",
-        "enhanced-resolve": "4.1.0",
-        "rxjs": "6.3.3",
-        "tree-kill": "1.2.0",
-        "webpack-sources": "1.2.0"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz",
-          "integrity": "sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
-      }
-    },
-    "@schematics/angular": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.7.tgz",
-      "integrity": "sha512-X769unu8NViF4fjQhe3kFSLy2fmigWUJiTdEA76CPHsh5ka7trNhLaKcorXvYQDX+OhT5WHwBx5shg/3aJ3GYw==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "7.3.7",
-        "@angular-devkit/schematics": "7.3.7",
-        "typescript": "3.2.4"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
-          "integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.9.1",
-            "chokidar": "2.0.4",
-            "fast-json-stable-stringify": "2.0.0",
-            "rxjs": "6.3.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
-          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.1"
-          }
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@schematics/update": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.13.7.tgz",
-      "integrity": "sha512-7GiQiRkZlrPqINCWf/tKSUMfKz5dCwTFijkN/Hr0z2c679Q8kjiBnibNnzHG+zgmE7pH9gPRPvIa4hL+/zdtYw==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "7.3.7",
-        "@angular-devkit/schematics": "7.3.7",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "1.3.5",
-        "pacote": "9.4.0",
-        "rxjs": "6.3.3",
-        "semver": "5.6.0",
-        "semver-intersect": "1.4.0"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.7.tgz",
-          "integrity": "sha512-RRDCqSX4wF3Nxxls+W0BzCHz2HYWFP6bUpWxmzXF8EETGlZq/b/ZsEnVV41jtsqC4PCTks4k0qUFMaKE7XCupg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.9.1",
-            "chokidar": "2.0.4",
-            "fast-json-stable-stringify": "2.0.0",
-            "rxjs": "6.3.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.9.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
-          "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "normalize-path": "^2.1.1"
-          }
-        },
-        "arr-diff": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-          "dev": true
-        },
-        "array-unique": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-          "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.0",
-            "braces": "^2.3.0",
-            "fsevents": "^1.2.2",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.1",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "lodash.debounce": "^4.0.8",
-            "normalize-path": "^2.1.1",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.0.0",
-            "upath": "^1.0.5"
-          }
-        },
-        "expand-brackets": {
-          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-          "dev": true,
-          "requires": {
-            "debug": "^2.3.3",
-            "define-property": "^0.2.5",
-            "extend-shallow": "^2.0.1",
-            "posix-character-classes": "^0.1.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "0.2.5",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^0.1.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            },
-            "is-accessor-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-data-descriptor": {
-              "version": "0.1.4",
-              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-              "dev": true,
-              "requires": {
-                "kind-of": "^3.0.2"
-              },
-              "dependencies": {
-                "kind-of": {
-                  "version": "3.2.2",
-                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                  "dev": true,
-                  "requires": {
-                    "is-buffer": "^1.1.5"
-                  }
-                }
-              }
-            },
-            "is-descriptor": {
-              "version": "0.1.6",
-              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-              "dev": true,
-              "requires": {
-                "is-accessor-descriptor": "^0.1.6",
-                "is-data-descriptor": "^0.1.4",
-                "kind-of": "^5.0.0"
-              }
-            },
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        },
-        "extglob": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-          "dev": true,
-          "requires": {
-            "array-unique": "^0.3.2",
-            "define-property": "^1.0.0",
-            "expand-brackets": "^2.1.4",
-            "extend-shallow": "^2.0.1",
-            "fragment-cache": "^0.2.1",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "define-property": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-              "dev": true,
-              "requires": {
-                "is-descriptor": "^1.0.0"
-              }
-            },
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        },
-        "is-extglob": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
-        },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "ansi-regex": "^3.0.0"
           }
         },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+        "yargs": {
+          "version": "13.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz",
+          "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==",
           "dev": true,
           "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
+            "cliui": "^4.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.0.0"
           }
-        },
-        "isobject": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+        }
+      }
+    },
+    "@angular/core": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.0.0.tgz",
+      "integrity": "sha512-mrkP1PTzqCmZGLYll+TDyawLXHzi+FcRPqSuRxCmDMthUUE93SLXT2yISDkx9aMPtFKgFr6KfrIkKuCz16BP/g==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/forms": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.0.0.tgz",
+      "integrity": "sha512-T6XdG3mALWzvnrN3fA1hAmfwvraiF1SPMWNXgPk2riuMf8CFdoro+tQZ4eo1islHrTTw5QzmqN8JJALfhAG6bg==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/language-service": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.0.0.tgz",
+      "integrity": "sha512-vGk14oWroEo6ycO4cooznx57nn2sASmCQ/sdE8UVwySUKl940TsVzijgaGqapTepFof9sMqN77y2G15eRKQeAQ==",
+      "dev": true
+    },
+    "@angular/platform-browser": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.0.0.tgz",
+      "integrity": "sha512-fTD+pTMbq+On9Uv3VXiei2lfuX7GX31dngm/Y4yWTFeW6eXy0+7kkfflzpLOb0hykCZvcXzarqCuEBBYNLrrOg==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/platform-browser-dynamic": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0.tgz",
+      "integrity": "sha512-dx7W7JoSFbsveexjZ/BPlsXbMDLWVLmRCo7IqLvibMrTbdpaaOCNJIXJk1X+f7JJrQ7SwlZaVkoLCMoDWw6fmA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/router": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.0.0.tgz",
+      "integrity": "sha512-DGUTb8qpndE5m716xh00GxuC8o7qamlqbUruGB+SQD6ynU7s5yLGxtKffxqb1BT63+YewpsVxc2Koruvb1qjDw==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@asymmetrik/ngx-leaflet": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@asymmetrik/ngx-leaflet/-/ngx-leaflet-3.0.1.tgz",
+      "integrity": "sha512-rQaqLM/n9gIPMKkNDOd3+H1kiQiuXtY5KVOM5cPJCoetaN9oIJrCATQHPRO47j1os8Wqcv5I0BKEH/EtTtVuiA=="
+    },
+    "@compodoc/compodoc": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.0.1.tgz",
+      "integrity": "sha512-+hXITPup4tL4Jh3lo52YojXvshjcna95IzFm5FxEBM3vpXK4D+e1y6v7uUsVW2UopXfxv16uXBKm6b3GiaPTaQ==",
+      "dev": true,
+      "requires": {
+        "@compodoc/ngd-transformer": "^2.0.0-alpha.4",
+        "cheerio": "^1.0.0-rc.2",
+        "chokidar": "^1.7.0",
+        "colors": "^1.1.2",
+        "commander": "2.11.0",
+        "findit": "^2.0.0",
+        "fs-extra": "^4.0.1",
+        "glob": "^7.1.2",
+        "gulp-util": "^3.0.8",
+        "handlebars": "^4.0.10",
+        "html-entities": "^1.2.1",
+        "json5": "^0.5.1",
+        "live-server": "1.1.0",
+        "lodash": "^4.17.3",
+        "lunr": "1.0.0",
+        "marked": "^0.3.6",
+        "os-name": "^2.0.1",
+        "shelljs": "^0.7.8",
+        "typescript": "2.5.2"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
           "dev": true
         },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+        "typescript": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.2.tgz",
+          "integrity": "sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ=",
           "dev": true
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+        }
+      }
+    },
+    "@compodoc/ngd-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@compodoc/ngd-core/-/ngd-core-2.0.0.tgz",
+      "integrity": "sha512-6HpYvXRZBdIYFojWxW5EVNkhYPmblytCve62CNoYBSWfy++vTGH7Ypg2Bhjg2CsqeV8JOVxrPO7JM9M3MgWKEA==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^1.0.1",
+        "fancy-log": "^1.3.2",
+        "typescript": "^2.4.2"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "2.9.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+          "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
           "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+        }
+      }
+    },
+    "@compodoc/ngd-transformer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@compodoc/ngd-transformer/-/ngd-transformer-2.0.0.tgz",
+      "integrity": "sha512-9J0KkmuuuvDHxH0oREgrgbqdEFqcltQXIBofeYdIyMKzI3A+pN1Ji4zfi7x1ql0Ax7qQKemp8XWP+cCpP0qY+w==",
+      "dev": true,
+      "requires": {
+        "@compodoc/ngd-core": "~2.0.0",
+        "dot": "^1.1.1",
+        "fs-extra": "^4.0.1",
+        "viz.js": "^1.8.0"
+      }
+    },
+    "@fortawesome/fontawesome-free": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.2.0.tgz",
+      "integrity": "sha512-4pgStJx9UmydKc7wwF6Xjw4dFqzUnQejeuP2aUNHWazayWbmMbrx5rieN9+oob4bUwkf1thS3am0Ko+uhFHpNA==",
+      "dev": true
+    },
+    "@nebular/auth": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-4.1.0.tgz",
+      "integrity": "sha512-ClKY922f9sJGkJ0+66A/fYglHcHzSr9bgnBwz8EV8as83nuxYwXo7lIi4kHcE0VdY4bRAywqneSg/KusjD4+Og=="
+    },
+    "@nebular/bootstrap": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@nebular/bootstrap/-/bootstrap-4.1.0.tgz",
+      "integrity": "sha512-zAwjKhZ8/s3nMmA/JEGpfU4X37hR+UARSK64bbqRpfkOowuKO2LXAweK2sw0y6fAXAUq5K977rBOzczZjqmS+g=="
+    },
+    "@nebular/eva-icons": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@nebular/eva-icons/-/eva-icons-4.1.0.tgz",
+      "integrity": "sha512-ZN/vBjn6fZ//aQkj8nntZMRhyC6OzxES1MK8t64fQJmG0gNb9gUrgbQEJh9o3X1ZUYd6LZgerbZ5yLGCue8+wg=="
+    },
+    "@nebular/security": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@nebular/security/-/security-4.1.0.tgz",
+      "integrity": "sha512-S4u037/cmzMJo6faZE51B+cGlXimzM4irYSfMmkCr8yeuDt394urhBzTUDE7/dhW9AYo9jRAWW4i+V+wrnhOqw=="
+    },
+    "@nebular/theme": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-4.1.0.tgz",
+      "integrity": "sha512-pfYR7vrqcsJ0TBLXzQhk2FQbC9FXeQ5RR/timCkByswY/W87IhN10onSlLgm/DPlVvZq0T0vDBrl50/sjtU2xQ==",
+      "requires": {
+        "intersection-observer": "0.5.0"
+      }
+    },
+    "@ngtools/webpack": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.0.2.tgz",
+      "integrity": "sha512-5P0FHF4p5H/G9xGjOG9meDViXcdW3RPdJa2nX1gGpii3/dhFhmU4pxjKn1Bfs4x+PB9FQQvhSvGIBLNf+B4y5Q==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "8.0.2",
+        "enhanced-resolve": "4.1.0",
+        "rxjs": "6.4.0",
+        "tree-kill": "1.2.1",
+        "webpack-sources": "1.3.0"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
+            "tslib": "^1.9.0"
           }
-        },
+        }
+      }
+    },
+    "@schematics/angular": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.0.2.tgz",
+      "integrity": "sha512-mN9qsoBVpbY1Q7BP8WaiHsyDv+kl5WrIHw/9OASLrGZcoVY7+oj2CfznVq0XRwvVjDtm6ZFor5ruxLF9dQUOSw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "8.0.2",
+        "@angular-devkit/schematics": "8.0.2"
+      }
+    },
+    "@schematics/update": {
+      "version": "0.800.2",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.800.2.tgz",
+      "integrity": "sha512-HPjbzr/LfFLdMzi6zMQK8mPyLw+nt+m7OQsdoeOkFgHkHVfHrKQWcOGt4A0D6keDJ6K2g7W5CsqFR6/GMac7Mg==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "8.0.2",
+        "@angular-devkit/schematics": "8.0.2",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "1.3.5",
+        "pacote": "9.5.0",
+        "rxjs": "6.4.0",
+        "semver": "6.0.0",
+        "semver-intersect": "1.4.0"
+      },
+      "dependencies": {
         "rxjs": {
-          "version": "6.3.3",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
-          "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
         },
         "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
           "dev": true
         }
       }
@@ -3648,12 +1758,29 @@
       "integrity": "sha1-ytdV8Pxt57cPpuXgivqB70wiSN4=",
       "dev": true
     },
+    "@types/events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+      "dev": true
+    },
     "@types/geojson": {
       "version": "7946.0.1",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.1.tgz",
       "integrity": "sha512-BXY6tH16Snp/ZdX6cFlBD8yfEArcZemzxEGciXkMmp1/tU76oyqkxJq91JQzT8SXWzRPwj//dw0/FdCSnnT8mw==",
       "dev": true
     },
+    "@types/glob": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+      "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+      "dev": true,
+      "requires": {
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
     "@types/googlemaps": {
       "version": "3.30.4",
       "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.30.4.tgz",
@@ -3684,6 +1811,12 @@
         "@types/geojson": "*"
       }
     },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+      "dev": true
+    },
     "@types/node": {
       "version": "6.0.90",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz",
@@ -3728,175 +1861,179 @@
       }
     },
     "@webassemblyjs/ast": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.10.tgz",
-      "integrity": "sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.7.10",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.10",
-        "@webassemblyjs/wast-parser": "1.7.10"
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz",
-      "integrity": "sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz",
-      "integrity": "sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz",
-      "integrity": "sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz",
-      "integrity": "sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.7.10"
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz",
-      "integrity": "sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz",
-      "integrity": "sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ==",
-      "dev": true
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz",
-      "integrity": "sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz",
-      "integrity": "sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.10",
-        "@webassemblyjs/helper-buffer": "1.7.10",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.10",
-        "@webassemblyjs/wasm-gen": "1.7.10"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz",
-      "integrity": "sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.10.tgz",
-      "integrity": "sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
       "dev": true,
       "requires": {
-        "@xtuc/long": "4.2.1"
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.10.tgz",
-      "integrity": "sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz",
-      "integrity": "sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.10",
-        "@webassemblyjs/helper-buffer": "1.7.10",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.10",
-        "@webassemblyjs/helper-wasm-section": "1.7.10",
-        "@webassemblyjs/wasm-gen": "1.7.10",
-        "@webassemblyjs/wasm-opt": "1.7.10",
-        "@webassemblyjs/wasm-parser": "1.7.10",
-        "@webassemblyjs/wast-printer": "1.7.10"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz",
-      "integrity": "sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.10",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.10",
-        "@webassemblyjs/ieee754": "1.7.10",
-        "@webassemblyjs/leb128": "1.7.10",
-        "@webassemblyjs/utf8": "1.7.10"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz",
-      "integrity": "sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.10",
-        "@webassemblyjs/helper-buffer": "1.7.10",
-        "@webassemblyjs/wasm-gen": "1.7.10",
-        "@webassemblyjs/wasm-parser": "1.7.10"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz",
-      "integrity": "sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.10",
-        "@webassemblyjs/helper-api-error": "1.7.10",
-        "@webassemblyjs/helper-wasm-bytecode": "1.7.10",
-        "@webassemblyjs/ieee754": "1.7.10",
-        "@webassemblyjs/leb128": "1.7.10",
-        "@webassemblyjs/utf8": "1.7.10"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz",
-      "integrity": "sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.10",
-        "@webassemblyjs/floating-point-hex-parser": "1.7.10",
-        "@webassemblyjs/helper-api-error": "1.7.10",
-        "@webassemblyjs/helper-code-frame": "1.7.10",
-        "@webassemblyjs/helper-fsm": "1.7.10",
-        "@xtuc/long": "4.2.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.7.10",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz",
-      "integrity": "sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.10",
-        "@webassemblyjs/wast-parser": "1.7.10",
-        "@xtuc/long": "4.2.1"
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@xtuc/ieee754": {
@@ -3906,9 +2043,9 @@
       "dev": true
     },
     "@xtuc/long": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz",
-      "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
     "@yarnpkg/lockfile": {
@@ -3928,10 +2065,9 @@
       }
     },
     "abbrev": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "accepts": {
       "version": "1.3.4",
@@ -3944,19 +2080,16 @@
       }
     },
     "acorn": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+      "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
       "dev": true
     },
     "acorn-dynamic-import": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
-      "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^5.0.0"
-      }
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+      "dev": true
     },
     "add-stream": {
       "version": "1.0.0",
@@ -4050,8 +2183,7 @@
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "angular-tree-component": {
       "version": "7.2.0",
@@ -4109,8 +2241,7 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
       "version": "3.2.0",
@@ -4164,9 +2295,9 @@
       "dev": true
     },
     "app-root-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.1.0.tgz",
-      "integrity": "sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+      "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
       "dev": true
     },
     "append-transform": {
@@ -4181,14 +2312,12 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dev": true,
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -4203,6 +2332,16 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "aria-query": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+      "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7",
+        "commander": "^2.11.0"
+      }
+    },
     "arr-diff": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
@@ -4239,8 +2378,7 @@
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
     },
     "array-flatten": {
       "version": "2.1.2",
@@ -4309,14 +2447,12 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-      "dev": true
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "asn1.js": {
       "version": "4.10.1",
@@ -4330,11 +2466,12 @@
       }
     },
     "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "requires": {
+        "object-assign": "^4.1.1",
         "util": "0.10.3"
       },
       "dependencies": {
@@ -4346,7 +2483,7 @@
         },
         "util": {
           "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
           "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
           "dev": true,
           "requires": {
@@ -4367,6 +2504,12 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
+    },
     "async": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
@@ -4385,15 +2528,12 @@
     "async-foreach": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.2",
@@ -4402,96 +2542,24 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.4.3",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.3.tgz",
-      "integrity": "sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==",
+      "version": "9.5.1",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.1.tgz",
+      "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.3.6",
-        "caniuse-lite": "^1.0.30000921",
+        "browserslist": "^4.5.4",
+        "caniuse-lite": "^1.0.30000957",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.6",
+        "postcss": "^7.0.14",
         "postcss-value-parser": "^3.3.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
         "postcss-value-parser": {
           "version": "3.3.1",
           "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
           "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -4507,6 +2575,15 @@
       "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
       "dev": true
     },
+    "axobject-query": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+      "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7"
+      }
+    },
     "babel-code-frame": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
@@ -4637,8 +2714,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -4744,7 +2820,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "dev": true,
       "optional": true,
       "requires": {
         "tweetnacl": "^0.14.3"
@@ -4766,9 +2841,9 @@
       }
     },
     "big.js": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true
     },
     "binary-extensions": {
@@ -4787,8 +2862,6 @@
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "inherits": "~2.0.0"
       }
@@ -4878,15 +2951,14 @@
       }
     },
     "bootstrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0.tgz",
-      "integrity": "sha512-gulJE5dGFo6Q61V/whS6VM4WIyrlydXfCgkE+Gxe5hjrJ8rXLLZlALq7zq2RPhOc45PSwQpJkrTnc2KgD6cvmA=="
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+      "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
     },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4989,20 +3061,20 @@
       }
     },
     "browserslist": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.3.tgz",
-      "integrity": "sha512-Tx/Jtrmh6vFg24AelzLwCaCq1IUJiMDM1x/LPzqbmbktF8Zo7F9ONUpOWsFK6TtdON95mSMaQUWqi0ilc8xM6g==",
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.5.tgz",
+      "integrity": "sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000955",
-        "electron-to-chromium": "^1.3.122",
-        "node-releases": "^1.1.12"
+        "caniuse-lite": "^1.0.30000960",
+        "electron-to-chromium": "^1.3.124",
+        "node-releases": "^1.1.14"
       },
       "dependencies": {
         "electron-to-chromium": {
-          "version": "1.3.122",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz",
-          "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==",
+          "version": "1.3.155",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.155.tgz",
+          "integrity": "sha512-/ci/XgZG8jkLYOgOe3mpJY1onxPPTDY17y7scldhnSjjZqV6VvREG/LvwhRuV7BJbnENFfuDWZkSqlTh4x9ZjQ==",
           "dev": true
         }
       }
@@ -5039,8 +3111,7 @@
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
     },
     "builtin-status-codes": {
       "version": "3.0.0",
@@ -5061,26 +3132,62 @@
       "dev": true
     },
     "cacache": {
-      "version": "10.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
-      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "version": "11.3.2",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+      "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.1",
-        "chownr": "^1.0.1",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.1.11",
-        "lru-cache": "^4.1.1",
-        "mississippi": "^2.0.0",
+        "bluebird": "^3.5.3",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
         "mkdirp": "^0.5.1",
         "move-concurrently": "^1.0.1",
         "promise-inflight": "^1.0.1",
         "rimraf": "^2.6.2",
-        "ssri": "^5.2.4",
-        "unique-filename": "^1.1.0",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
         "y18n": "^4.0.0"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.15",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
         "rimraf": {
           "version": "2.6.3",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -5088,23 +3195,13 @@
           "dev": true,
           "requires": {
             "glob": "^7.1.3"
-          },
-          "dependencies": {
-            "glob": {
-              "version": "7.1.3",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-              "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-              "dev": true,
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            }
           }
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
         }
       }
     },
@@ -5151,19 +3248,29 @@
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
     },
     "camelcase-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
       "requires": {
         "camelcase": "^2.0.0",
         "map-obj": "^1.0.0"
       }
     },
+    "caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
     "caniuse-db": {
       "version": "1.0.30000810",
       "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000810.tgz",
@@ -5171,9 +3278,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30000955",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz",
-      "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==",
+      "version": "1.0.30000974",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz",
+      "integrity": "sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==",
       "dev": true
     },
     "canonical-path": {
@@ -5185,8 +3292,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "center-align": {
       "version": "0.1.3",
@@ -5314,9 +3420,9 @@
       "dev": true
     },
     "chrome-trace-event": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
-      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -5425,7 +3531,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
       "requires": {
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1",
@@ -5492,27 +3597,29 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "codelyzer": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
-      "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.0.1.tgz",
+      "integrity": "sha512-UVV76+/y1RwaxzCeGPFE3G4GFtfV42r3x8EmRd7XMNFLlLC0ewdtCqWTbvhwPQMxFZZ+OTLEOJNWfyPPn3QFWg==",
       "dev": true,
       "requires": {
         "app-root-path": "^2.1.0",
-        "css-selector-tokenizer": "^0.7.0",
+        "aria-query": "^3.0.0",
+        "axobject-query": "^2.0.2",
+        "css-selector-tokenizer": "^0.7.1",
         "cssauron": "^1.4.0",
+        "damerau-levenshtein": "^1.0.4",
         "semver-dsl": "^1.0.1",
         "source-map": "^0.5.7",
-        "sprintf-js": "^1.1.1"
+        "sprintf-js": "^1.1.2"
       },
       "dependencies": {
         "sprintf-js": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
-          "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
           "dev": true
         }
       }
@@ -5666,7 +3773,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -5711,18 +3817,18 @@
       "dev": true
     },
     "compressible": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz",
-      "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.38.0 < 2"
+        "mime-db": ">= 1.40.0 < 2"
       },
       "dependencies": {
         "mime-db": {
-          "version": "1.38.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
           "dev": true
         }
       }
@@ -5743,15 +3849,36 @@
       },
       "dependencies": {
         "accepts": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-          "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+          "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
           "dev": true,
           "requires": {
-            "mime-types": "~2.1.18",
-            "negotiator": "0.6.1"
+            "mime-types": "~2.1.24",
+            "negotiator": "0.6.2"
           }
         },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "negotiator": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+          "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+          "dev": true
+        },
         "on-headers": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
@@ -5769,8 +3896,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -5849,8 +3975,7 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -5859,10 +3984,21 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-      "dev": true
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        }
+      }
     },
     "content-type": {
       "version": "1.0.4",
@@ -6367,35 +4503,80 @@
       "dev": true
     },
     "copy-webpack-plugin": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
-      "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz",
+      "integrity": "sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==",
       "dev": true,
       "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
+        "cacache": "^11.3.1",
+        "find-cache-dir": "^2.0.0",
+        "glob-parent": "^3.1.0",
         "globby": "^7.1.1",
         "is-glob": "^4.0.0",
         "loader-utils": "^1.1.0",
         "minimatch": "^3.0.4",
-        "p-limit": "^1.0.0",
-        "serialize-javascript": "^1.4.0"
+        "normalize-path": "^3.0.0",
+        "p-limit": "^2.1.0",
+        "serialize-javascript": "^1.4.0",
+        "webpack-log": "^2.0.0"
       },
       "dependencies": {
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
         "is-extglob": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
           "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
           "dev": true
         },
-        "is-glob": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
           "dev": true,
           "requires": {
-            "is-extglob": "^2.1.1"
+            "p-try": "^2.0.0"
           }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
         }
       }
     },
@@ -6407,8 +4588,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
       "version": "2.2.2",
@@ -6471,13 +4651,15 @@
       }
     },
     "cross-spawn": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "lru-cache": "^4.0.1",
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
         "which": "^1.2.9"
       }
     },
@@ -6662,7 +4844,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
       "requires": {
         "array-find-index": "^1.0.1"
       }
@@ -7008,6 +5189,12 @@
         "d3-transition": "1"
       }
     },
+    "damerau-levenshtein": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
+      "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==",
+      "dev": true
+    },
     "dargs": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz",
@@ -7021,7 +5208,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       },
@@ -7029,8 +5215,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -7055,11 +5240,16 @@
         "ms": "2.0.0"
       }
     },
+    "debuglog": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz",
+      "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=",
+      "dev": true
+    },
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decamelize-keys": {
       "version": "1.1.0",
@@ -7083,50 +5273,14 @@
       "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
       "dev": true
     },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
     "default-gateway": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
-      "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
       "dev": true,
       "requires": {
-        "execa": "^0.10.0",
+        "execa": "^1.0.0",
         "ip-regex": "^2.1.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.10.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-          "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        }
       }
     },
     "default-require-extensions": {
@@ -7202,17 +5356,18 @@
       }
     },
     "del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
       "dev": true,
       "requires": {
+        "@types/glob": "^7.1.1",
         "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
       },
       "dependencies": {
         "globby": {
@@ -7235,20 +5390,73 @@
               "dev": true
             }
           }
+        },
+        "is-path-cwd": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.1.0.tgz",
+          "integrity": "sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==",
+          "dev": true
+        },
+        "is-path-in-cwd": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+          "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+          "dev": true,
+          "requires": {
+            "is-path-inside": "^2.1.0"
+          }
+        },
+        "is-path-inside": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.2"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "7.1.4",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+              "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+              "dev": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
         }
       }
     },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "depd": {
       "version": "1.1.2",
@@ -7293,6 +5501,16 @@
       "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
       "dev": true
     },
+    "dezalgo": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
+      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "dev": true,
+      "requires": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -7623,9 +5841,9 @@
       }
     },
     "duplexify": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
-      "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.0.0",
@@ -7648,7 +5866,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "dev": true,
       "optional": true,
       "requires": {
         "jsbn": "~0.1.0"
@@ -7695,6 +5912,12 @@
         "minimalistic-crypto-utils": "^1.0.0"
       }
     },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@@ -7859,7 +6082,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-      "dev": true,
       "requires": {
         "is-arrayish": "^0.2.1"
       }
@@ -7889,9 +6111,9 @@
       }
     },
     "es6-promise": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
-      "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==",
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
       "dev": true
     },
     "es6-promisify": {
@@ -7912,39 +6134,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "escodegen": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-      "dev": true,
-      "requires": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.2.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint-scope": {
       "version": "4.0.3",
@@ -7954,14 +6144,6 @@
       "requires": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-          "dev": true
-        }
       }
     },
     "esprima": {
@@ -7977,20 +6159,12 @@
       "dev": true,
       "requires": {
         "estraverse": "^4.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-          "dev": true
-        }
       }
     },
     "estraverse": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-      "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
       "dev": true
     },
     "esutils": {
@@ -8057,31 +6231,18 @@
       }
     },
     "execa": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dev": true,
       "requires": {
-        "cross-spawn": "^5.0.1",
-        "get-stream": "^3.0.0",
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
         "is-stream": "^1.1.0",
         "npm-run-path": "^2.0.0",
         "p-finally": "^1.0.0",
         "signal-exit": "^3.0.0",
         "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        }
       }
     },
     "execall": {
@@ -8162,51 +6323,51 @@
       }
     },
     "express": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.5",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
-        "body-parser": "1.18.3",
-        "content-disposition": "0.5.2",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
         "content-type": "~1.0.4",
-        "cookie": "0.3.1",
+        "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "~1.1.2",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.1.1",
+        "finalhandler": "~1.1.2",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
         "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
+        "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.4",
-        "qs": "6.5.2",
-        "range-parser": "~1.2.0",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
         "safe-buffer": "5.1.2",
-        "send": "0.16.2",
-        "serve-static": "1.13.2",
-        "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
         "accepts": {
-          "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-          "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+          "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
           "dev": true,
           "requires": {
-            "mime-types": "~2.1.18",
-            "negotiator": "0.6.1"
+            "mime-types": "~2.1.24",
+            "negotiator": "0.6.2"
           }
         },
         "array-flatten": {
@@ -8216,74 +6377,120 @@
           "dev": true
         },
         "body-parser": {
-          "version": "1.18.3",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
-          "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+          "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
           "dev": true,
           "requires": {
-            "bytes": "3.0.0",
+            "bytes": "3.1.0",
             "content-type": "~1.0.4",
             "debug": "2.6.9",
             "depd": "~1.1.2",
-            "http-errors": "~1.6.3",
-            "iconv-lite": "0.4.23",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
             "on-finished": "~2.3.0",
-            "qs": "6.5.2",
-            "raw-body": "2.3.3",
-            "type-is": "~1.6.16"
+            "qs": "6.7.0",
+            "raw-body": "2.4.0",
+            "type-is": "~1.6.17"
           }
         },
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "dev": true
+        },
+        "cookie": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+          "dev": true
+        },
         "finalhandler": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
-          "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
           "dev": true,
           "requires": {
             "debug": "2.6.9",
             "encodeurl": "~1.0.2",
             "escape-html": "~1.0.3",
             "on-finished": "~2.3.0",
-            "parseurl": "~1.3.2",
-            "statuses": "~1.4.0",
+            "parseurl": "~1.3.3",
+            "statuses": "~1.5.0",
             "unpipe": "~1.0.0"
           }
         },
         "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "version": "1.7.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
           "dev": true,
           "requires": {
             "depd": "~1.1.2",
             "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
           }
         },
         "iconv-lite": {
-          "version": "0.4.23",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "dev": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3"
           }
         },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "negotiator": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+          "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+          "dev": true
+        },
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+          "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+          "dev": true
+        },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+          "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
           "dev": true
         },
         "raw-body": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
-          "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+          "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
           "dev": true,
           "requires": {
-            "bytes": "3.0.0",
-            "http-errors": "1.6.3",
-            "iconv-lite": "0.4.23",
+            "bytes": "3.1.0",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
             "unpipe": "1.0.0"
           }
         },
@@ -8294,10 +6501,20 @@
           "dev": true
         },
         "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
           "dev": true
+        },
+        "type-is": {
+          "version": "1.6.18",
+          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+          "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+          "dev": true,
+          "requires": {
+            "media-typer": "0.3.0",
+            "mime-types": "~2.1.24"
+          }
         }
       }
     },
@@ -8392,8 +6609,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fancy-log": {
       "version": "1.3.2",
@@ -8423,14 +6639,7 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fastparse": {
       "version": "1.1.2",
@@ -8473,9 +6682,9 @@
       }
     },
     "file-loader": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz",
-      "integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz",
+      "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.0.2",
@@ -8527,14 +6736,14 @@
       }
     },
     "find-cache-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
-      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dev": true,
       "requires": {
         "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
-        "pkg-dir": "^2.0.0"
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
       }
     },
     "find-parent-dir": {
@@ -8614,13 +6823,65 @@
       "dev": true
     },
     "flush-write-stream": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.4"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "follow-redirects": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "for-in": {
@@ -8647,8 +6908,7 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.1.4",
@@ -8719,9 +6979,9 @@
       }
     },
     "fs-minipass": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
-      "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz",
+      "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==",
       "dev": true,
       "requires": {
         "minipass": "^2.2.1"
@@ -8742,8 +7002,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
       "version": "1.2.4",
@@ -9341,10 +7600,9 @@
       }
     },
     "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "dev": true,
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "requires": {
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
@@ -9368,7 +7626,6 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
       "requires": {
         "aproba": "^1.0.3",
         "console-control-strings": "^1.0.0",
@@ -9384,8 +7641,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
       "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "globule": "^1.0.0"
       }
@@ -9397,10 +7652,9 @@
       "dev": true
     },
     "get-caller-file": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
     },
     "get-pkg-repo": {
       "version": "1.4.0",
@@ -9418,14 +7672,28 @@
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
     },
     "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
     },
     "get-value": {
       "version": "2.0.6",
@@ -9437,7 +7705,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       },
@@ -9445,8 +7712,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -9773,7 +8039,6 @@
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -9832,8 +8097,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
       "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "glob": "~7.1.1",
         "lodash": "~4.17.10",
@@ -9843,9 +8106,7 @@
         "lodash": {
           "version": "4.17.11",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
         }
       }
     },
@@ -9861,8 +8122,7 @@
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "gulp-util": {
       "version": "3.0.8",
@@ -10067,7 +8327,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -10113,8 +8372,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "has-value": {
       "version": "1.0.0",
@@ -10237,8 +8495,7 @@
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
-      "dev": true
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
     },
     "hpack.js": {
       "version": "2.1.6",
@@ -10348,9 +8605,9 @@
       },
       "dependencies": {
         "agent-base": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-          "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
           "dev": true,
           "requires": {
             "es6-promisify": "^5.0.0"
@@ -10368,15 +8625,15 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
-      "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
       "dev": true,
       "requires": {
-        "http-proxy": "^1.16.2",
+        "http-proxy": "^1.17.0",
         "is-glob": "^4.0.0",
-        "lodash": "^4.17.5",
-        "micromatch": "^3.1.9"
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
       },
       "dependencies": {
         "arr-diff": {
@@ -10420,6 +8677,12 @@
             }
           }
         },
+        "eventemitter3": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+          "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
+          "dev": true
+        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -10571,6 +8834,17 @@
             }
           }
         },
+        "http-proxy": {
+          "version": "1.17.0",
+          "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+          "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+          "dev": true,
+          "requires": {
+            "eventemitter3": "^3.0.0",
+            "follow-redirects": "^1.0.0",
+            "requires-port": "^1.0.0"
+          }
+        },
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -10647,6 +8921,12 @@
           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
           "dev": true
         },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "dev": true
+        },
         "micromatch": {
           "version": "3.1.10",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -10833,60 +9113,6 @@
       "requires": {
         "pkg-dir": "^3.0.0",
         "resolve-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
       }
     },
     "imurmurhash": {
@@ -10898,15 +9124,12 @@
     "in-publish": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E="
     },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
       "requires": {
         "repeating": "^2.0.0"
       }
@@ -10927,7 +9150,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -10936,8 +9158,7 @@
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
       "version": "1.3.5",
@@ -10946,23 +9167,23 @@
       "dev": true
     },
     "inquirer": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz",
-      "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
+      "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
         "cli-cursor": "^2.1.0",
         "cli-width": "^2.0.0",
-        "external-editor": "^3.0.0",
+        "external-editor": "^3.0.3",
         "figures": "^2.0.0",
-        "lodash": "^4.17.10",
+        "lodash": "^4.17.11",
         "mute-stream": "0.0.7",
         "run-async": "^2.2.0",
-        "rxjs": "^6.1.0",
+        "rxjs": "^6.4.0",
         "string-width": "^2.1.0",
-        "strip-ansi": "^5.0.0",
+        "strip-ansi": "^5.1.0",
         "through": "^2.3.6"
       },
       "dependencies": {
@@ -10972,6 +9193,41 @@
           "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -11021,17 +9277,26 @@
               "dev": true
             }
           }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
     "internal-ip": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz",
-      "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
       "dev": true,
       "requires": {
-        "default-gateway": "^2.6.0",
-        "ipaddr.js": "^1.5.2"
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
       }
     },
     "interpret": {
@@ -11062,8 +9327,7 @@
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
     },
     "ionicons": {
       "version": "2.0.1",
@@ -11083,9 +9347,9 @@
       "dev": true
     },
     "ipaddr.js": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
       "dev": true
     },
     "irregular-plurals": {
@@ -11106,8 +9370,7 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-binary-path": {
       "version": "1.0.1",
@@ -11128,7 +9391,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "dev": true,
       "requires": {
         "builtin-modules": "^1.0.0"
       }
@@ -11219,7 +9481,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -11228,7 +9489,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
       "requires": {
         "number-is-nan": "^1.0.0"
       }
@@ -11373,136 +9633,55 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "isbinaryfile": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
-      "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-      "dev": true,
-      "requires": {
-        "isarray": "1.0.0"
-      }
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
-    "istanbul": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        },
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
-        }
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isbinaryfile": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
+      "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
       }
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
     "istanbul-api": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.2.2.tgz",
@@ -11692,8 +9871,7 @@
     "js-base64": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz",
-      "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==",
-      "dev": true
+      "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw=="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -11715,7 +9893,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
       "optional": true
     },
     "jsesc": {
@@ -11733,8 +9910,7 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.3.1",
@@ -11754,8 +9930,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.2",
@@ -11874,7 +10049,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -11885,8 +10059,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -11990,9 +10163,9 @@
       }
     },
     "karma-source-map-support": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz",
-      "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
+      "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
       "dev": true,
       "requires": {
         "source-map-support": "^0.5.5"
@@ -12005,9 +10178,9 @@
           "dev": true
         },
         "source-map-support": {
-          "version": "0.5.11",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz",
-          "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==",
+          "version": "0.5.12",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
           "dev": true,
           "requires": {
             "buffer-from": "^1.0.0",
@@ -12041,7 +10214,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
       "requires": {
         "invert-kv": "^1.0.0"
       }
@@ -12221,18 +10393,18 @@
           "optional": true
         },
         "mime-db": {
-          "version": "1.38.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
           "dev": true
         },
         "mime-types": {
-          "version": "2.1.22",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
           "dev": true,
           "requires": {
-            "mime-db": "~1.38.0"
+            "mime-db": "1.40.0"
           }
         },
         "oauth-sign": {
@@ -12330,20 +10502,10 @@
         "pify": "^3.0.0"
       }
     },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
     "license-webpack-plugin": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.0.4.tgz",
-      "integrity": "sha512-FQgOqrrIcD4C/VQo6ecWgXZULK5rs0kIDJtHcSVO6SBUrD63kEHZwmKOvBTquFQSgMQn/yeH68qooKDfqiBF2Q==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz",
+      "integrity": "sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==",
       "dev": true,
       "requires": {
         "@types/webpack-sources": "^0.1.5",
@@ -12498,7 +10660,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^2.2.0",
@@ -12510,8 +10671,7 @@
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
     },
@@ -12522,14 +10682,31 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
-      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
       "dev": true,
       "requires": {
-        "big.js": "^3.1.3",
+        "big.js": "^5.2.2",
         "emojis-list": "^2.0.0",
-        "json5": "^0.5.0"
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
       }
     },
     "locate-path": {
@@ -12601,25 +10778,12 @@
       "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
       "dev": true
     },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true,
-      "optional": true
-    },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
     "lodash.escape": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
@@ -12652,12 +10816,11 @@
         "lodash.isarray": "^3.0.0"
       }
     },
-    "lodash.mergewith": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
-      "dev": true,
-      "optional": true
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
     },
     "lodash.restparam": {
       "version": "3.6.1",
@@ -12698,6 +10861,12 @@
         "lodash.escape": "^3.0.0"
       }
     },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
     "log-symbols": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
@@ -12777,9 +10946,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
-      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.2.tgz",
+      "integrity": "sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==",
       "dev": true
     },
     "longest": {
@@ -12801,7 +10970,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
       "requires": {
         "currently-unhandled": "^0.4.1",
         "signal-exit": "^3.0.0"
@@ -12811,7 +10979,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
       "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-      "dev": true,
       "requires": {
         "pseudomap": "^1.0.2",
         "yallist": "^2.1.2"
@@ -12839,12 +11006,27 @@
       }
     },
     "make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
       "requires": {
-        "pify": "^3.0.0"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        }
       }
     },
     "make-error": {
@@ -12873,53 +11055,14 @@
       },
       "dependencies": {
         "agent-base": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-          "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
           "dev": true,
           "requires": {
             "es6-promisify": "^5.0.0"
           }
         },
-        "bluebird": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-          "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
-          "dev": true
-        },
-        "cacache": {
-          "version": "11.3.2",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.1.15",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          },
-          "dependencies": {
-            "lru-cache": {
-              "version": "5.1.1",
-              "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-              "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-              "dev": true,
-              "requires": {
-                "yallist": "^3.0.2"
-              }
-            }
-          }
-        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -12929,26 +11072,6 @@
             "ms": "^2.1.1"
           }
         },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
-        },
         "https-proxy-agent": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
@@ -12967,76 +11090,22 @@
           "requires": {
             "pseudomap": "^1.0.2",
             "yallist": "^2.1.2"
-          },
-          "dependencies": {
-            "yallist": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-              "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-              "dev": true
-            }
-          }
-        },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
     },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -13055,8 +11124,7 @@
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
     },
     "map-stream": {
       "version": "0.1.0",
@@ -13111,12 +11179,22 @@
       "dev": true
     },
     "mem": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        }
       }
     },
     "memory-fs": {
@@ -13133,7 +11211,6 @@
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
       "requires": {
         "camelcase-keys": "^2.0.0",
         "decamelize": "^1.1.2",
@@ -13150,8 +11227,7 @@
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
@@ -13226,12 +11302,13 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz",
-      "integrity": "sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz",
+      "integrity": "sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0",
+        "normalize-url": "^2.0.1",
         "schema-utils": "^1.0.0",
         "webpack-sources": "^1.1.0"
       }
@@ -13252,7 +11329,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -13260,8 +11336,7 @@
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "minimist-options": {
       "version": "3.0.2",
@@ -13307,9 +11382,9 @@
       }
     },
     "mississippi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
-      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
       "dev": true,
       "requires": {
         "concat-stream": "^1.5.0",
@@ -13318,7 +11393,7 @@
         "flush-write-stream": "^1.0.0",
         "from2": "^2.1.0",
         "parallel-transform": "^1.1.0",
-        "pump": "^2.0.1",
+        "pump": "^3.0.0",
         "pumpify": "^1.3.3",
         "stream-each": "^1.1.0",
         "through2": "^2.0.0"
@@ -13367,7 +11442,6 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       }
@@ -13536,9 +11610,9 @@
       "dev": true
     },
     "neo-async": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz",
-      "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
       "dev": true
     },
     "ng2-ckeditor": {
@@ -13601,8 +11675,6 @@
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "fstream": "^1.0.0",
         "glob": "^7.0.3",
@@ -13622,8 +11694,6 @@
           "version": "6.10.0",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
           "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -13634,44 +11704,32 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         },
         "aws-sign2": {
           "version": "0.7.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
         },
         "aws4": {
           "version": "1.8.0",
           "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
         },
         "extend": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
         },
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "form-data": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
           "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "asynckit": "^0.4.0",
             "combined-stream": "^1.0.6",
@@ -13681,16 +11739,12 @@
         "har-schema": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
         },
         "har-validator": {
           "version": "5.1.3",
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
           "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "ajv": "^6.5.5",
             "har-schema": "^2.0.0"
@@ -13700,8 +11754,6 @@
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
           "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-          "dev": true,
-          "optional": true,
           "requires": {
             "assert-plus": "^1.0.0",
             "jsprim": "^1.2.2",
@@ -13711,52 +11763,40 @@
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "mime-db": {
-          "version": "1.38.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-          "dev": true
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
         },
         "mime-types": {
-          "version": "2.1.22",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-          "dev": true,
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
           "requires": {
-            "mime-db": "~1.38.0"
+            "mime-db": "1.40.0"
           }
         },
         "oauth-sign": {
           "version": "0.9.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
         },
         "performance-now": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-          "dev": true,
-          "optional": true
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
         },
         "qs": {
           "version": "6.5.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
         },
         "request": {
           "version": "2.88.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
           "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "aws-sign2": "~0.7.0",
             "aws4": "^1.8.0",
@@ -13783,23 +11823,27 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         },
         "semver": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+        },
+        "tar": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+          "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+          "requires": {
+            "block-stream": "*",
+            "fstream": "^1.0.12",
+            "inherits": "2"
+          }
         },
         "tough-cookie": {
           "version": "2.4.3",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
           "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "psl": "^1.1.24",
             "punycode": "^1.4.1"
@@ -13808,9 +11852,7 @@
         "uuid": {
           "version": "3.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
         }
       }
     },
@@ -13846,20 +11888,18 @@
       }
     },
     "node-releases": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.13.tgz",
-      "integrity": "sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==",
+      "version": "1.1.23",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz",
+      "integrity": "sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==",
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
       }
     },
     "node-sass": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.10.0.tgz",
-      "integrity": "sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==",
-      "dev": true,
-      "optional": true,
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
+      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
       "requires": {
         "async-foreach": "^0.1.3",
         "chalk": "^1.1.1",
@@ -13868,12 +11908,10 @@
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
         "in-publish": "^2.0.0",
-        "lodash.assign": "^4.2.0",
-        "lodash.clonedeep": "^4.3.2",
-        "lodash.mergewith": "^4.6.0",
+        "lodash": "^4.17.11",
         "meow": "^3.7.0",
         "mkdirp": "^0.5.1",
-        "nan": "^2.10.0",
+        "nan": "^2.13.2",
         "node-gyp": "^3.8.0",
         "npmlog": "^4.0.0",
         "request": "^2.88.0",
@@ -13886,8 +11924,6 @@
           "version": "6.10.0",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
           "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -13898,37 +11934,27 @@
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         },
         "aws-sign2": {
           "version": "0.7.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
         },
         "aws4": {
           "version": "1.8.0",
           "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -13937,26 +11963,29 @@
             "supports-color": "^2.0.0"
           }
         },
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
+          }
+        },
         "extend": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
         },
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
         },
         "form-data": {
           "version": "2.3.3",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
           "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "asynckit": "^0.4.0",
             "combined-stream": "^1.0.6",
@@ -13966,16 +11995,12 @@
         "har-schema": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
         },
         "har-validator": {
           "version": "5.1.3",
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
           "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "ajv": "^6.5.5",
             "har-schema": "^2.0.0"
@@ -13985,8 +12010,6 @@
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
           "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-          "dev": true,
-          "optional": true,
           "requires": {
             "assert-plus": "^1.0.0",
             "jsprim": "^1.2.2",
@@ -13996,52 +12019,50 @@
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
         },
         "mime-db": {
-          "version": "1.38.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-          "dev": true
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
         },
         "mime-types": {
-          "version": "2.1.22",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-          "dev": true,
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
           "requires": {
-            "mime-db": "~1.38.0"
+            "mime-db": "1.40.0"
           }
         },
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+        },
         "oauth-sign": {
           "version": "0.9.0",
           "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
         },
         "performance-now": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
         },
         "qs": {
           "version": "6.5.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
         },
         "request": {
           "version": "2.88.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
           "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "aws-sign2": "~0.7.0",
             "aws4": "^1.8.0",
@@ -14068,23 +12089,17 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         },
         "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,
-          "optional": true
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         },
         "tough-cookie": {
           "version": "2.4.3",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
           "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "psl": "^1.1.24",
             "punycode": "^1.4.1"
@@ -14093,9 +12108,7 @@
         "uuid": {
           "version": "3.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
         }
       }
     },
@@ -14103,7 +12116,6 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
       "requires": {
         "abbrev": "1"
       }
@@ -14112,7 +12124,6 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-      "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
         "is-builtin-module": "^1.0.0",
@@ -14141,6 +12152,17 @@
       "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
       "dev": true
     },
+    "normalize-url": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+      "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0",
+        "query-string": "^5.0.1",
+        "sort-keys": "^2.0.0"
+      }
+    },
     "normalize.css": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-6.0.0.tgz",
@@ -14339,7 +12361,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -14371,8 +12392,7 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "oauth-sign": {
       "version": "0.8.2",
@@ -14383,8 +12403,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-component": {
       "version": "0.0.3",
@@ -14489,7 +12508,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -14509,10 +12527,19 @@
         "mimic-fn": "^1.0.0"
       }
     },
+    "open": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-6.2.0.tgz",
+      "integrity": "sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
     "opn": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
-      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
       "dev": true,
       "requires": {
         "is-wsl": "^1.1.0"
@@ -14528,28 +12555,6 @@
         "wordwrap": "~0.0.2"
       }
     },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
-      },
-      "dependencies": {
-        "wordwrap": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-          "dev": true
-        }
-      }
-    },
     "options": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
@@ -14574,14 +12579,12 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
       "requires": {
         "lcid": "^1.0.0"
       }
@@ -14599,14 +12602,12 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -14625,9 +12626,9 @@
       "dev": true
     },
     "p-is-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
-      "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
       "dev": true
     },
     "p-limit": {
@@ -14649,9 +12650,9 @@
       }
     },
     "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
       "dev": true
     },
     "p-try": {
@@ -14666,9 +12667,9 @@
       "integrity": "sha1-Zzpxf4M8y09DFVMbde5HiDdmAPc="
     },
     "pacote": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz",
-      "integrity": "sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==",
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.0.tgz",
+      "integrity": "sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.3",
@@ -14701,46 +12702,15 @@
       },
       "dependencies": {
         "bluebird": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-          "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
           "dev": true
         },
-        "cacache": {
-          "version": "11.3.2",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.1.15",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -14751,12 +12721,6 @@
             "path-is-absolute": "^1.0.0"
           }
         },
-        "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
-        },
         "lru-cache": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -14766,34 +12730,6 @@
             "yallist": "^3.0.2"
           }
         },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
         "rimraf": {
           "version": "2.6.3",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
@@ -14815,30 +12751,6 @@
           "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "dev": true
         },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "tar": {
-          "version": "4.4.8",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
-          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-          "dev": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
-          }
-        },
         "which": {
           "version": "1.3.1",
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -14909,7 +12821,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
       "requires": {
         "error-ex": "^1.2.0"
       }
@@ -14989,8 +12900,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -15062,14 +12972,12 @@
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
       "requires": {
         "pinkie": "^2.0.0"
       }
@@ -15085,12 +12993,57 @@
       }
     },
     "pkg-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dev": true,
       "requires": {
-        "find-up": "^2.1.0"
+        "find-up": "^3.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        }
       }
     },
     "plur": {
@@ -15103,9 +13056,9 @@
       }
     },
     "portfinder": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.17.tgz",
-      "integrity": "sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==",
+      "version": "1.0.20",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
+      "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
       "dev": true,
       "requires": {
         "async": "^1.5.2",
@@ -15128,14 +13081,14 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.5.tgz",
-      "integrity": "sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==",
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
+      "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
+        "chalk": "^2.4.2",
         "source-map": "^0.6.1",
-        "supports-color": "^5.5.0"
+        "supports-color": "^6.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -15156,6 +13109,17 @@
             "ansi-styles": "^3.2.1",
             "escape-string-regexp": "^1.0.5",
             "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
           }
         },
         "color-convert": {
@@ -15180,9 +13144,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
@@ -15191,9 +13155,9 @@
       }
     },
     "postcss-import": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.0.tgz",
-      "integrity": "sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
+      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.1",
@@ -15481,10 +13445,10 @@
       "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
       "dev": true
     },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+    "prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
       "dev": true
     },
     "preserve": {
@@ -15502,8 +13466,7 @@
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
     },
     "promise": {
       "version": "7.3.1",
@@ -15657,13 +13620,13 @@
       }
     },
     "proxy-addr": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
-      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
       "dev": true,
       "requires": {
         "forwarded": "~0.1.2",
-        "ipaddr.js": "1.8.0"
+        "ipaddr.js": "1.9.0"
       }
     },
     "prr": {
@@ -15684,14 +13647,12 @@
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
-      "version": "1.1.31",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
-      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
-      "dev": true
+      "version": "1.1.32",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz",
+      "integrity": "sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -15716,9 +13677,9 @@
       }
     },
     "pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
@@ -15734,13 +13695,24 @@
         "duplexify": "^3.6.0",
         "inherits": "^2.0.3",
         "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
       }
     },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "q": {
       "version": "1.5.1",
@@ -15760,6 +13732,17 @@
       "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
       "dev": true
     },
+    "query-string": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+      "dev": true,
+      "requires": {
+        "decode-uri-component": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
     "querystring": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
@@ -15863,10 +13846,14 @@
       }
     },
     "raw-loader": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
-      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz",
+      "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0"
+      }
     },
     "read-cache": {
       "version": "1.0.0",
@@ -15894,11 +13881,36 @@
         "gather-stream": "^1.0.0"
       }
     },
+    "read-package-json": {
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz",
+      "integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "json-parse-better-errors": "^1.0.1",
+        "normalize-package-data": "^2.0.0",
+        "slash": "^1.0.0"
+      }
+    },
+    "read-package-tree": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.2.2.tgz",
+      "integrity": "sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==",
+      "dev": true,
+      "requires": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "once": "^1.3.0",
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0"
+      }
+    },
     "read-pkg": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
       "requires": {
         "load-json-file": "^1.0.0",
         "normalize-package-data": "^2.3.2",
@@ -15909,7 +13921,6 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
           "requires": {
             "graceful-fs": "^4.1.2",
             "pify": "^2.0.0",
@@ -15919,8 +13930,7 @@
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
     },
@@ -15928,7 +13938,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
       "requires": {
         "find-up": "^1.0.0",
         "read-pkg": "^1.0.0"
@@ -15938,7 +13947,6 @@
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
           "requires": {
             "path-exists": "^2.0.0",
             "pinkie-promise": "^2.0.0"
@@ -15948,7 +13956,6 @@
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
           "requires": {
             "pinkie-promise": "^2.0.0"
           }
@@ -15959,7 +13966,6 @@
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
       "integrity": "sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ==",
-      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -15970,6 +13976,18 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "readdir-scoped-modules": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz",
+      "integrity": "sha1-n6+jfShr5dksuuve4DDcm19AZ0c=",
+      "dev": true,
+      "requires": {
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
+      }
+    },
     "readdirp": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
@@ -15995,7 +14013,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
       "requires": {
         "indent-string": "^2.1.0",
         "strip-indent": "^1.0.1"
@@ -16094,7 +14111,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
       "requires": {
         "is-finite": "^1.0.0"
       }
@@ -16138,8 +14154,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-from-string": {
       "version": "1.2.1",
@@ -16150,8 +14165,7 @@
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
     "requires-port": {
       "version": "1.0.0",
@@ -16225,7 +14239,6 @@
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
       "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-      "dev": true,
       "requires": {
         "glob": "^7.0.5"
       }
@@ -16269,9 +14282,9 @@
       "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
     "rxjs": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-      "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
+      "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -16284,8 +14297,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-      "dev": true
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -16306,23 +14318,981 @@
         "graceful-fs": "^4.1.4"
       }
     },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sass": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.19.0.tgz",
+      "integrity": "sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.0"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+          "dev": true
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+          "dev": true
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.1.0",
+            "array-unique": "^0.3.2",
+            "extend-shallow": "^2.0.1",
+            "fill-range": "^4.0.0",
+            "isobject": "^3.0.1",
+            "repeat-element": "^1.1.2",
+            "snapdragon": "^0.8.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "chokidar": {
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "dev": true,
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "0.2.5",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+              "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "is-accessor-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+              "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+              "dev": true,
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-data-descriptor": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+              "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+              "dev": true,
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "dev": true,
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "dev": true,
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.0"
+              }
+            },
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "dev": true,
+          "requires": {
+            "array-unique": "^0.3.2",
+            "define-property": "^1.0.0",
+            "expand-brackets": "^2.1.4",
+            "extend-shallow": "^2.0.1",
+            "fragment-cache": "^0.2.1",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "dev": true,
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "dev": true,
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fsevents": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "nan": "^2.12.1",
+            "node-pre-gyp": "^0.12.0"
+          },
+          "dependencies": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.3",
+              "bundled": true,
+              "dev": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true
+            },
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.2.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "needle": {
+              "version": "2.3.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "debug": "^4.1.0",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.12.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true
+            },
+            "object-assign": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "once": {
+              "version": "1.4.0",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "os-homedir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "os-tmpdir": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "osenv": {
+              "version": "0.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+              },
+              "dependencies": {
+                "minimist": {
+                  "version": "1.2.0",
+                  "bundled": true,
+                  "dev": true,
+                  "optional": true
+                }
+              }
+            },
+            "readable-stream": {
+              "version": "2.3.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "dev": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "set-blocking": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "signal-exit": {
+              "version": "3.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.3.4",
+                "minizlib": "^1.1.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.2"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true
+            },
+            "yallist": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "define-property": "^2.0.2",
+            "extend-shallow": "^3.0.2",
+            "extglob": "^2.0.4",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^6.0.2",
+            "nanomatch": "^1.2.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+          "dev": true,
+          "optional": true
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        }
+      }
+    },
     "sass-graph": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "glob": "^7.0.0",
         "lodash": "^4.0.0",
         "scss-tokenizer": "^0.2.3",
         "yargs": "^7.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
+        },
+        "which-module": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+          "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+        },
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+          "requires": {
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^5.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "requires": {
+            "camelcase": "^3.0.0"
+          }
+        }
       }
     },
     "sass-loader": {
@@ -16401,8 +15371,6 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "js-base64": "^2.1.8",
         "source-map": "^0.4.2"
@@ -16412,8 +15380,6 @@
           "version": "0.4.4",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "optional": true,
           "requires": {
             "amdefine": ">=0.0.4"
           }
@@ -16461,8 +15427,7 @@
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-      "dev": true
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
     "semver-dsl": {
       "version": "1.0.1",
@@ -16483,9 +15448,9 @@
       }
     },
     "send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
@@ -16495,32 +15460,51 @@
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
         "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
       },
       "dependencies": {
-        "mime": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+        "http-errors": {
+          "version": "1.7.2",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+          "dev": true,
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.1",
+            "statuses": ">= 1.5.0 < 2",
+            "toidentifier": "1.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+          "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
           "dev": true
         },
         "statuses": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-          "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
           "dev": true
         }
       }
     },
     "serialize-javascript": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz",
-      "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
+      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
       "dev": true
     },
     "serve-index": {
@@ -16539,22 +15523,29 @@
       }
     },
     "serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      },
+      "dependencies": {
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+          "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+          "dev": true
+        }
       }
     },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -16592,9 +15583,9 @@
       "dev": true
     },
     "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
       "dev": true
     },
     "sha.js": {
@@ -16667,8 +15658,7 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "slash": {
       "version": "1.0.0",
@@ -16997,18 +15987,18 @@
           }
         },
         "faye-websocket": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "version": "0.11.3",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+          "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
           "dev": true,
           "requires": {
             "websocket-driver": ">=0.5.1"
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -17044,6 +16034,15 @@
         }
       }
     },
+    "sort-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+      "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -17110,7 +16109,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-      "dev": true,
       "requires": {
         "spdx-license-ids": "^1.0.2"
       }
@@ -17118,14 +16116,12 @@
     "spdx-expression-parse": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-      "dev": true
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
     },
     "spdx-license-ids": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-      "dev": true
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
     },
     "spdy": {
       "version": "4.0.0",
@@ -17150,9 +16146,9 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -17181,15 +16177,15 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
         "readable-stream": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
-          "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -17215,9 +16211,9 @@
       "dev": true
     },
     "speed-measure-webpack-plugin": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz",
-      "integrity": "sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+      "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.0.1"
@@ -17260,7 +16256,6 @@
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "dev": true,
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -17275,18 +16270,17 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
     "ssri": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
-      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.1"
+        "figgy-pudding": "^3.5.1"
       }
     },
     "stack-trace": {
@@ -17335,8 +16329,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
       "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "^2.0.1"
       }
@@ -17415,11 +16407,16 @@
       "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
       "dev": true
     },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
       "requires": {
         "code-point-at": "^1.0.0",
         "is-fullwidth-code-point": "^1.0.0",
@@ -17441,7 +16438,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
       "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
       }
@@ -17456,7 +16452,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -17465,7 +16460,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
       "requires": {
         "is-utf8": "^0.2.0"
       }
@@ -17480,7 +16474,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
       "requires": {
         "get-stdin": "^4.0.1"
       }
@@ -17996,21 +16989,38 @@
       }
     },
     "tapable": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
-      "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true
     },
     "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz",
+      "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.2",
-        "inherits": "2"
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.3.5",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
+        }
       }
     },
     "taskgroup": {
@@ -18032,245 +17042,32 @@
       "dev": true,
       "requires": {
         "os-tmpdir": "^1.0.0",
-        "uuid": "^2.0.1"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
-          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
-          "dev": true
-        }
-      }
-    },
-    "terser": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
-      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.19.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.10"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.5.11",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz",
-          "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz",
-      "integrity": "sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==",
-      "dev": true,
-      "requires": {
-        "cacache": "^11.0.2",
-        "find-cache-dir": "^2.0.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
-        "source-map": "^0.6.1",
-        "terser": "^3.8.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-          "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
-          "dev": true
-        },
-        "cacache": {
-          "version": "11.3.2",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.3",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.1.15",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.2",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          }
-        },
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "make-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-          "dev": true,
-          "requires": {
-            "pify": "^4.0.1",
-            "semver": "^5.6.0"
-          }
-        },
-        "mississippi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^3.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+        "uuid": "^2.0.1"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+          "dev": true
+        }
+      }
+    },
+    "terser": {
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.19.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.10"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
           "dev": true
         },
         "source-map": {
@@ -18279,19 +17076,38 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+        "source-map-support": {
+          "version": "0.5.12",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1"
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
           }
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+      "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.0.2",
+        "find-cache-dir": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "terser": "^3.16.1",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -18413,6 +17229,12 @@
         }
       }
     },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "dev": true
+    },
     "tough-cookie": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
@@ -18423,16 +17245,15 @@
       }
     },
     "tree-kill": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
-      "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+      "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
       "dev": true
     },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
     },
     "trim-off-newlines": {
       "version": "1.0.1",
@@ -18450,8 +17271,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
       "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "glob": "^7.1.2"
       }
@@ -18533,9 +17352,9 @@
       }
     },
     "tsutils": {
-      "version": "2.21.2",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.21.2.tgz",
-      "integrity": "sha512-iaIuyjIUeFLdD39MYdzqBuY7Zv6+uGxSwRH4mf+HuzsnznjFz0R2tGrAe0/JvtNh91WrN8UN/DZRFTZNDuVekA==",
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
       "dev": true,
       "requires": {
         "tslib": "^1.8.1"
@@ -18551,7 +17370,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -18560,18 +17378,8 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
       "optional": true
     },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
@@ -18603,35 +17411,11 @@
       "integrity": "sha1-gwjf1OUtD1OMrP+fKqF26eGNiU8="
     },
     "typescript": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz",
-      "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==",
+      "version": "3.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz",
+      "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==",
       "dev": true
     },
-    "uglify-es": {
-      "version": "3.3.9",
-      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-      "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.13.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.13.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
     "uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
@@ -18639,40 +17423,6 @@
       "dev": true,
       "optional": true
     },
-    "uglifyjs-webpack-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz",
-      "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
-      "dev": true,
-      "requires": {
-        "cacache": "^10.0.4",
-        "find-cache-dir": "^1.0.0",
-        "schema-utils": "^0.4.5",
-        "serialize-javascript": "^1.4.0",
-        "source-map": "^0.6.1",
-        "uglify-es": "^3.3.4",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "0.4.7",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
     "ultron": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
@@ -18697,47 +17447,246 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "^0.1.0"
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "universal-analytics": {
+      "version": "0.4.20",
+      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz",
+      "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.0.0",
+        "request": "^2.88.0",
+        "uuid": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+          "dev": true
+        },
+        "aws4": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "5.1.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.5.5",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "^1.0.0",
+            "jsprim": "^1.2.2",
+            "sshpk": "^1.7.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.40.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+          "dev": true
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+          "dev": true
+        },
+        "request": {
+          "version": "2.88.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.0",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.4.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          },
+          "dependencies": {
+            "uuid": {
+              "version": "3.3.2",
+              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+              "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+              "dev": true
+            }
           }
         },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "dev": true
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
           "dev": true,
           "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
           }
         }
       }
     },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
     "universalify": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
@@ -18803,16 +17752,15 @@
       }
     },
     "upath": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
       "dev": true
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       },
@@ -18820,8 +17768,7 @@
         "punycode": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-          "dev": true
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         }
       }
     },
@@ -18850,12 +17797,12 @@
       }
     },
     "url-parse": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-      "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
       "dev": true,
       "requires": {
-        "querystringify": "^2.0.0",
+        "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
       }
     },
@@ -18887,8 +17834,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "utils-merge": {
       "version": "1.0.1",
@@ -18915,7 +17861,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-      "dev": true,
       "requires": {
         "spdx-correct": "~1.0.0",
         "spdx-expression-parse": "~1.0.0"
@@ -18940,7 +17885,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -18950,8 +17894,7 @@
         "assert-plus": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-          "dev": true
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
         }
       }
     },
@@ -19069,9 +18012,9 @@
           }
         },
         "chokidar": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
-          "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
           "dev": true,
           "requires": {
             "anymatch": "^2.0.0",
@@ -19240,14 +18183,14 @@
           }
         },
         "fsevents": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
-          "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
           "dev": true,
           "optional": true,
           "requires": {
-            "nan": "^2.9.2",
-            "node-pre-gyp": "^0.10.0"
+            "nan": "^2.12.1",
+            "node-pre-gyp": "^0.12.0"
           },
           "dependencies": {
             "abbrev": {
@@ -19319,12 +18262,12 @@
               "optional": true
             },
             "debug": {
-              "version": "2.6.9",
+              "version": "4.1.1",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
-                "ms": "2.0.0"
+                "ms": "^2.1.1"
               }
             },
             "deep-extend": {
@@ -19489,24 +18432,24 @@
               }
             },
             "ms": {
-              "version": "2.0.0",
+              "version": "2.1.1",
               "bundled": true,
               "dev": true,
               "optional": true
             },
             "needle": {
-              "version": "2.2.4",
+              "version": "2.3.0",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
-                "debug": "^2.1.2",
+                "debug": "^4.1.0",
                 "iconv-lite": "^0.4.4",
                 "sax": "^1.2.4"
               }
             },
             "node-pre-gyp": {
-              "version": "0.10.3",
+              "version": "0.12.0",
               "bundled": true,
               "dev": true,
               "optional": true,
@@ -19534,13 +18477,13 @@
               }
             },
             "npm-bundled": {
-              "version": "1.0.5",
+              "version": "1.0.6",
               "bundled": true,
               "dev": true,
               "optional": true
             },
             "npm-packlist": {
-              "version": "1.2.0",
+              "version": "1.4.1",
               "bundled": true,
               "dev": true,
               "optional": true,
@@ -19676,7 +18619,7 @@
               "optional": true
             },
             "semver": {
-              "version": "5.6.0",
+              "version": "5.7.0",
               "bundled": true,
               "dev": true,
               "optional": true
@@ -19886,6 +18829,13 @@
             "to-regex": "^3.0.2"
           }
         },
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+          "dev": true,
+          "optional": true
+        },
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -19902,12 +18852,6 @@
             "micromatch": "^3.1.10",
             "readable-stream": "^2.0.2"
           }
-        },
-        "upath": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-          "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
-          "dev": true
         }
       }
     },
@@ -19937,9 +18881,8 @@
       }
     },
     "web-animations-js": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.2.5.tgz",
-      "integrity": "sha1-JsobNME0czKggT+LK/5pZk76gKo="
+      "version": "github:angular/web-animations-js#96635c1a82a730fc71cc5d6cabe5dfe7c8349ec5",
+      "from": "github:angular/web-animations-js#release_pr208"
     },
     "webdriver-js-extender": {
       "version": "1.0.0",
@@ -19995,17 +18938,17 @@
       }
     },
     "webpack": {
-      "version": "4.23.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.23.1.tgz",
-      "integrity": "sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg==",
+      "version": "4.30.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.30.0.tgz",
+      "integrity": "sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.7.10",
-        "@webassemblyjs/helper-module-context": "1.7.10",
-        "@webassemblyjs/wasm-edit": "1.7.10",
-        "@webassemblyjs/wasm-parser": "1.7.10",
-        "acorn": "^5.6.2",
-        "acorn-dynamic-import": "^3.0.0",
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.0.5",
+        "acorn-dynamic-import": "^4.0.0",
         "ajv": "^6.1.0",
         "ajv-keywords": "^3.1.0",
         "chrome-trace-event": "^1.0.0",
@@ -20019,9 +18962,9 @@
         "mkdirp": "~0.5.0",
         "neo-async": "^2.5.0",
         "node-libs-browser": "^2.0.0",
-        "schema-utils": "^0.4.4",
+        "schema-utils": "^1.0.0",
         "tapable": "^1.1.0",
-        "uglifyjs-webpack-plugin": "^1.2.4",
+        "terser-webpack-plugin": "^1.1.0",
         "watchpack": "^1.5.0",
         "webpack-sources": "^1.3.0"
       },
@@ -20305,16 +19248,6 @@
             "snapdragon": "^0.8.1",
             "to-regex": "^3.0.2"
           }
-        },
-        "schema-utils": {
-          "version": "0.4.7",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
-          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-keywords": "^3.1.0"
-          }
         }
       }
     },
@@ -20346,69 +19279,63 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
-      "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz",
+      "integrity": "sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==",
       "dev": true,
       "requires": {
-        "memory-fs": "~0.4.1",
+        "memory-fs": "^0.4.1",
         "mime": "^2.3.1",
         "range-parser": "^1.0.3",
         "webpack-log": "^2.0.0"
       },
       "dependencies": {
         "mime": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
           "dev": true
         }
       }
     },
     "webpack-dev-server": {
-      "version": "3.1.14",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz",
-      "integrity": "sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz",
+      "integrity": "sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
         "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^3.1.0",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "~0.18.0",
+        "chokidar": "^2.1.5",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.0",
+        "express": "^4.16.4",
+        "html-entities": "^1.2.1",
+        "http-proxy-middleware": "^0.19.1",
         "import-local": "^2.0.0",
-        "internal-ip": "^3.0.1",
+        "internal-ip": "^4.2.0",
         "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.1",
+        "opn": "^5.5.0",
+        "portfinder": "^1.0.20",
         "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "semver": "^5.6.0",
-        "serve-index": "^1.7.2",
+        "selfsigned": "^1.10.4",
+        "semver": "^6.0.0",
+        "serve-index": "^1.9.1",
         "sockjs": "0.3.19",
         "sockjs-client": "1.3.0",
         "spdy": "^4.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^5.1.0",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
         "url": "^0.11.0",
-        "webpack-dev-middleware": "3.4.0",
+        "webpack-dev-middleware": "^3.6.2",
         "webpack-log": "^2.0.0",
-        "yargs": "12.0.2"
+        "yargs": "12.0.5"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
         "anymatch": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@@ -20471,16 +19398,10 @@
             }
           }
         },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
         "chokidar": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
-          "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
           "dev": true,
           "requires": {
             "anymatch": "^2.0.0",
@@ -20497,82 +19418,23 @@
             "upath": "^1.1.1"
           }
         },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           },
           "dependencies": {
             "ms": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-              "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+              "version": "2.1.2",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
               "dev": true
             }
           }
         },
-        "decamelize": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-          "dev": true,
-          "requires": {
-            "xregexp": "4.0.0"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
         "expand-brackets": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -20733,24 +19595,15 @@
             }
           }
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
         "fsevents": {
-          "version": "1.2.7",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.7.tgz",
-          "integrity": "sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==",
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
           "dev": true,
           "optional": true,
           "requires": {
-            "nan": "^2.9.2",
-            "node-pre-gyp": "^0.10.0"
+            "nan": "^2.12.1",
+            "node-pre-gyp": "^0.12.0"
           },
           "dependencies": {
             "abbrev": {
@@ -20822,12 +19675,12 @@
               "optional": true
             },
             "debug": {
-              "version": "2.6.9",
+              "version": "4.1.1",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
-                "ms": "2.0.0"
+                "ms": "^2.1.1"
               }
             },
             "deep-extend": {
@@ -20992,24 +19845,24 @@
               }
             },
             "ms": {
-              "version": "2.0.0",
+              "version": "2.1.1",
               "bundled": true,
               "dev": true,
               "optional": true
             },
             "needle": {
-              "version": "2.2.4",
+              "version": "2.3.0",
               "bundled": true,
               "dev": true,
               "optional": true,
               "requires": {
-                "debug": "^2.1.2",
+                "debug": "^4.1.0",
                 "iconv-lite": "^0.4.4",
                 "sax": "^1.2.4"
               }
             },
             "node-pre-gyp": {
-              "version": "0.10.3",
+              "version": "0.12.0",
               "bundled": true,
               "dev": true,
               "optional": true,
@@ -21037,13 +19890,13 @@
               }
             },
             "npm-bundled": {
-              "version": "1.0.5",
+              "version": "1.0.6",
               "bundled": true,
               "dev": true,
               "optional": true
             },
             "npm-packlist": {
-              "version": "1.2.0",
+              "version": "1.4.1",
               "bundled": true,
               "dev": true,
               "optional": true,
@@ -21179,7 +20032,7 @@
               "optional": true
             },
             "semver": {
-              "version": "5.6.0",
+              "version": "5.7.0",
               "bundled": true,
               "dev": true,
               "optional": true
@@ -21271,15 +20124,6 @@
             }
           }
         },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -21307,12 +20151,6 @@
           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-          "dev": true
-        },
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
@@ -21348,12 +20186,6 @@
           "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
         "is-glob": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
@@ -21393,37 +20225,7 @@
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
           "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-          "dev": true,
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "mem": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-          "dev": true,
-          "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^2.0.0",
-            "p-is-promise": "^2.0.0"
-          }
+          "dev": true
         },
         "micromatch": {
           "version": "3.1.10",
@@ -21446,11 +20248,12 @@
             "to-regex": "^3.0.2"
           }
         },
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
+        "nan": {
+          "version": "2.14.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+          "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+          "dev": true,
+          "optional": true
         },
         "normalize-path": {
           "version": "3.0.0",
@@ -21458,51 +20261,6 @@
           "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
         },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-          "dev": true,
-          "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
-          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
         "readdirp": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -21515,81 +20273,19 @@
           }
         },
         "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
+          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
           "dev": true
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
-        },
-        "upath": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
-          "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
-          "dev": true
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "12.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-          "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-          "dev": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^2.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^10.1.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0"
-          }
         }
       }
     },
@@ -21618,9 +20314,9 @@
       }
     },
     "webpack-merge": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz",
-      "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
+      "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.5"
@@ -21679,23 +20375,20 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
       "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-      "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }
     },
     "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true,
-      "optional": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
     },
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
       "requires": {
         "string-width": "^1.0.2 || 2"
       }
@@ -21723,19 +20416,27 @@
       "dev": true
     },
     "worker-farm": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
       "dev": true,
       "requires": {
         "errno": "~0.1.7"
       }
     },
+    "worker-plugin": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-3.1.0.tgz",
+      "integrity": "sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0"
+      }
+    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
       "requires": {
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1"
@@ -21744,8 +20445,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
       "version": "0.2.1",
@@ -21813,12 +20513,6 @@
       "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
       "dev": true
     },
-    "xregexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
-      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
-      "dev": true
-    },
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@@ -21834,69 +20528,171 @@
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
+        "cliui": "^4.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^3.0.0",
         "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
+        "os-locale": "^3.0.0",
         "require-directory": "^2.1.1",
         "require-main-filename": "^1.0.1",
         "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1 || ^4.0.0",
+        "yargs-parser": "^11.1.1"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
         "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "find-up": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
           "dev": true
         },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
-          "optional": true
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
         },
         "yargs-parser": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "camelcase": "^3.0.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
     },
     "yargs-parser": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
-      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz",
+      "integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==",
       "dev": true,
       "requires": {
-        "camelcase": "^4.1.0"
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
       },
       "dependencies": {
         "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         }
       }
@@ -21914,9 +20710,9 @@
       "dev": true
     },
     "zone.js": {
-      "version": "0.8.29",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
-      "integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.9.1.tgz",
+      "integrity": "sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag=="
     },
     "zrender": {
       "version": "4.0.1",
diff --git a/package.json b/package.json
index 6644531964..71b480d32f 100644
--- a/package.json
+++ b/package.json
@@ -9,11 +9,6 @@
   "bugs": {
     "url": "https://github.com/akveo/ngx-admin/issues"
   },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "IE 11"
-  ],
   "scripts": {
     "ng": "ng",
     "conventional-changelog": "conventional-changelog",
@@ -35,27 +30,26 @@
   },
   "dependencies": {
     "@agm/core": "^1.0.0-beta.5",
-    "@angular/animations": "^7.2.11",
-    "@angular/cdk": "^7.3.6",
-    "@angular/common": "^7.2.11",
-    "@angular/compiler": "^7.2.11",
-    "@angular/core": "^7.2.11",
-    "@angular/forms": "^7.2.11",
-    "@angular/http": "^7.2.11",
-    "@angular/platform-browser": "^7.2.11",
-    "@angular/platform-browser-dynamic": "^7.2.11",
-    "@angular/router": "^7.2.11",
+    "@angular/animations": "^8.0.0",
+    "@angular/cdk": "^8.0.0",
+    "@angular/common": "^8.0.0",
+    "@angular/compiler": "^8.0.0",
+    "@angular/core": "^8.0.0",
+    "@angular/forms": "^8.0.0",
+    "@angular/platform-browser": "^8.0.0",
+    "@angular/platform-browser-dynamic": "^8.0.0",
+    "@angular/router": "^8.0.0",
     "@asymmetrik/ngx-leaflet": "3.0.1",
-    "@nebular/auth": "3.4.2",
-    "@nebular/bootstrap": "3.4.2",
-    "@nebular/security": "3.4.2",
-    "@nebular/theme": "3.4.2",
-    "@ng-bootstrap/ng-bootstrap": "^4.0.0",
+    "@nebular/auth": "4.1.0",
+    "@nebular/bootstrap": "4.1.0",
+    "@nebular/eva-icons": "4.1.0",
+    "@nebular/security": "4.1.0",
+    "@nebular/theme": "4.1.0",
     "@swimlane/ngx-charts": "^10.0.0",
     "angular-tree-component": "7.2.0",
     "angular2-chartjs": "0.4.1",
     "angular2-toaster": "^7.0.0",
-    "bootstrap": "4.0.0",
+    "bootstrap": "4.3.1",
     "chart.js": "2.7.1",
     "ckeditor": "4.7.3",
     "classlist.js": "1.1.20150312",
@@ -70,23 +64,24 @@
     "ng2-completer": "2.0.8",
     "ng2-smart-table": "1.3.5",
     "ngx-echarts": "^4.0.1",
+    "node-sass": "^4.12.0",
     "normalize.css": "6.0.0",
     "pace-js": "1.0.2",
     "roboto-fontface": "0.8.0",
-    "rxjs": "6.4.0",
+    "rxjs": "6.5.2",
     "rxjs-compat": "6.3.0",
     "socicon": "3.0.5",
     "tinymce": "4.5.7",
     "tslib": "^1.9.0",
     "typeface-exo": "0.0.22",
-    "web-animations-js": "2.2.5",
-    "zone.js": "^0.8.29"
+    "web-animations-js": "github:angular/web-animations-js#release_pr208",
+    "zone.js": "~0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.12.1",
-    "@angular/compiler-cli": "^7.2.11",
-    "@angular/cli": "^7.3.7",
-    "@angular/language-service": "7.2.11",
+    "@angular-devkit/build-angular": "~0.800.2",
+    "@angular/cli": "^8.0.2",
+    "@angular/compiler-cli": "^8.0.0",
+    "@angular/language-service": "8.0.0",
     "@compodoc/compodoc": "1.0.1",
     "@fortawesome/fontawesome-free": "^5.2.0",
     "@types/d3-color": "1.0.5",
@@ -95,7 +90,7 @@
     "@types/jasminewd2": "2.0.3",
     "@types/leaflet": "1.2.3",
     "@types/node": "6.0.90",
-    "codelyzer": "^4.5.0",
+    "codelyzer": "^5.0.1",
     "conventional-changelog-cli": "1.3.4",
     "husky": "0.13.3",
     "jasmine-core": "2.6.4",
@@ -111,8 +106,8 @@
     "rimraf": "2.6.1",
     "stylelint": "7.13.0",
     "ts-node": "3.2.2",
-    "tslint": "5.7.0",
+    "tslint": "^5.7.0",
     "tslint-language-service": "^0.9.9",
-    "typescript": "3.2.4"
+    "typescript": "3.4.5"
   }
 }
diff --git a/src/app/@core/core.module.ts b/src/app/@core/core.module.ts
index 63298734be..786d89547a 100644
--- a/src/app/@core/core.module.ts
+++ b/src/app/@core/core.module.ts
@@ -56,17 +56,17 @@ const socialLinks = [
   {
     url: 'https://github.com/akveo/nebular',
     target: '_blank',
-    icon: 'socicon-github',
+    icon: 'github',
   },
   {
     url: 'https://www.facebook.com/akveo/',
     target: '_blank',
-    icon: 'socicon-facebook',
+    icon: 'facebook',
   },
   {
     url: 'https://twitter.com/akveo_inc',
     target: '_blank',
-    icon: 'socicon-twitter',
+    icon: 'twitter',
   },
 ];
 
diff --git a/src/app/@core/mock/traffic-list.service.ts b/src/app/@core/mock/traffic-list.service.ts
index 6e9385a134..369aa3312c 100644
--- a/src/app/@core/mock/traffic-list.service.ts
+++ b/src/app/@core/mock/traffic-list.service.ts
@@ -31,10 +31,8 @@ export class TrafficListService extends TrafficListData {
   private getDataMonth(): TrafficList[] {
     const getFirstDateInPeriod = () => {
       const months = this.period.getMonths();
-      const date = new Date();
-      const prevYear = date.getFullYear() - 1;
 
-      return `${months[months.length - 1]}, ${prevYear}`;
+      return months[months.length - 1];
     };
 
     return this.reduceData(this.period.getMonths(), getFirstDateInPeriod);
diff --git a/src/app/@theme/components/footer/footer.component.scss b/src/app/@theme/components/footer/footer.component.scss
index c5713e2c54..c56f5d8928 100644
--- a/src/app/@theme/components/footer/footer.component.scss
+++ b/src/app/@theme/components/footer/footer.component.scss
@@ -13,11 +13,11 @@
 
     a {
       padding: 0.4rem;
-      color: nb-theme(color-fg);
+      color: nb-theme(text-hint-color);
       transition: color ease-out 0.1s;
 
       &:hover {
-        color: nb-theme(color-fg-heading);
+        color: nb-theme(text-basic-color);
       }
     }
   }
diff --git a/src/app/@theme/components/footer/footer.component.ts b/src/app/@theme/components/footer/footer.component.ts
index b1fb1c4030..c0b8d53637 100644
--- a/src/app/@theme/components/footer/footer.component.ts
+++ b/src/app/@theme/components/footer/footer.component.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'ngx-footer',
   styleUrls: ['./footer.component.scss'],
   template: `
-    <span class="created-by">Created with ♥ by <b><a href="https://akveo.com" target="_blank">Akveo</a></b> 2017</span>
+    <span class="created-by">Created with ♥ by <b><a href="https://akveo.com" target="_blank">Akveo</a></b> 2019</span>
     <div class="socials">
       <a href="#" target="_blank" class="ion ion-social-github"></a>
       <a href="#" target="_blank" class="ion ion-social-facebook"></a>
diff --git a/src/app/@theme/components/header/header.component.html b/src/app/@theme/components/header/header.component.html
index 1ab9eef13a..6fdc5d3570 100644
--- a/src/app/@theme/components/header/header.component.html
+++ b/src/app/@theme/components/header/header.component.html
@@ -1,26 +1,29 @@
-<div class="header-container"
-     [class.left]="position === 'normal'"
-     [class.right]="position === 'inverse'">
-  <div class="logo-containter">
-    <a (click)="toggleSidebar()" href="#" class="navigation"><i class="nb-menu"></i></a>
-    <div class="logo" (click)="goToHome()">ngx-<span>admin</span></div>
+<div class="header-container">
+  <div class="logo-container">
+    <a (click)="toggleSidebar()" href="#" class="sidebar-toggle">
+      <nb-icon icon="menu-2-outline"></nb-icon>
+    </a>
+    <a class="logo" href="#" (click)="navigateHome()">ngx-<span>admin</span></a>
   </div>
-  <ngx-theme-switcher></ngx-theme-switcher>
+  <nb-select [selected]="currentTheme" (selectedChange)="changeTheme($event)" status="primary">
+    <nb-option *ngFor="let theme of themes" [value]="theme.value"> {{ theme.name }}</nb-option>
+  </nb-select>
 </div>
 
 <div class="header-container">
-  <ngx-layout-direction-switcher></ngx-layout-direction-switcher>
-  <nb-actions
-    size="medium"
-    [class.right]="position === 'normal'"
-    [class.left]="position === 'inverse'">
-    <nb-action *nbIsGranted="['view', 'user']" >
-      <nb-user [nbContextMenu]="userMenu" [name]="user?.name" [picture]="user?.picture"></nb-user>
-    </nb-action>
-    <nb-action class="control-item" disabled icon="nb-notifications"></nb-action>
-    <nb-action class="control-item" icon="nb-email"></nb-action>
+  <nb-actions size="small">
+
     <nb-action class="control-item">
-      <nb-search type="rotate-layout" (click)="startSearch()"></nb-search>
+      <nb-search type="rotate-layout"></nb-search>
+    </nb-action>
+    <nb-action class="control-item" icon="email-outline"></nb-action>
+    <nb-action class="control-item" icon="bell-outline"></nb-action>
+    <nb-action class="user-action" *nbIsGranted="['view', 'user']" >
+      <nb-user [nbContextMenu]="userMenu"
+               [onlyPicture]="userPictureOnly"
+               [name]="user?.name"
+               [picture]="user?.picture">
+      </nb-user>
     </nb-action>
   </nb-actions>
 </div>
diff --git a/src/app/@theme/components/header/header.component.scss b/src/app/@theme/components/header/header.component.scss
index 1c7a2c7256..20d9e872fb 100644
--- a/src/app/@theme/components/header/header.component.scss
+++ b/src/app/@theme/components/header/header.component.scss
@@ -1,31 +1,30 @@
-@import '../../styles/themes';
 @import '~bootstrap/scss/mixins/breakpoints';
 @import '~@nebular/theme/styles/global/breakpoints';
+@import '../../styles/themes';
 
 @include nb-install-component() {
   display: flex;
   justify-content: space-between;
   width: 100%;
 
-  .left {
+  .logo-container {
     display: flex;
-    width: 100%;
-    order: 0;
-    flex-direction: row;
-  }
-  .right {
-    order: 1;
-    flex-direction: row-reverse;
+    align-items: center;
+    width: calc(#{nb-theme(sidebar-width)} - #{nb-theme(header-padding)});
   }
 
-  .logo-containter {
+  nb-action {
+    height: auto;
     display: flex;
-    align-items: center;
-    width: calc(#{nb-theme(sidebar-width)} - #{nb-theme(header-padding)});
+    align-content: center;
+  }
+
+  nb-user {
+    cursor: pointer;
   }
 
-  .control-item {
-    display: block;
+  ::ng-deep nb-search button {
+    padding: 0!important;
   }
 
   .header-container {
@@ -33,179 +32,38 @@
     align-items: center;
     width: auto;
 
-    .navigation {
-      @include nb-ltr(padding-right, nb-theme(padding));
-      @include nb-rtl(padding-left, nb-theme(padding));
-      font-size: 2.5rem;
+    .sidebar-toggle {
+      @include nb-ltr(padding-right, 1.25rem);
+      @include nb-rtl(padding-left, 1.25rem);
       text-decoration: none;
-
-      i {
-        display: block;
+      color: nb-theme(text-hint-color);
+      nb-icon {
+        font-size: 1.75rem;
       }
-
     }
 
     .logo {
-      padding: 0 nb-theme(padding);
+      padding: 0 1.25rem;
       font-size: 1.75rem;
-      font-weight: nb-theme(font-weight-bolder);
-      @include nb-ltr(border-left, 1px solid nb-theme(separator));
-      @include nb-rtl(border-right, 1px solid nb-theme(separator));
+      @include nb-ltr(border-left, 1px solid nb-theme(divider-color));
+      @include nb-rtl(border-right, 1px solid nb-theme(divider-color));
       white-space: nowrap;
-
-      span {
-        font-weight: nb-theme(font-weight-normal);
-      }
-    }
-  }
-
-  @include nb-for-theme(corporate) {
-    $menu-action-separator-color: #3f4550;
-
-    nb-action {
-      @include nb-ltr(border-left-color, $menu-action-separator-color);
-      @include nb-rtl(border-right-color, $menu-action-separator-color);
-    }
-
-    .header-container .logo {
-      @include nb-ltr(border, none);
-      @include nb-rtl(border, none);
-    }
-
-    .header-container /deep/ ngx-theme-switcher .dropdown-toggle {
-      color: nb-theme(color-white);
-      background: transparent;
-    }
-  }
-
-  ngx-layout-direction-switcher {
-    margin: 0 1.5rem;
-  }
-
-  ngx-theme-switcher {
-    margin: nb-theme(layout-padding);
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-
-  @include media-breakpoint-down(xl) {
-    ngx-layout-direction-switcher {
-      display: none;
-    }
-  }
-
-  .toggle-settings /deep/ a {
-    display: block;
-    text-decoration: none;
-    line-height: 1;
-
-    i {
-      color: nb-theme(color-fg-highlight);
-      font-size: 2.25rem;
-      border-radius: 50%;
-      position: relative;
-      animation-name: pulse-light;
-
-      &::after {
-        content: ' ';
-        // hack to be able to set border-radius
-        background-image: url('data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7');
-        border-radius: 50%;
-        pointer-events: none;
-
-        position: absolute;
-        top: 52.3%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        width: 13%;
-        height: 13%;
-
-        animation: 3s linear infinite pulse;
-
-        @include nb-for-theme(default) {
-          animation-name: pulse-light;
-        }
-      }
-    }
-  }
-
-  @include keyframes(pulse) {
-    0% {
-      box-shadow: 0 0 1px 0 rgba(nb-theme(color-fg-highlight), 0);
-    }
-    20% {
-      box-shadow: 0 0 3px 10px rgba(nb-theme(color-fg-highlight), 0.4);
-    }
-    100% {
-      box-shadow: 0 0 5px 20px rgba(nb-theme(color-fg-highlight), 0);
-    }
-  }
-
-  @include keyframes(pulse-light) {
-    0% {
-      box-shadow: 0 0 1px 0 rgba(115, 255, 208, 0);
-    }
-    20% {
-      box-shadow: 0 0 3px 10px rgba(115, 255, 208, 0.4);
-    }
-    100% {
-      box-shadow: 0 0 5px 20px rgba(115, 255, 208, 0);
+      text-decoration: none;
     }
   }
 
-  @include media-breakpoint-down(md) {
-
-    nb-action:not(.toggle-settings) {
-      border: none;
-    }
-
+  @include media-breakpoint-down(sm) {
     .control-item {
       display: none;
     }
-
-    .toggle-settings {
+    .user-action {
+      border: none;
       padding: 0;
     }
-
-    ngx-layout-direction-switcher {
-      display: none;
-    }
-
-    ngx-theme-switcher {
-      margin: 0 0.5rem;
-    }
-  }
-
-  @include media-breakpoint-down(sm) {
-
-    nb-user /deep/ .user-name {
-      display: none;
-    }
   }
 
   @include media-breakpoint-down(is) {
-
-    .header-container {
-      .logo {
-        font-size: 1.25rem;
-      }
-    }
-
-    .toggle-settings {
-      display: none;
-    }
-
-    ngx-theme-switcher {
-      display: none;
-    }
-
-    nb-action:not(.toggle-settings) {
-      padding: 0;
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    .right /deep/ {
+    nb-select {
       display: none;
     }
   }
diff --git a/src/app/@theme/components/header/header.component.ts b/src/app/@theme/components/header/header.component.ts
index 788802b267..bfe2b9bc3e 100644
--- a/src/app/@theme/components/header/header.component.ts
+++ b/src/app/@theme/components/header/header.component.ts
@@ -1,33 +1,83 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { NbMediaBreakpointsService, NbMenuService, NbSidebarService, NbThemeService } from '@nebular/theme';
 
-import { NbMenuService, NbSidebarService } from '@nebular/theme';
 import { UserData } from '../../../@core/data/users';
-import { AnalyticsService } from '../../../@core/utils';
 import { LayoutService } from '../../../@core/utils';
+import { map, takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 
 @Component({
   selector: 'ngx-header',
   styleUrls: ['./header.component.scss'],
   templateUrl: './header.component.html',
 })
-export class HeaderComponent implements OnInit {
-
-  @Input() position = 'normal';
+export class HeaderComponent implements OnInit, OnDestroy {
 
+  private destroy$: Subject<void> = new Subject<void>();
+  userPictureOnly: boolean = false;
   user: any;
 
-  userMenu = [{ title: 'Profile' }, { title: 'Log out' }];
+  themes = [
+    {
+      value: 'default',
+      name: 'Light',
+    },
+    {
+      value: 'dark',
+      name: 'Dark',
+    },
+    {
+      value: 'cosmic',
+      name: 'Cosmic',
+    },
+    {
+      value: 'corporate',
+      name: 'Corporate',
+    },
+  ];
+
+  currentTheme = 'default';
+
+  userMenu = [ { title: 'Profile' }, { title: 'Log out' } ];
 
   constructor(private sidebarService: NbSidebarService,
               private menuService: NbMenuService,
+              private themeService: NbThemeService,
               private userService: UserData,
-              private analyticsService: AnalyticsService,
-              private layoutService: LayoutService) {
+              private layoutService: LayoutService,
+              private breakpointService: NbMediaBreakpointsService) {
   }
 
   ngOnInit() {
+    this.currentTheme = this.themeService.currentTheme;
+
     this.userService.getUsers()
+      .pipe(takeUntil(this.destroy$))
       .subscribe((users: any) => this.user = users.nick);
+
+    const { xl } = this.breakpointService.getBreakpointsMap();
+    this.themeService.onMediaQueryChange()
+      .pipe(
+        map(([, currentBreakpoint]) => currentBreakpoint.width < xl),
+        takeUntil(this.destroy$),
+      )
+      .subscribe((isLessThanXl: boolean) => this.userPictureOnly = isLessThanXl);
+
+    this.themeService.onThemeChange()
+      .pipe(
+        map(({ name }) => name),
+        takeUntil(this.destroy$),
+      )
+      .subscribe(themeName => this.currentTheme = themeName);
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  changeTheme(themeName: string) {
+    this.themeService.changeTheme(themeName);
   }
 
   toggleSidebar(): boolean {
@@ -37,11 +87,8 @@ export class HeaderComponent implements OnInit {
     return false;
   }
 
-  goToHome() {
+  navigateHome() {
     this.menuService.navigateHome();
-  }
-
-  startSearch() {
-    this.analyticsService.trackEvent('startSearch');
+    return false;
   }
 }
diff --git a/src/app/@theme/components/index.ts b/src/app/@theme/components/index.ts
index a3140c91a4..09d415cec6 100644
--- a/src/app/@theme/components/index.ts
+++ b/src/app/@theme/components/index.ts
@@ -2,9 +2,3 @@ export * from './header/header.component';
 export * from './footer/footer.component';
 export * from './search-input/search-input.component';
 export * from './tiny-mce/tiny-mce.component';
-export * from './theme-settings/theme-settings.component';
-export * from './theme-switcher/theme-switcher.component';
-export * from './switcher/switcher.component';
-export * from './layout-direction-switcher/layout-direction-switcher.component';
-export * from './theme-switcher/themes-switcher-list/themes-switcher-list.component';
-export * from './toggle-settings-button/toggle-settings-button.component';
diff --git a/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.ts b/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.ts
deleted file mode 100644
index 1c3267d02e..0000000000
--- a/src/app/@theme/components/layout-direction-switcher/layout-direction-switcher.component.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Component, OnDestroy, Input } from '@angular/core';
-import { NbLayoutDirectionService, NbLayoutDirection } from '@nebular/theme';
-import { takeWhile } from 'rxjs/operators';
-
-@Component({
-  selector: 'ngx-layout-direction-switcher',
-  template: `
-    <ngx-switcher
-      [firstValue]="directions.RTL"
-      [secondValue]="directions.LTR"
-      [firstValueLabel]="'RTL'"
-      [secondValueLabel]="'LTR'"
-      [value]="currentDirection"
-      (valueChange)="toggleDirection($event)"
-      [vertical]="vertical"
-    >
-    </ngx-switcher>
-  `,
-})
-export class LayoutDirectionSwitcherComponent implements OnDestroy {
-  directions = NbLayoutDirection;
-  currentDirection: NbLayoutDirection;
-  alive = true;
-
-  @Input() vertical: boolean = false;
-
-  constructor(private directionService: NbLayoutDirectionService) {
-    this.currentDirection = this.directionService.getDirection();
-
-    this.directionService.onDirectionChange()
-      .pipe(takeWhile(() => this.alive))
-      .subscribe(newDirection => this.currentDirection = newDirection);
-  }
-
-  toggleDirection(newDirection) {
-    this.directionService.setDirection(newDirection);
-  }
-
-  ngOnDestroy() {
-    this.alive = false;
-  }
-}
diff --git a/src/app/@theme/components/search-input/search-input.component.scss b/src/app/@theme/components/search-input/search-input.component.scss
index 5ef07efa59..3bfa7aca28 100644
--- a/src/app/@theme/components/search-input/search-input.component.scss
+++ b/src/app/@theme/components/search-input/search-input.component.scss
@@ -25,7 +25,7 @@
     }
   }
 
-  /deep/ search-input {
+  ::ng-deep search-input {
     input {
       background: transparent;
     }
diff --git a/src/app/@theme/components/search-input/search-input.component.ts b/src/app/@theme/components/search-input/search-input.component.ts
index d9f0f10b4e..8527c65a11 100644
--- a/src/app/@theme/components/search-input/search-input.component.ts
+++ b/src/app/@theme/components/search-input/search-input.component.ts
@@ -14,7 +14,7 @@ import { Component, ElementRef, EventEmitter, Output, ViewChild } from '@angular
   `,
 })
 export class SearchInputComponent {
-  @ViewChild('input') input: ElementRef;
+  @ViewChild('input', { static: true }) input: ElementRef;
 
   @Output() search: EventEmitter<string> = new EventEmitter<string>();
 
diff --git a/src/app/@theme/components/switcher/switcher.component.scss b/src/app/@theme/components/switcher/switcher.component.scss
deleted file mode 100644
index 585f007bfa..0000000000
--- a/src/app/@theme/components/switcher/switcher.component.scss
+++ /dev/null
@@ -1,112 +0,0 @@
-@import '../../styles/themes';
-@import '~@nebular/bootstrap/styles/hero-buttons';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-  .switch-label {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    cursor: pointer;
-    margin: 0;
-
-    &.vertical {
-      flex-direction: column;
-      align-items: flex-start;
-
-      .first,
-      .second {
-        padding: 0;
-      }
-
-      .switch {
-        margin-top: 0.5em;
-      }
-    }
-
-    & > span {
-      font-size: 1.125rem;
-      font-weight: nb-theme(font-weight-bold);
-      transition: opacity 0.3s ease;
-      color: nb-theme(color-fg);
-
-      &.first {
-        @include nb-ltr(padding-right, 10px);
-        @include nb-rtl(padding-left, 10px);
-      }
-
-      &.second {
-        @include nb-ltr(padding-left, 10px);
-        @include nb-rtl(padding-right, 10px);
-      }
-
-      &.active {
-        color: nb-theme(color-fg-text);
-      }
-
-      @include nb-for-theme(cosmic) {
-        color: nb-theme(color-fg);
-
-        &.active {
-          color: nb-theme(color-white);
-        }
-      }
-
-      &:active {
-        opacity: 0.78;
-      }
-    }
-  }
-
-  .switch {
-    position: relative;
-    display: inline-block;
-    width: 3rem;
-    height: 1.5rem;
-    margin: 0;
-
-    input {
-      display: none;
-
-      &:checked + .slider::before {
-        @include nb-ltr(transform, translateX(1.5rem));
-        @include nb-rtl(transform, translateX(-1.5rem));
-      }
-    }
-
-    .slider {
-      position: absolute;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      border-radius: 1.75rem;
-      background-color: nb-theme(layout-bg);
-    }
-
-    .slider::before {
-      position: absolute;
-      content: '';
-      height: 1.5rem;
-      width: 1.5rem;
-      border-radius: 50%;
-      background-color: nb-theme(color-success);
-      transition: 0.2s;
-
-      box-shadow: 0 0 0.25rem 0 rgba(nb-theme(color-fg), 0.4);
-
-      @include nb-for-theme(cosmic) {
-        @include btn-hero-primary-gradient();
-      }
-
-      @include nb-for-theme(corporate) {
-        background-color: nb-theme(color-primary);
-      }
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    align-items: flex-end;
-  }
-}
diff --git a/src/app/@theme/components/switcher/switcher.component.ts b/src/app/@theme/components/switcher/switcher.component.ts
deleted file mode 100644
index a7875f147c..0000000000
--- a/src/app/@theme/components/switcher/switcher.component.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
-
-@Component({
-  selector: 'ngx-switcher',
-  styleUrls: ['./switcher.component.scss'],
-  template: `
-    <label class="switch-label" [class.vertical]="vertical">
-      <span class="first" [class.active]="vertical || isFirstValue()">
-        {{vertical ? currentValueLabel() : firstValueLabel}}
-      </span>
-
-      <div class="switch">
-        <input type="checkbox" [checked]="isSecondValue()" (change)="changeValue()">
-        <span class="slider"></span>
-      </div>
-
-      <span
-        *ngIf="!vertical"
-        class="second"
-        [class.active]="isSecondValue()"
-      >
-          {{secondValueLabel}}
-      </span>
-    </label>
-  `,
-})
-export class SwitcherComponent {
-  @Input() firstValue: any;
-  @Input() secondValue: any;
-
-  @Input() firstValueLabel: string;
-  @Input() secondValueLabel: string;
-
-  @Input() vertical: boolean;
-
-  @Input() value: any;
-  @Output() valueChange = new EventEmitter<any>();
-
-  isFirstValue() {
-    return this.value === this.firstValue;
-  }
-
-  isSecondValue() {
-    return this.value === this.secondValue;
-  }
-
-  currentValueLabel() {
-    return this.isFirstValue()
-      ? this.firstValueLabel
-      : this.secondValueLabel;
-  }
-
-  changeValue() {
-    this.value = this.isFirstValue()
-      ? this.secondValue
-      : this.firstValue;
-
-    this.valueChange.emit(this.value);
-  }
-}
diff --git a/src/app/@theme/components/theme-settings/theme-settings.component.scss b/src/app/@theme/components/theme-settings/theme-settings.component.scss
deleted file mode 100644
index 58301ba85d..0000000000
--- a/src/app/@theme/components/theme-settings/theme-settings.component.scss
+++ /dev/null
@@ -1,91 +0,0 @@
-@import '../../styles/themes';
-
-@include nb-install-component() {
-  h6 {
-    margin-bottom: 0.875rem;
-    text-align: center;
-    font-weight: bold;
-    text-shadow: 0 0 8px rgba(0, 0, 0, 0.16);
-  }
-
-  .settings-row {
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-    flex-wrap: wrap;
-    width: 100%;
-    margin: 0 0 2.575rem;
-
-    a {
-      display: flex;
-      justify-content: center;
-      align-content: center;
-      align-items: center;
-      width: 4.15rem;
-      height: 4.15rem;
-      border-radius: nb-theme(radius);
-      background-color: nb-theme(color-white);
-      border: 2px solid transparent;
-      margin: 0.875rem;
-      text-decoration: none;
-      font-size: 2.25rem;
-      color: nb-theme(color-fg);
-
-      &.selected {
-        color: nb-theme(color-success);
-        border-color: nb-theme(color-success);
-      }
-
-      @include nb-for-theme(cosmic) {
-        box-shadow: 0 4px 14px 0 rgba(19, 19, 94, 0.4);
-        background-color: #3e367e;
-        border: 2px solid #3e367e;
-        &.selected {
-          color: nb-theme(link-color);
-        }
-      }
-    }
-  }
-
-  .settings {
-    margin-bottom: 1em;
-  }
-
-  .switcher {
-    margin-bottom: 1rem;
-    font-size: 1.524rem;
-    width: 12rem;
-
-    /deep/ ngx-switcher {
-      .switch-label span {
-        font-size: 1em;
-        font-weight: normal;
-        &.first, &.second {
-          font-size: 1rem;
-        }
-      }
-
-      .switch {
-        height: 1.5em;
-        width: 3em;
-
-        .slider::before {
-          height: 1.5em;
-          width: 1.5em;
-        }
-
-        input:checked + .slider::before {
-          @include nb-ltr(transform, translateX(1.5em)!important);
-          @include nb-rtl(transform, translateX(-1.5em)!important);
-        }
-      }
-
-      @include nb-for-theme(cosmic) {
-        .switch .slider {
-          background-color: nb-theme(color-bg);
-        }
-      }
-    }
-  }
-}
diff --git a/src/app/@theme/components/theme-settings/theme-settings.component.ts b/src/app/@theme/components/theme-settings/theme-settings.component.ts
deleted file mode 100644
index 63230aa083..0000000000
--- a/src/app/@theme/components/theme-settings/theme-settings.component.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Component } from '@angular/core';
-
-import { StateService } from '../../../@core/utils';
-
-@Component({
-  selector: 'ngx-theme-settings',
-  styleUrls: ['./theme-settings.component.scss'],
-  template: `
-    <h6>LAYOUTS</h6>
-    <div class="settings-row">
-      <a *ngFor="let layout of layouts"
-         href="#"
-         [class.selected]="layout.selected"
-         [attr.title]="layout.name"
-         (click)="layoutSelect(layout)">
-        <i [attr.class]="layout.icon"></i>
-      </a>
-    </div>
-    <h6>SIDEBAR</h6>
-    <div class="settings-row">
-      <a *ngFor="let sidebar of sidebars"
-         href="#"
-         [class.selected]="sidebar.selected"
-         [attr.title]="sidebar.name"
-         (click)="sidebarSelect(sidebar)">
-        <i [attr.class]="sidebar.icon"></i>
-      </a>
-    </div>
-    <div class="settings-row">
-      <div class="switcher">
-        <ngx-layout-direction-switcher></ngx-layout-direction-switcher>
-      </div>
-    </div>
-  `,
-})
-export class ThemeSettingsComponent {
-
-  layouts = [];
-  sidebars = [];
-
-  constructor(protected stateService: StateService) {
-    this.stateService.getLayoutStates()
-      .subscribe((layouts: any[]) => this.layouts = layouts);
-
-    this.stateService.getSidebarStates()
-      .subscribe((sidebars: any[]) => this.sidebars = sidebars);
-  }
-
-  layoutSelect(layout: any): boolean {
-    this.layouts = this.layouts.map((l: any) => {
-      l.selected = false;
-      return l;
-    });
-
-    layout.selected = true;
-    this.stateService.setLayoutState(layout);
-    return false;
-  }
-
-  sidebarSelect(sidebars: any): boolean {
-    this.sidebars = this.sidebars.map((s: any) => {
-      s.selected = false;
-      return s;
-    });
-
-    sidebars.selected = true;
-    this.stateService.setSidebarState(sidebars);
-    return false;
-  }
-}
diff --git a/src/app/@theme/components/theme-switcher/theme-switcher.component.html b/src/app/@theme/components/theme-switcher/theme-switcher.component.html
deleted file mode 100644
index 488e1e9196..0000000000
--- a/src/app/@theme/components/theme-switcher/theme-switcher.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="themes-switcher"
-     [nbPopover]="switcherListComponent"
-     nbPopoverPlacement="bottom"
-     [nbPopoverContext]="{popover: popover}">
-  <i class="nb-drops"></i>
-  <span *ngIf="showTitle">Themes</span>
-</div>
diff --git a/src/app/@theme/components/theme-switcher/theme-switcher.component.scss b/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
deleted file mode 100644
index cf60d15fb6..0000000000
--- a/src/app/@theme/components/theme-switcher/theme-switcher.component.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-@import '../../styles/themes';
-@import '~@nebular/theme/styles/core/mixins';
-@import '~@nebular/theme/styles/core/functions';
-
-@include nb-install-component() {
-  .themes-switcher {
-    display: flex;
-    font-size: 1.25rem;
-    padding: 0.8rem 1.25rem;
-    align-items: center;
-    cursor: pointer;
-    background-color: nb-theme(switcher-background);
-    border-radius: nb-theme(radius);
-
-    &:hover {
-      $color: nb-theme(switcher-background);
-      $percentage: nb-theme(switcher-background-percentage);
-
-      background-color: tint($color, $percentage);
-    }
-
-    span {
-      margin: 0 1.2rem;
-    }
-
-    i {
-      color: nb-theme(color-primary);
-      font-size: 1.8rem;
-      border-radius: 50%;
-      position: relative;
-
-      @include nb-for-theme(default) {
-        color: nb-theme(color-success);
-      }
-
-      @include nb-for-theme(corporate) {
-        color: nb-theme(color-fg-highlight);
-      }
-
-      &::before {
-        // Hack for IE11, IE11 should not set background
-        background: nb-theme(drops-icon-line-gadient);
-        -webkit-background-clip: text;
-        -webkit-text-fill-color: transparent;
-      }
-    }
-  }
-}
-
-
diff --git a/src/app/@theme/components/theme-switcher/theme-switcher.component.ts b/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
deleted file mode 100644
index 44a6840eca..0000000000
--- a/src/app/@theme/components/theme-switcher/theme-switcher.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component, Input, ViewChild } from '@angular/core';
-import { NbPopoverDirective } from '@nebular/theme';
-import { NbJSThemeOptions } from '@nebular/theme/services/js-themes/theme.options';
-
-import { ThemeSwitcherListComponent } from './themes-switcher-list/themes-switcher-list.component';
-
-@Component({
-  selector: 'ngx-theme-switcher',
-  templateUrl: './theme-switcher.component.html',
-  styleUrls: ['./theme-switcher.component.scss'],
-})
-export class ThemeSwitcherComponent {
-  @ViewChild(NbPopoverDirective) popover: NbPopoverDirective;
-
-  @Input() showTitle: boolean = true;
-
-  switcherListComponent = ThemeSwitcherListComponent;
-  theme: NbJSThemeOptions;
-}
diff --git a/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss b/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
deleted file mode 100644
index ef1686346d..0000000000
--- a/src/app/@theme/components/theme-switcher/themes-switcher-list/theme-switcher-list.component.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-@import '../../../styles/themes';
-@import '~@nebular/theme/styles/core/mixins';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-$icon-color-default: #0bbb79;
-$icon-color-cosmic: #7958fa;
-$icon-color-corporate: #a7a2be;
-
-$icon-top-color-default: #01dbb5;
-$icon-top-color-cosmic: #a258fe;
-$icon-top-color-corporate: #e9e8eb;
-
-@include nb-install-component() {
-  /deep/ .themes-switcher-list {
-    padding: 1rem 2rem 1.25rem 0.5rem;
-    margin: 0;
-
-    @include nb-ltr(text-align, start);
-    @include nb-rtl(text-align, end);
-
-    .themes-switcher-item {
-      list-style: none;
-      cursor: pointer;
-
-      &:hover span {
-        opacity: 0.5;
-      }
-
-      i {
-        font-size: 2rem;
-
-        &.drop-icon-default {
-          color: $icon-color-default;
-
-          // Hack for IE11, IE11 should not set background
-          background: -webkit-linear-gradient($icon-top-color-default, $icon-color-default);
-        }
-
-        &.drop-icon-cosmic {
-          color: $icon-color-cosmic;
-
-          // Hack for IE11, IE11 should not set background
-          background: -webkit-linear-gradient($icon-top-color-cosmic, $icon-color-cosmic);
-        }
-
-        &.drop-icon-corporate {
-          color: $icon-color-corporate;
-
-          // Hack for IE11, IE11 should not set background
-          background: -webkit-linear-gradient($icon-top-color-corporate, $icon-color-corporate);
-        }
-
-        &.drop-icon-default,
-        &.drop-icon-cosmic,
-        &.drop-icon-corporate {
-          -webkit-background-clip: text;
-          -webkit-text-fill-color: transparent;
-        }
-      }
-
-      span {
-        font-weight: 300;
-        vertical-align: super;
-        padding-left: 1rem;
-        color: nb-theme(color-fg-heading);
-      }
-    }
-  }
-
-  @include media-breakpoint-down(is) {
-    /deep/ .themes-switcher-list {
-      display: none;
-    }
-  }
-}
diff --git a/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts b/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts
deleted file mode 100644
index b3a16391b9..0000000000
--- a/src/app/@theme/components/theme-switcher/themes-switcher-list/themes-switcher-list.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import {Component, Input} from '@angular/core';
-import { NbThemeService, NbPopoverDirective } from '@nebular/theme';
-import { AnalyticsService } from '../../../../@core/utils/analytics.service';
-import { NbJSThemeOptions } from '@nebular/theme/services/js-themes/theme.options';
-
-@Component({
-  selector: 'ngx-theme-switcher-list',
-  template: `
-    <ul class="themes-switcher-list">
-      <li class="themes-switcher-item"
-          *ngFor="let theme of themes"
-          (click)="onToggleTheme(theme.key)">
-        <i class="nb-drop" [ngClass]="'drop-icon-' + theme.key"></i>
-        <span>{{ theme.title }}</span>
-      </li>
-    </ul>
-  `,
-  styleUrls: ['./theme-switcher-list.component.scss'],
-})
-export class ThemeSwitcherListComponent {
-
-  @Input() popover: NbPopoverDirective;
-
-  theme: NbJSThemeOptions;
-
-  themes = [
-    {
-      title: 'Light',
-      key: 'default',
-    },
-    {
-      title: 'Cosmic',
-      key: 'cosmic',
-    },
-    {
-      title: 'Corporate',
-      key: 'corporate',
-    },
-  ];
-
-  constructor(
-    private themeService: NbThemeService,
-    private analyticsService: AnalyticsService,
-  ) {}
-
-  onToggleTheme(themeKey: string) {
-    this.themeService.changeTheme(themeKey);
-    this.analyticsService.trackEvent('switchTheme');
-    this.popover.hide();
-  }
-}
diff --git a/src/app/@theme/components/toggle-settings-button/toggle-settings-button.component.scss b/src/app/@theme/components/toggle-settings-button/toggle-settings-button.component.scss
deleted file mode 100644
index b46d36d03f..0000000000
--- a/src/app/@theme/components/toggle-settings-button/toggle-settings-button.component.scss
+++ /dev/null
@@ -1,118 +0,0 @@
-@import '../../styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-@import '~@nebular/bootstrap/styles/hero-buttons';
-
-@include nb-install-component() {
-  .toggle-settings {
-    position: fixed;
-    top: 50%;
-    height: 3rem;
-    width: 3rem;
-    padding: 0;
-    text-align: center;
-    border: none;
-    transition: transform 0.3s ease, background-image 0.3s ease;
-    transform: translate(0, -50%);
-    z-index: 998;
-
-    @include nb-ltr() {
-      border-top-left-radius: nb-theme(radius);
-      border-bottom-left-radius: nb-theme(radius);
-      right: 0;
-
-      &.sidebar-end {
-        border-top-left-radius: 0;
-        border-bottom-left-radius: 0;
-        right: auto;
-        border-top-right-radius: nb-theme(radius);
-        border-bottom-right-radius: nb-theme(radius);
-        left: 0;
-      }
-    }
-
-    @include nb-rtl() {
-      border-top-right-radius: nb-theme(radius);
-      border-bottom-right-radius: nb-theme(radius);
-      left: 0;
-
-      &.sidebar-end {
-        border-top-right-radius: 0;
-        border-bottom-right-radius: 0;
-        left: auto;
-        border-top-left-radius: nb-theme(radius);
-        border-bottom-left-radius: nb-theme(radius);
-        right: 0;
-      }
-    }
-
-    &.expanded {
-      @include nb-ltr(transform, translate(-19rem, -50%));
-      @include nb-rtl(transform, translate(19rem, -50%));
-
-      &.sidebar-end {
-        @include nb-rtl(transform, translate(-19rem, -50%));
-        @include nb-ltr(transform, translate(19rem, -50%));
-      }
-    }
-
-    @include nb-for-theme(cosmic) {
-      box-shadow: 0 0 3.4285rem 0 rgba(19, 19, 94, 0.72);
-      @include btn-hero-success-gradient();
-    }
-
-    @include nb-for-theme(default) {
-      border: 1px solid #d5dbe0;
-      box-shadow: 0 8px 24px 0 rgba(48, 59, 67, 0.15);
-      background-color: #ffffff;
-    }
-
-    @include nb-for-theme(corporate) {
-      border: 1px solid #d5dbe0;
-      box-shadow: 0 8px 24px 0 rgba(48, 59, 67, 0.15);
-      color: nb-theme(color-danger);
-      background-color: #ffffff;
-    }
-
-    i {
-      font-size: 2.75rem;
-      color: #ffffff;
-      display: block;
-
-
-      @include nb-for-theme(default) {
-        color: nb-theme(color-danger);
-      }
-
-      @include nb-for-theme(corporate) {
-        color: nb-theme(color-warning);
-      }
-    }
-
-    &:not(.was-expanded) i {
-      animation-name: gear-pulse;
-      animation-duration: 1s;
-      animation-iteration-count: infinite;
-    }
-
-    @keyframes gear-pulse {
-      from {
-        transform: scale3d(1, 1, 1);
-      }
-
-      50% {
-        transform: scale3d(1.2, 1.2, 1.2);
-      }
-
-      to {
-        transform: scale3d(1, 1, 1);
-      }
-    }
-  }
-
-  @include media-breakpoint-down(sm) {
-    .toggle-settings {
-      display: none;
-    }
-  }
-}
diff --git a/src/app/@theme/components/toggle-settings-button/toggle-settings-button.component.ts b/src/app/@theme/components/toggle-settings-button/toggle-settings-button.component.ts
deleted file mode 100644
index 8f4de25272..0000000000
--- a/src/app/@theme/components/toggle-settings-button/toggle-settings-button.component.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Component } from '@angular/core';
-import { NbSidebarService } from '@nebular/theme';
-import { StateService } from '../../../@core/utils';
-
-@Component({
-  selector: 'ngx-toggle-settings-button',
-  styleUrls: ['./toggle-settings-button.component.scss'],
-  template: `
-    <button class="toggle-settings"
-            (click)="toggleSettings()"
-            [class.expanded]="expanded"
-            [class.sidebar-end]="sidebarEnd"
-            [class.was-expanded]="wasExpanded"
-    >
-      <i class="nb-gear"></i>
-    </button>
-  `,
-})
-export class ToggleSettingsButtonComponent {
-
-  sidebarEnd = false;
-  expanded = false;
-  wasExpanded = false;
-
-  constructor(private sidebarService: NbSidebarService, protected stateService: StateService) {
-    this.stateService.onSidebarState()
-      .subscribe(({id}) => {
-        this.sidebarEnd = id === 'end';
-      });
-  }
-
-  toggleSettings() {
-    this.sidebarService.toggle(false, 'settings-sidebar');
-    this.expanded = !this.expanded;
-    this.wasExpanded = true;
-  }
-}
diff --git a/src/app/@theme/layouts/index.ts b/src/app/@theme/layouts/index.ts
index 812e427d3e..6d28d1517c 100644
--- a/src/app/@theme/layouts/index.ts
+++ b/src/app/@theme/layouts/index.ts
@@ -1,4 +1,3 @@
 export * from './one-column/one-column.layout';
 export * from './two-columns/two-columns.layout';
 export * from './three-columns/three-columns.layout';
-export * from './sample/sample.layout';
diff --git a/src/app/@theme/layouts/one-column/one-column.layout.scss b/src/app/@theme/layouts/one-column/one-column.layout.scss
index 32733f5674..448cb73846 100644
--- a/src/app/@theme/layouts/one-column/one-column.layout.scss
+++ b/src/app/@theme/layouts/one-column/one-column.layout.scss
@@ -3,155 +3,7 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-  nb-layout-column.small {
-    flex: 0.15 !important;
-  }
-
-  nb-sidebar.settings-sidebar {
-    $sidebar-width: 7.5rem;
-
-    transition: width 0.3s ease;
-    width: $sidebar-width;
-    overflow: hidden;
-
-    &.collapsed {
-      width: 0;
-
-      /deep/ .main-container {
-        width: 0;
-
-        .scrollable {
-          width: $sidebar-width;
-          padding: 1.25rem;
-        }
-      }
-    }
-
-    /deep/ .main-container {
-      width: $sidebar-width;
-      background: nb-theme(color-bg);
-      transition: width 0.3s ease;
-      overflow: hidden;
-
-      .scrollable {
-        width: $sidebar-width;
-      }
-
-      @include nb-for-theme(cosmic) {
-        background: nb-theme(layout-bg);
-      }
-    }
-  }
-
-  nb-sidebar.menu-sidebar {
-
-    margin-top: nb-theme(sidebar-header-gap);
-
-    @include nb-for-theme(corporate) {
-      margin-top: 0;
-    }
-
-    /deep/ .main-container {
-      height:
-        calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important;
-      @include nb-ltr(border-top-right-radius, nb-theme(radius));
-      @include nb-rtl(border-top-left-radius, nb-theme(radius));
-
-      @include nb-for-theme(corporate) {
-        border: 1px solid nb-theme(separator);
-        height:
-          calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important;
-      }
-    }
-
-    /deep/ .scrollable {
-      @include nb-for-theme(corporate) {
-        padding-top: 0;
-
-        .menu-item:first-child {
-          border-top: none;
-        }
-      }
-    }
-
-    /deep/ nb-sidebar-header {
-      padding-bottom: 0.5rem;
-      text-align: center;
-    }
-
-    background: transparent;
-
-    .main-btn {
-      padding: 0.75rem 2.5rem;
-      margin-top: -2rem;
-      font-weight: bold;
-      transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
-
-      @include nb-for-theme(corporate) {
-        border-radius: nb-theme(radius);
-      }
-
-      i {
-        font-size: 2rem;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-      }
-      span {
-        @include nb-ltr(padding-left, 0.25rem);
-        @include nb-rtl(padding-right, 0.25rem);
-      }
-
-      i, span {
-        vertical-align: middle;
-      }
-    }
-
-    &.compacted {
-
-      /deep/ nb-sidebar-header {
-        padding-left: 0;
-        padding-right: 0;
-      }
-
-      .main-btn {
-        width: 46px;
-        height: 44px;
-        padding: 0.375rem;
-        border-radius: 5px;
-        transition: none;
-
-        span {
-          display: none;
-        }
-      }
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    .main-content {
-      padding: 0.75rem !important;
-
-    }
-  }
-
-  @include media-breakpoint-down(sm) {
-
-    nb-sidebar.menu-sidebar {
-
-      margin-top: 0;
-
-      /deep/ .main-container {
-        height: calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important;
-        @include nb-ltr(border-top-right-radius, 0);
-        @include nb-rtl(border-top-left-radius, 0);
-
-        .scrollable {
-          padding-top: 0;
-        }
-      }
-    }
-
-    .main-btn {
-      display: none;
-    }
+  .menu-sidebar ::ng-deep .scrollable {
+    padding-top: nb-theme(layout-padding-top);
   }
 }
diff --git a/src/app/@theme/layouts/one-column/one-column.layout.ts b/src/app/@theme/layouts/one-column/one-column.layout.ts
index f85c33a1f2..eb8bc88e83 100644
--- a/src/app/@theme/layouts/one-column/one-column.layout.ts
+++ b/src/app/@theme/layouts/one-column/one-column.layout.ts
@@ -1,23 +1,19 @@
-import { Component, OnDestroy } from '@angular/core';
-import { NbThemeService } from '@nebular/theme';
-import { takeWhile } from 'rxjs/operators';
+import { AfterViewInit, Component, Inject, PLATFORM_ID, ViewChild } from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
+import { NbLayoutComponent } from '@nebular/theme';
+
+import { WindowModeBlockScrollService } from '../../services/window-mode-block-scroll.service';
 
-// TODO: move layouts into the framework
 @Component({
   selector: 'ngx-one-column-layout',
   styleUrls: ['./one-column.layout.scss'],
   template: `
-    <nb-layout>
+    <nb-layout windowMode>
       <nb-layout-header fixed>
         <ngx-header></ngx-header>
       </nb-layout-header>
 
       <nb-sidebar class="menu-sidebar" tag="menu-sidebar" responsive>
-        <nb-sidebar-header *ngIf="currentTheme !== 'corporate'">
-          <a href="#" class="btn btn-hero-success main-btn">
-            <i class="ion ion-social-github"></i> <span>Support Us</span>
-          </a>
-        </nb-sidebar-header>
         <ng-content select="nb-menu"></ng-content>
       </nb-sidebar>
 
@@ -31,21 +27,18 @@ import { takeWhile } from 'rxjs/operators';
     </nb-layout>
   `,
 })
-export class OneColumnLayoutComponent implements OnDestroy {
-
-  private alive = true;
+export class OneColumnLayoutComponent implements AfterViewInit {
 
-  currentTheme: string;
+  @ViewChild(NbLayoutComponent, { static: false }) layout: NbLayoutComponent;
 
-  constructor(protected themeService: NbThemeService) {
-    this.themeService.getJsTheme()
-      .pipe(takeWhile(() => this.alive))
-      .subscribe(theme => {
-        this.currentTheme = theme.name;
-    });
-  }
+  constructor(
+    @Inject(PLATFORM_ID) private platformId,
+    private windowModeBlockScrollService: WindowModeBlockScrollService,
+  ) {}
 
-  ngOnDestroy() {
-    this.alive = false;
+  ngAfterViewInit() {
+    if (isPlatformBrowser(this.platformId)) {
+      this.windowModeBlockScrollService.register(this.layout);
+    }
   }
 }
diff --git a/src/app/@theme/layouts/sample/sample.layout.scss b/src/app/@theme/layouts/sample/sample.layout.scss
deleted file mode 100644
index b3cf2c22c7..0000000000
--- a/src/app/@theme/layouts/sample/sample.layout.scss
+++ /dev/null
@@ -1,182 +0,0 @@
-@import '../../styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-  nb-layout-column.small {
-    flex: 0.15 !important;
-  }
-
-  nb-sidebar.settings-sidebar {
-    $sidebar-width: 19rem;
-
-    transition: transform 0.3s ease;
-    width: $sidebar-width;
-    overflow: hidden;
-    @include nb-ltr(transform, translate3d(100%, 0, 0));
-    @include nb-rtl(transform, translate3d(-100%, 0, 0));
-    &.start {
-      @include nb-ltr(transform, translate3d(-100%, 0, 0));
-      @include nb-rtl(transform, translate3d(100%, 0, 0));
-    }
-
-    &.expanded, &.expanded.start {
-      transform: translate3d(0, 0, 0);
-    }
-
-    /deep/ .scrollable {
-      width: $sidebar-width;
-      padding: 3.4rem 0.25rem;
-    }
-
-    /deep/ .main-container {
-      width: $sidebar-width;
-      background: nb-theme(color-bg);
-      transition: transform 0.3s ease;
-      overflow: hidden;
-      position: relative;
-
-      .scrollable {
-        width: $sidebar-width;
-      }
-
-      @include nb-for-theme(cosmic) {
-        background: nb-theme(layout-bg);
-      }
-    }
-  }
-
-  nb-sidebar.menu-sidebar {
-
-    margin-top: nb-theme(sidebar-header-gap);
-
-    @include nb-for-theme(corporate) {
-      margin-top: 0;
-    }
-
-    /deep/ .main-container {
-      height:
-        calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important;
-      @include nb-ltr(border-top-right-radius, nb-theme(radius));
-      @include nb-rtl(border-top-left-radius, nb-theme(radius));
-
-      @include nb-for-theme(corporate) {
-        border: 1px solid nb-theme(separator);
-        height:
-          calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important;
-      }
-    }
-
-    /deep/ .scrollable {
-      @include nb-for-theme(corporate) {
-        padding-top: 0;
-
-        .menu-item:first-child {
-          border-top: none;
-        }
-      }
-    }
-
-    /deep/ nb-sidebar-header {
-      padding-bottom: 0.5rem;
-      text-align: center;
-    }
-
-    background: transparent;
-
-    .main-btn {
-      padding: 0.75rem 2.5rem;
-      margin-top: -2rem;
-      font-weight: bold;
-      transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
-
-      @include nb-for-theme(corporate) {
-        border-radius: nb-theme(radius);
-      }
-
-      i {
-        font-size: 2rem;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-      }
-      span {
-        @include nb-ltr(padding-left, 0.25rem);
-        @include nb-rtl(padding-right, 0.25rem);
-      }
-
-      i, span {
-        vertical-align: middle;
-      }
-    }
-
-    /deep/ nb-menu {
-      & > .menu-items {
-        & > .menu-item:first-child {
-          .menu-title {
-            &::after {
-              content: 'new';
-              color: nb-theme(color-white);
-              margin-left: 1rem;
-              background: nb-theme(color-danger);
-              padding: 0 0.5rem;
-              border-radius: nb-theme(radius);
-              font-size: nb-theme(font-size-sm);
-            }
-          }
-        }
-      }
-
-      .nb-e-commerce {
-        font-size: 2rem;
-      }
-    }
-
-    &.compacted {
-
-      /deep/ nb-sidebar-header {
-        padding-left: 0;
-        padding-right: 0;
-      }
-
-      .main-btn {
-        width: 46px;
-        height: 44px;
-        padding: 0.375rem;
-        border-radius: 5px;
-        transition: none;
-
-        span {
-          display: none;
-        }
-      }
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    .main-content {
-      padding: 0.75rem !important;
-
-    }
-  }
-
-  @include media-breakpoint-down(sm) {
-
-    nb-sidebar.menu-sidebar {
-
-      margin-top: 0;
-
-      /deep/ .main-container {
-        height: calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important;
-        @include nb-ltr(border-top-right-radius, 0);
-        @include nb-rtl(border-top-left-radius, 0);
-
-        .scrollable {
-          padding-top: 0;
-        }
-      }
-    }
-
-    .main-btn {
-      display: none;
-    }
-  }
-}
diff --git a/src/app/@theme/layouts/sample/sample.layout.ts b/src/app/@theme/layouts/sample/sample.layout.ts
deleted file mode 100644
index 22a4275cf2..0000000000
--- a/src/app/@theme/layouts/sample/sample.layout.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import { Component, OnDestroy } from '@angular/core';
-import { delay, withLatestFrom, takeWhile } from 'rxjs/operators';
-import {
-  NbMediaBreakpoint,
-  NbMediaBreakpointsService,
-  NbMenuItem,
-  NbMenuService,
-  NbSidebarService,
-  NbThemeService,
-} from '@nebular/theme';
-
-import { StateService } from '../../../@core/utils';
-
-// TODO: move layouts into the framework
-@Component({
-  selector: 'ngx-sample-layout',
-  styleUrls: ['./sample.layout.scss'],
-  template: `
-    <nb-layout [center]="layout.id === 'center-column'" windowMode>
-      <nb-layout-header fixed>
-        <ngx-header [position]="sidebar.id === 'start' ? 'normal': 'inverse'"></ngx-header>
-      </nb-layout-header>
-
-      <nb-sidebar class="menu-sidebar"
-                   tag="menu-sidebar"
-                   responsive
-                   [end]="sidebar.id === 'end'">
-        <nb-sidebar-header *ngIf="currentTheme !== 'corporate'">
-          <a href="#" class="btn btn-hero-success main-btn">
-            <i class="ion ion-social-github"></i> <span>Support Us</span>
-          </a>
-        </nb-sidebar-header>
-        <ng-content select="nb-menu"></ng-content>
-      </nb-sidebar>
-
-      <nb-layout-column class="main-content">
-        <ng-content select="router-outlet"></ng-content>
-      </nb-layout-column>
-
-      <nb-layout-column start class="small" *ngIf="layout.id === 'two-column' || layout.id === 'three-column'">
-        <nb-menu [items]="subMenu"></nb-menu>
-      </nb-layout-column>
-
-      <nb-layout-column class="small" *ngIf="layout.id === 'three-column'">
-        <nb-menu [items]="subMenu"></nb-menu>
-      </nb-layout-column>
-
-      <nb-layout-footer fixed>
-        <ngx-footer></ngx-footer>
-      </nb-layout-footer>
-
-      <nb-sidebar class="settings-sidebar"
-                   tag="settings-sidebar"
-                   state="collapsed"
-                   fixed
-                   [end]="sidebar.id !== 'end'">
-        <ngx-theme-settings></ngx-theme-settings>
-      </nb-sidebar>
-    </nb-layout>
-    <ngx-toggle-settings-button></ngx-toggle-settings-button>
-  `,
-})
-export class SampleLayoutComponent implements OnDestroy {
-
-  subMenu: NbMenuItem[] = [
-    {
-      title: 'PAGE LEVEL MENU',
-      group: true,
-    },
-    {
-      title: 'Buttons',
-      icon: 'ion ion-android-radio-button-off',
-      link: '/pages/ui-features/buttons',
-    },
-    {
-      title: 'Grid',
-      icon: 'ion ion-android-radio-button-off',
-      link: '/pages/ui-features/grid',
-    },
-    {
-      title: 'Icons',
-      icon: 'ion ion-android-radio-button-off',
-      link: '/pages/ui-features/icons',
-    },
-    {
-      title: 'Modals',
-      icon: 'ion ion-android-radio-button-off',
-      link: '/pages/ui-features/modals',
-    },
-    {
-      title: 'Typography',
-      icon: 'ion ion-android-radio-button-off',
-      link: '/pages/ui-features/typography',
-    },
-    {
-      title: 'Animated Searches',
-      icon: 'ion ion-android-radio-button-off',
-      link: '/pages/ui-features/search-fields',
-    },
-    {
-      title: 'Tabs',
-      icon: 'ion ion-android-radio-button-off',
-      link: '/pages/ui-features/tabs',
-    },
-  ];
-  layout: any = {};
-  sidebar: any = {};
-
-  private alive = true;
-
-  currentTheme: string;
-
-  constructor(protected stateService: StateService,
-              protected menuService: NbMenuService,
-              protected themeService: NbThemeService,
-              protected bpService: NbMediaBreakpointsService,
-              protected sidebarService: NbSidebarService) {
-    this.stateService.onLayoutState()
-      .pipe(takeWhile(() => this.alive))
-      .subscribe((layout: string) => this.layout = layout);
-
-    this.stateService.onSidebarState()
-      .pipe(takeWhile(() => this.alive))
-      .subscribe((sidebar: string) => {
-        this.sidebar = sidebar;
-      });
-
-    const isBp = this.bpService.getByName('is');
-    this.menuService.onItemSelect()
-      .pipe(
-        takeWhile(() => this.alive),
-        withLatestFrom(this.themeService.onMediaQueryChange()),
-        delay(20),
-      )
-      .subscribe(([item, [bpFrom, bpTo]]: [any, [NbMediaBreakpoint, NbMediaBreakpoint]]) => {
-
-        if (bpTo.width <= isBp.width) {
-          this.sidebarService.collapse('menu-sidebar');
-        }
-      });
-
-    this.themeService.getJsTheme()
-      .pipe(takeWhile(() => this.alive))
-      .subscribe(theme => {
-        this.currentTheme = theme.name;
-    });
-  }
-
-  ngOnDestroy() {
-    this.alive = false;
-  }
-}
diff --git a/src/app/@theme/layouts/three-columns/three-columns.layout.scss b/src/app/@theme/layouts/three-columns/three-columns.layout.scss
index 32733f5674..448cb73846 100644
--- a/src/app/@theme/layouts/three-columns/three-columns.layout.scss
+++ b/src/app/@theme/layouts/three-columns/three-columns.layout.scss
@@ -3,155 +3,7 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-  nb-layout-column.small {
-    flex: 0.15 !important;
-  }
-
-  nb-sidebar.settings-sidebar {
-    $sidebar-width: 7.5rem;
-
-    transition: width 0.3s ease;
-    width: $sidebar-width;
-    overflow: hidden;
-
-    &.collapsed {
-      width: 0;
-
-      /deep/ .main-container {
-        width: 0;
-
-        .scrollable {
-          width: $sidebar-width;
-          padding: 1.25rem;
-        }
-      }
-    }
-
-    /deep/ .main-container {
-      width: $sidebar-width;
-      background: nb-theme(color-bg);
-      transition: width 0.3s ease;
-      overflow: hidden;
-
-      .scrollable {
-        width: $sidebar-width;
-      }
-
-      @include nb-for-theme(cosmic) {
-        background: nb-theme(layout-bg);
-      }
-    }
-  }
-
-  nb-sidebar.menu-sidebar {
-
-    margin-top: nb-theme(sidebar-header-gap);
-
-    @include nb-for-theme(corporate) {
-      margin-top: 0;
-    }
-
-    /deep/ .main-container {
-      height:
-        calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important;
-      @include nb-ltr(border-top-right-radius, nb-theme(radius));
-      @include nb-rtl(border-top-left-radius, nb-theme(radius));
-
-      @include nb-for-theme(corporate) {
-        border: 1px solid nb-theme(separator);
-        height:
-          calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important;
-      }
-    }
-
-    /deep/ .scrollable {
-      @include nb-for-theme(corporate) {
-        padding-top: 0;
-
-        .menu-item:first-child {
-          border-top: none;
-        }
-      }
-    }
-
-    /deep/ nb-sidebar-header {
-      padding-bottom: 0.5rem;
-      text-align: center;
-    }
-
-    background: transparent;
-
-    .main-btn {
-      padding: 0.75rem 2.5rem;
-      margin-top: -2rem;
-      font-weight: bold;
-      transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
-
-      @include nb-for-theme(corporate) {
-        border-radius: nb-theme(radius);
-      }
-
-      i {
-        font-size: 2rem;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-      }
-      span {
-        @include nb-ltr(padding-left, 0.25rem);
-        @include nb-rtl(padding-right, 0.25rem);
-      }
-
-      i, span {
-        vertical-align: middle;
-      }
-    }
-
-    &.compacted {
-
-      /deep/ nb-sidebar-header {
-        padding-left: 0;
-        padding-right: 0;
-      }
-
-      .main-btn {
-        width: 46px;
-        height: 44px;
-        padding: 0.375rem;
-        border-radius: 5px;
-        transition: none;
-
-        span {
-          display: none;
-        }
-      }
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    .main-content {
-      padding: 0.75rem !important;
-
-    }
-  }
-
-  @include media-breakpoint-down(sm) {
-
-    nb-sidebar.menu-sidebar {
-
-      margin-top: 0;
-
-      /deep/ .main-container {
-        height: calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important;
-        @include nb-ltr(border-top-right-radius, 0);
-        @include nb-rtl(border-top-left-radius, 0);
-
-        .scrollable {
-          padding-top: 0;
-        }
-      }
-    }
-
-    .main-btn {
-      display: none;
-    }
+  .menu-sidebar ::ng-deep .scrollable {
+    padding-top: nb-theme(layout-padding-top);
   }
 }
diff --git a/src/app/@theme/layouts/three-columns/three-columns.layout.ts b/src/app/@theme/layouts/three-columns/three-columns.layout.ts
index bee38b627f..0c7528d781 100644
--- a/src/app/@theme/layouts/three-columns/three-columns.layout.ts
+++ b/src/app/@theme/layouts/three-columns/three-columns.layout.ts
@@ -1,23 +1,15 @@
-import { Component, OnDestroy } from '@angular/core';
-import { NbThemeService } from '@nebular/theme';
-import { takeWhile } from 'rxjs/operators';
+import { Component } from '@angular/core';
 
-// TODO: move layouts into the framework
 @Component({
   selector: 'ngx-three-columns-layout',
   styleUrls: ['./three-columns.layout.scss'],
   template: `
-    <nb-layout>
+    <nb-layout windowMode>
       <nb-layout-header fixed>
         <ngx-header></ngx-header>
       </nb-layout-header>
 
-      <nb-sidebar class="menu-sidebar" tag="menu-sidebar" responsive >
-        <nb-sidebar-header *ngIf="currentTheme !== 'corporate'">
-          <a href="#" class="btn btn-hero-success main-btn">
-            <i class="ion ion-social-github"></i> <span>Support Us</span>
-          </a>
-        </nb-sidebar-header>
+      <nb-sidebar class="menu-sidebar" tag="menu-sidebar" responsive>
         <ng-content select="nb-menu"></ng-content>
       </nb-sidebar>
 
@@ -37,21 +29,4 @@ import { takeWhile } from 'rxjs/operators';
     </nb-layout>
   `,
 })
-export class ThreeColumnsLayoutComponent implements OnDestroy {
-
-  private alive = true;
-
-  currentTheme: string;
-
-  constructor(protected themeService: NbThemeService) {
-    this.themeService.getJsTheme()
-      .pipe(takeWhile(() => this.alive))
-      .subscribe(theme => {
-        this.currentTheme = theme.name;
-    });
-  }
-
-  ngOnDestroy() {
-    this.alive = false;
-  }
-}
+export class ThreeColumnsLayoutComponent {}
diff --git a/src/app/@theme/layouts/two-columns/two-columns.layout.scss b/src/app/@theme/layouts/two-columns/two-columns.layout.scss
index c5eae39a4f..448cb73846 100644
--- a/src/app/@theme/layouts/two-columns/two-columns.layout.scss
+++ b/src/app/@theme/layouts/two-columns/two-columns.layout.scss
@@ -3,156 +3,7 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-  nb-layout-column.small {
-    flex: 0.15 !important;
-  }
-
-  nb-sidebar.settings-sidebar {
-    $sidebar-width: 7.5rem;
-
-    transition: width 0.3s ease;
-    width: $sidebar-width;
-    overflow: hidden;
-
-    &.collapsed {
-      width: 0;
-
-      /deep/ .main-container {
-        width: 0;
-
-        .scrollable {
-          width: $sidebar-width;
-          padding: 1.25rem;
-        }
-      }
-    }
-
-    /deep/ .main-container {
-      width: $sidebar-width;
-      background: nb-theme(color-bg);
-      transition: width 0.3s ease;
-      overflow: hidden;
-
-      .scrollable {
-        width: $sidebar-width;
-      }
-
-      @include nb-for-theme(cosmic) {
-        background: nb-theme(layout-bg);
-      }
-    }
-  }
-
-  nb-sidebar.menu-sidebar {
-
-    margin-top: nb-theme(sidebar-header-gap);
-
-    @include nb-for-theme(corporate) {
-      margin-top: 0;
-    }
-
-    /deep/ .main-container {
-      height:
-        calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)} - #{nb-theme(sidebar-header-gap)}) !important;
-      @include nb-ltr(border-top-right-radius, nb-theme(radius));
-      @include nb-rtl(border-top-left-radius, nb-theme(radius));
-
-      @include nb-for-theme(corporate) {
-        border: 1px solid nb-theme(separator);
-        height:
-          calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important;
-
-      }
-    }
-
-    /deep/ .scrollable {
-      @include nb-for-theme(corporate) {
-        padding-top: 0;
-
-        .menu-item:first-child {
-          border-top: none;
-        }
-      }
-    }
-
-    /deep/ nb-sidebar-header {
-      padding-bottom: 0.5rem;
-      text-align: center;
-    }
-
-    background: transparent;
-
-    .main-btn {
-      padding: 0.75rem 2.5rem;
-      margin-top: -2rem;
-      font-weight: bold;
-      transition: padding 0.3s cubic-bezier(0.18, 0.89, 0.32, 1.48);
-
-      @include nb-for-theme(corporate) {
-        border-radius: nb-theme(radius);
-      }
-
-      i {
-        font-size: 2rem;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-      }
-      span {
-        @include nb-ltr(padding-left, 0.25rem);
-        @include nb-rtl(padding-right, 0.25rem);
-      }
-
-      i, span {
-        vertical-align: middle;
-      }
-    }
-
-    &.compacted {
-
-      /deep/ nb-sidebar-header {
-        padding-left: 0;
-        padding-right: 0;
-      }
-
-      .main-btn {
-        width: 46px;
-        height: 44px;
-        padding: 0.375rem;
-        border-radius: 5px;
-        transition: none;
-
-        span {
-          display: none;
-        }
-      }
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    .main-content {
-      padding: 0.75rem !important;
-
-    }
-  }
-
-  @include media-breakpoint-down(sm) {
-
-    nb-sidebar.menu-sidebar {
-
-      margin-top: 0;
-
-      /deep/ .main-container {
-        height: calc(#{nb-theme(sidebar-height)} - #{nb-theme(header-height)}) !important;
-        @include nb-ltr(border-top-right-radius, 0);
-        @include nb-rtl(border-top-left-radius, 0);
-
-        .scrollable {
-          padding-top: 0;
-        }
-      }
-    }
-
-    .main-btn {
-      display: none;
-    }
+  .menu-sidebar ::ng-deep .scrollable {
+    padding-top: nb-theme(layout-padding-top);
   }
 }
diff --git a/src/app/@theme/layouts/two-columns/two-columns.layout.ts b/src/app/@theme/layouts/two-columns/two-columns.layout.ts
index 4fc2cf5190..724feade83 100644
--- a/src/app/@theme/layouts/two-columns/two-columns.layout.ts
+++ b/src/app/@theme/layouts/two-columns/two-columns.layout.ts
@@ -1,23 +1,15 @@
-import { Component, OnDestroy } from '@angular/core';
-import { NbThemeService } from '@nebular/theme';
-import { takeWhile } from 'rxjs/operators';
+import { Component } from '@angular/core';
 
-// TODO: move layouts into the framework
 @Component({
   selector: 'ngx-two-columns-layout',
   styleUrls: ['./two-columns.layout.scss'],
   template: `
-    <nb-layout>
+    <nb-layout windowMode>
       <nb-layout-header fixed>
         <ngx-header></ngx-header>
       </nb-layout-header>
 
-      <nb-sidebar class="menu-sidebar" tag="menu-sidebar" responsive >
-        <nb-sidebar-header *ngIf="currentTheme !== 'corporate'">
-          <a href="#" class="btn btn-hero-success main-btn">
-            <i class="ion ion-social-github"></i> <span>Support Us</span>
-          </a>
-        </nb-sidebar-header>
+      <nb-sidebar class="menu-sidebar" tag="menu-sidebar" responsive>
         <ng-content select="nb-menu"></ng-content>
       </nb-sidebar>
 
@@ -35,21 +27,4 @@ import { takeWhile } from 'rxjs/operators';
     </nb-layout>
   `,
 })
-export class TwoColumnsLayoutComponent implements OnDestroy {
-
-  private alive = true;
-
-  currentTheme: string;
-
-  constructor(protected themeService: NbThemeService) {
-    this.themeService.getJsTheme()
-      .pipe(takeWhile(() => this.alive))
-      .subscribe(theme => {
-        this.currentTheme = theme.name;
-    });
-  }
-
-  ngOnDestroy() {
-    this.alive = false;
-  }
-}
+export class TwoColumnsLayoutComponent {}
diff --git a/src/app/@theme/pipes/eva-icons.pipe.ts b/src/app/@theme/pipes/eva-icons.pipe.ts
deleted file mode 100644
index 91d3de04be..0000000000
--- a/src/app/@theme/pipes/eva-icons.pipe.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @license
- * Copyright Akveo. All Rights Reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- */
-
-import { DomSanitizer } from '@angular/platform-browser';
-import { Pipe, PipeTransform } from '@angular/core';
-import { icons } from 'eva-icons';
-
-@Pipe({ name: 'eva' })
-export class EvaIconsPipe implements PipeTransform {
-
-  private defaultOptions = {
-    height: 24,
-    width: 24,
-    fill: 'inherit',
-    animationHover: true,
-    animationInfinity: false,
-  };
-
-  constructor(private sanitizer: DomSanitizer) {}
-
-  transform(icon: string,
-            options: {
-              height: number;
-              width: number;
-              fill: string;
-              animationType?: string;
-              animationHover?: boolean;
-              animationInfinity?: boolean;
-            },
-  ) {
-    const mergedOptions = {
-      ...this.defaultOptions,
-      ...options,
-    };
-    const { width, height, fill, animationType, animationHover, animationInfinity } = mergedOptions;
-    const animation = animationType ?
-      { type: animationType, hover: animationHover, infinite: animationInfinity } :
-      null;
-
-    return this.sanitizer.bypassSecurityTrustHtml(icons[icon].toSvg({
-      width,
-      height,
-      fill,
-      animation,
-    }));
-  }
-}
diff --git a/src/app/@theme/pipes/index.ts b/src/app/@theme/pipes/index.ts
index 03f6d8cb19..6799066df9 100644
--- a/src/app/@theme/pipes/index.ts
+++ b/src/app/@theme/pipes/index.ts
@@ -3,4 +3,3 @@ export * from './plural.pipe';
 export * from './round.pipe';
 export * from './timing.pipe';
 export * from './number-with-commas.pipe';
-export * from './eva-icons.pipe';
diff --git a/src/app/@theme/services/window-mode-block-scroll.service.ts b/src/app/@theme/services/window-mode-block-scroll.service.ts
new file mode 100644
index 0000000000..74fc6a4cfb
--- /dev/null
+++ b/src/app/@theme/services/window-mode-block-scroll.service.ts
@@ -0,0 +1,132 @@
+import { Inject, Injectable, OnDestroy } from '@angular/core';
+import { coerceCssPixelValue } from '@angular/cdk/coercion';
+import {
+  NB_WINDOW,
+  NbLayoutComponent,
+  NbLayoutDimensions,
+  NbLayoutRulerService,
+  NbLayoutScrollService,
+  NbViewportRulerAdapter,
+} from '@nebular/theme';
+import { filter, map, take, takeUntil } from 'rxjs/operators';
+import { fromEvent as observableFromEvent, merge, Subject } from 'rxjs';
+
+@Injectable()
+export class WindowModeBlockScrollService implements OnDestroy {
+
+  private destroy$ = new Subject<void>();
+
+  private blockEnabled = false;
+  private unblock$ = new Subject<void>();
+
+  private container: HTMLElement;
+  private content: HTMLElement;
+
+  private previousScrollPosition: { top: number, left: number };
+  private previousContainerStyles: { overflowY: string };
+  private previousContentStyles: { left: string, top: string, width: string, overflow: string, position: string };
+
+  constructor(
+    private scrollService: NbLayoutScrollService,
+    private viewportRuler: NbViewportRulerAdapter,
+    private layout: NbLayoutRulerService,
+    @Inject(NB_WINDOW) private window,
+  ) {}
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+    this.unblock$.complete();
+  }
+
+  register(layout: NbLayoutComponent) {
+    this.container = layout.scrollableContainerRef.nativeElement;
+    this.content = this.container.children[0] as HTMLElement;
+
+    this.scrollService.onScrollableChange()
+      .pipe(
+        filter(() => layout.withScrollValue),
+        map((scrollable: boolean) => !scrollable),
+        takeUntil(this.destroy$),
+      )
+      .subscribe((shouldBlock: boolean) => {
+        if (shouldBlock) {
+          this.blockScroll();
+        } else {
+          this.unblockScroll();
+        }
+      });
+  }
+
+  blockScroll() {
+    if (!this.canBeBlocked()) {
+      return;
+    }
+
+    this.previousScrollPosition = this.viewportRuler.getViewportScrollPosition();
+    this.backupStyles();
+
+    this.container.style.overflowY = 'scroll';
+    this.content.style.overflow = 'hidden';
+    this.content.style.position = 'fixed';
+    this.updateContentSizeAndPosition();
+
+    observableFromEvent(this.window, 'resize')
+      .pipe(
+        takeUntil(merge(this.destroy$, this.unblock$).pipe(take(1))),
+      )
+      .subscribe(() => this.updateContentSizeAndPosition());
+
+    this.blockEnabled = true;
+  }
+
+  unblockScroll() {
+    if (this.blockEnabled) {
+      this.restoreStyles();
+      this.scrollService.scrollTo(this.previousScrollPosition.left, this.previousScrollPosition.top);
+      this.unblock$.next();
+      this.blockEnabled = false;
+    }
+  }
+
+  private canBeBlocked(): boolean {
+    if (this.blockEnabled) {
+      return false;
+    }
+
+    const { height: containerHeight } = this.viewportRuler.getViewportSize();
+    return this.content.scrollHeight > containerHeight;
+  }
+
+  private updateContentSizeAndPosition() {
+    const { top, left } = this.container.getBoundingClientRect();
+    this.content.style.left = coerceCssPixelValue(-this.previousScrollPosition.left + left);
+    this.content.style.top = coerceCssPixelValue(-this.previousScrollPosition.top + top);
+    this.layout.getDimensions()
+      .pipe(
+        map(({ clientWidth }: NbLayoutDimensions) => coerceCssPixelValue(clientWidth)),
+        take(1),
+      )
+      .subscribe((clientWidth: string) => this.content.style.width = clientWidth);
+  }
+
+  private backupStyles() {
+    this.previousContainerStyles = { overflowY: this.container.style.overflowY };
+    this.previousContentStyles = {
+      overflow: this.content.style.overflow,
+      position: this.content.style.position,
+      left: this.content.style.left,
+      top: this.content.style.top,
+      width: this.content.style.width,
+    };
+  }
+
+  private restoreStyles() {
+    this.container.style.overflowY = this.previousContainerStyles.overflowY;
+    this.content.style.overflow = this.previousContentStyles.overflow;
+    this.content.style.position = this.previousContentStyles.position;
+    this.content.style.left = this.previousContentStyles.left;
+    this.content.style.top = this.previousContentStyles.top;
+    this.content.style.width = this.previousContentStyles.width;
+  }
+}
diff --git a/src/app/@theme/styles/_overrides.scss b/src/app/@theme/styles/_overrides.scss
new file mode 100644
index 0000000000..e28846d97b
--- /dev/null
+++ b/src/app/@theme/styles/_overrides.scss
@@ -0,0 +1,68 @@
+@import './themes';
+
+@mixin nb-overrides() {
+  // overrides bootstrap svg style
+  nb-icon svg {
+    vertical-align: top;
+  }
+
+  nb-auth-block .links nb-icon {
+    font-size: 2.5rem;
+  }
+
+  nb-select.size-medium button {
+    padding: 0.4375rem 2.2rem 0.4375rem 1.125rem !important;
+
+    nb-icon {
+      right: 0.41rem !important;
+    }
+  }
+
+  nb-flip-card {
+    .front-container {
+      -webkit-backface-visibility: visible;
+    }
+    .back-container {
+      -webkit-backface-visibility: hidden;
+    }
+
+    .flipped {
+      .front-container {
+        -webkit-backface-visibility: hidden;
+      }
+      .back-container {
+        -webkit-backface-visibility: visible;
+      }
+    }
+  }
+
+  nb-layout .layout .layout-container nb-sidebar {
+    &,
+    .main-container-fixed {
+      top: nb-theme(header-height);
+    }
+  }
+
+  @media screen and (min-width: nb-theme(layout-window-mode-max-width) + 20px) {
+    @include f-window-mode(nb-theme(layout-window-mode-padding-top) / 4);
+  }
+
+  @media screen and (min-width: nb-theme(layout-window-mode-max-width) + 150px) {
+    @include f-window-mode(nb-theme(layout-window-mode-padding-top) / 2);
+  }
+
+  @media screen and (min-width: nb-theme(layout-window-mode-max-width) + 300px) {
+    @include f-window-mode(nb-theme(layout-window-mode-padding-top));
+  }
+}
+
+@mixin f-window-mode ($padding-top) {
+  nb-layout.window-mode nb-layout-header.fixed {
+    top: $padding-top;
+  }
+
+  nb-sidebar .main-container-fixed {
+    height: calc(100vh - #{nb-theme(header-height)} - #{$padding-top}) !important;
+    top: calc(#{nb-theme(header-height)} + #{$padding-top}) !important;
+  }
+}
diff --git a/src/app/@theme/styles/font-size.scss b/src/app/@theme/styles/font-size.scss
deleted file mode 100644
index 055870a6ca..0000000000
--- a/src/app/@theme/styles/font-size.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-html {
-  font-size: 14px;
-}
diff --git a/src/app/@theme/styles/pace.theme.scss b/src/app/@theme/styles/pace.theme.scss
index e3bc9b62e5..b93969e9fc 100644
--- a/src/app/@theme/styles/pace.theme.scss
+++ b/src/app/@theme/styles/pace.theme.scss
@@ -7,16 +7,14 @@
  @mixin ngx-pace-theme() {
 
   .pace .pace-progress {
-    background: nb-theme(color-fg-highlight);
+    background: nb-theme(color-primary-default);
   }
 
   .pace .pace-progress-inner {
-    box-shadow: 0 0 10px nb-theme(color-fg-highlight), 0 0 5px nb-theme(color-fg-highlight);
+    box-shadow: 0 0 10px nb-theme(color-primary-default), 0 0 5px nb-theme(color-primary-default);
   }
 
   .pace .pace-activity {
     display: none;
-    // border-top-color: nb-theme(color-fg-highlight);
-    // border-left-color: nb-theme(color-fg-highlight);
   }
 }
diff --git a/src/app/@theme/styles/styles.scss b/src/app/@theme/styles/styles.scss
index ffa0b697c6..14612c594e 100644
--- a/src/app/@theme/styles/styles.scss
+++ b/src/app/@theme/styles/styles.scss
@@ -1,3 +1,5 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&display=swap');
+
 // themes - our custom or/and out of the box themes
 @import 'themes';
 
@@ -5,14 +7,13 @@
 @import '~@nebular/theme/styles/globals';
 @import '~@nebular/auth/styles/all';
 @import '~@nebular/bootstrap/styles/globals';
-// ...
 
-// global app font size
-@import './font-size';
 
 // loading progress bar theme
 @import './pace.theme';
 
+@import './overrides';
+
 // install the framework and custom global styles
 @include nb-install() {
 
@@ -23,4 +24,6 @@
 
   // loading progress bar
   @include ngx-pace-theme();
+
+  @include nb-overrides();
 };
diff --git a/src/app/@theme/styles/theme.corporate.ts b/src/app/@theme/styles/theme.corporate.ts
index 5b6760d8c1..a0592eee0d 100644
--- a/src/app/@theme/styles/theme.corporate.ts
+++ b/src/app/@theme/styles/theme.corporate.ts
@@ -1,179 +1,226 @@
+import { NbJSThemeOptions } from '@nebular/theme';
+
+const palette = {
+  primary: '#73a1ff',
+  success: '#5dcfe3',
+  info: '#ba7fec',
+  warning: '#ffa36b',
+  danger: '#ff6b83',
+};
+
+const theme = {
+  fontMain: 'Open Sans, sans-serif',
+  fontSecondary: 'Raleway, sans-serif',
+
+  bg: '#ffffff',
+  bg2: '#f7f9fc',
+  bg3: '#edf1f7',
+  bg4: '#e4e9f2',
+
+  border: '#ffffff',
+  border2: '#f7f9fc',
+  border3: '#edf1f7',
+  border4: '#e4e9f2',
+  border5: '#c5cee0',
+
+  fg: '#8f9bb3',
+  fgHeading: '#1a2138',
+  fgText: '#1a2138',
+  fgHighlight: palette.primary,
+  layoutBg: '#f7f9fc',
+  separator: '#edf1f7',
+
+  primary: palette.primary,
+  success: palette.success,
+  info: palette.info,
+  warning: palette.warning,
+  danger: palette.danger,
+
+  primaryLight: '#598bff',
+  successLight: '#2ce69b',
+  infoLight: '#42aaff',
+  warningLight: '#ffc94d',
+  dangerLight: '#ff708d',
+};
+
 export const CORPORATE_THEME = {
   name: 'corporate',
-  base: 'default',
   variables: {
-    temperature: [
-      '#ffa36b',
-      '#ffa36b',
-      '#ff9e7a',
-      '#ff9888',
-      '#ff8ea0',
-    ],
+    ...theme,
+
+    temperature: {
+      arcFill: [ '#ffa36b', '#ffa36b', '#ff9e7a', '#ff9888', '#ff8ea0' ],
+      arcEmpty: theme.bg2,
+      thumbBg: theme.bg2,
+      thumbBorder: '#ffa36b',
+    },
 
     solar: {
-      gradientLeft: '#ff8ea0',
-      gradientRight: '#ffa36b',
+      gradientLeft: theme.primary,
+      gradientRight: theme.primary,
       shadowColor: 'rgba(0, 0, 0, 0)',
+      secondSeriesFill: theme.bg2,
       radius: ['80%', '90%'],
     },
 
     traffic: {
-      colorBlack: '#ffffff',
-      tooltipBg: '#eef2f5',
-      tooltipBorderColor: '#eef2f5',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: '400',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
 
-      lineBg: '#cae6f3',
+      yAxisSplitLine: 'rgba(0, 0, 0, 0)',
+
+      lineBg: theme.primary,
       lineShadowBlur: '0',
-      itemColor: '#bcc3cc',
-      itemBorderColor: '#bcc3cc',
-      itemEmphasisBorderColor: '#74a2ff',
+      itemColor: theme.border4,
+      itemBorderColor: theme.border4,
+      itemEmphasisBorderColor: theme.primaryLight,
       shadowLineDarkBg: 'rgba(0, 0, 0, 0)',
       shadowLineShadow: 'rgba(0, 0, 0, 0)',
-      gradFrom: '#ffffff',
-      gradTo: '#ffffff',
+      gradFrom: theme.bg,
+      gradTo: theme.bg,
     },
 
     electricity: {
-      tooltipBg: '#edf0f4',
-      tooltipLineColor: '#bdc4cd',
+      tooltipBg: theme.bg,
+      tooltipLineColor: theme.fgText,
       tooltipLineWidth: '0',
-      tooltipBorderColor: '#ebeef2',
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
 
-      axisLineColor: 'rgba(0, 0, 0, 0)',
-      xAxisTextColor: '#2a2a2a',
-      yAxisSplitLine: '#ebeef2',
+      axisLineColor: theme.border3,
+      xAxisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#73a1ff',
+      itemBorderColor: theme.primary,
       lineStyle: 'solid',
       lineWidth: '4',
-      lineGradFrom: '#bdc4cd',
-      lineGradTo: '#c0c8d1',
+      lineGradFrom: theme.primary,
+      lineGradTo: theme.primary,
       lineShadow: 'rgba(0, 0, 0, 0)',
 
-      areaGradFrom: 'rgba(255, 255, 255, 0)',
-      areaGradTo: 'rgba(255, 255, 255, 0)',
-      shadowLineDarkBg: 'rgba(255, 255, 255, 0)',
+      areaGradFrom: 'rgba(0, 0, 0, 0)',
+      areaGradTo: 'rgba(0, 0, 0, 0)',
+      shadowLineDarkBg: 'rgba(0, 0, 0, 0)',
     },
 
     bubbleMap: {
-      titleColor: '#484848',
-      areaColor: '#dddddd',
-      areaHoverColor: '#cccccc',
-      areaBorderColor: '#ebeef2',
+      titleColor: theme.fgText,
+      areaColor: theme.bg4,
+      areaHoverColor: theme.fgHighlight,
+      areaBorderColor: theme.border5,
     },
 
     profitBarAnimationEchart: {
-      textColor: '#b2bac2',
+      textColor: theme.fgText,
 
-      firstAnimationBarColor: '#719efc',
-      secondAnimationBarColor: '#5dcfe3',
+      firstAnimationBarColor: theme.primary,
+      secondAnimationBarColor: theme.success,
 
-      splitLineStyleOpacity: '0.06',
+      splitLineStyleOpacity: '1',
       splitLineStyleWidth: '1',
-      splitLineStyleColor: '#000000',
+      splitLineStyleColor: theme.separator,
 
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: '400',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
       tooltipFontSize: '16',
-      tooltipBg: '#eef2f5',
-      tooltipBorderColor: '#eef2f5',
-      tooltipBorderWidth: '3',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipBorderWidth: '1',
       tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
     },
 
     trafficBarEchart: {
-      gradientFrom: '#ff8ea0',
-      gradientTo: '#ffa36b',
-      shadow: 'rgba(0, 0, 0, 0)',
+      gradientFrom: theme.warningLight,
+      gradientTo: theme.warning,
+      shadow: theme.warningLight,
       shadowBlur: '0',
 
-      axisTextColor: '#b2bac2',
+      axisTextColor: theme.fgText,
       axisFontSize: '12',
 
-      tooltipBg: '#edf0f4',
-      tooltipBorderColor: '#ebeef2',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
     },
 
     countryOrders: {
-      countryBorderColor: 'rgba(255, 255, 255, 1)',
-      countryFillColor: 'rgba(236, 242, 245, 1)',
+      countryBorderColor: theme.border4,
+      countryFillColor: theme.bg4,
       countryBorderWidth: '1',
-      hoveredCountryBorderColor: 'rgba(113, 158, 252, 1)',
-      hoveredCountryFillColor: 'rgba(199, 216, 247, 1)',
-      hoveredCountryBorderWidth: '3',
+      hoveredCountryBorderColor: theme.primary,
+      hoveredCountryFillColor: theme.primaryLight,
+      hoveredCountryBorderWidth: '1',
 
-      chartAxisLineColor: 'rgba(0, 0, 0, 0)',
-      chartAxisTextColor: '#b2bac2',
+      chartAxisLineColor: theme.border4,
+      chartAxisTextColor: theme.fg,
       chartAxisFontSize: '16',
-      chartGradientTo: 'rgba(113, 158, 252, 1)',
-      chartGradientFrom: 'rgba(113, 158, 252, 1)',
-      chartAxisSplitLine: '#ebeef2',
-      chartShadowLineColor: '#2f296b',
+      chartGradientTo: theme.primary,
+      chartGradientFrom: theme.primaryLight,
+      chartAxisSplitLine: theme.separator,
+      chartShadowLineColor: theme.primaryLight,
 
-      chartLineBottomShadowColor: 'rgba(113, 158, 252, 1)',
+      chartLineBottomShadowColor: theme.primary,
 
-      chartInnerLineColor: '#eceff4',
+      chartInnerLineColor: theme.bg2,
     },
 
     echarts: {
-      bg: '#ffffff',
-      textColor: '#484848',
-      axisLineColor: '#bbbbbb',
-      splitLineColor: '#ebeef2',
+      bg: theme.bg,
+      textColor: theme.fgText,
+      axisLineColor: theme.fgText,
+      splitLineColor: theme.separator,
       itemHoverShadowColor: 'rgba(0, 0, 0, 0.5)',
-      tooltipBackgroundColor: '#6a7985',
+      tooltipBackgroundColor: theme.primary,
       areaOpacity: '0.7',
     },
 
     chartjs: {
-      axisLineColor: '#cccccc',
-      textColor: '#484848',
+      axisLineColor: theme.separator,
+      textColor: theme.fgText,
     },
 
     orders: {
-      tooltipBg: '#ffffff',
+      tooltipBg: theme.bg,
       tooltipLineColor: 'rgba(0, 0, 0, 0)',
       tooltipLineWidth: '0',
-      tooltipBorderColor: '#ebeef2',
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
       tooltipFontSize: '20',
 
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
+      axisLineColor: theme.border4,
       axisFontSize: '16',
-      axisTextColor: '#b2bac2',
-      yAxisSplitLine: 'rgba(161, 161 ,229, 0.2)',
+      axisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#73a1ff',
+      itemBorderColor: theme.primary,
       lineStyle: 'solid',
       lineWidth: '4',
 
       // first line
-      firstAreaGradFrom: 'rgba(227, 236, 254, 0.7)',
-      firstAreaGradTo: 'rgba(227, 236, 254, 0.7)',
+      firstAreaGradFrom: theme.bg3,
+      firstAreaGradTo: theme.bg3,
       firstShadowLineDarkBg: 'rgba(0, 0, 0, 0)',
 
       // second line
-      secondLineGradFrom: 'rgba(93, 207, 227, 1)',
-      secondLineGradTo: 'rgba(93, 207, 227, 1)',
+      secondLineGradFrom: theme.primary,
+      secondLineGradTo: theme.primary,
 
       secondAreaGradFrom: 'rgba(0, 0, 0, 0)',
       secondAreaGradTo: 'rgba(0, 0, 0, 0)',
       secondShadowLineDarkBg: 'rgba(0, 0, 0, 0)',
 
       // third line
-      thirdLineGradFrom: 'rgba(113, 158, 252, 1)',
-      thirdLineGradTo: 'rgba(113, 158, 252, 1)',
+      thirdLineGradFrom: theme.success,
+      thirdLineGradTo: theme.successLight,
 
       thirdAreaGradFrom: 'rgba(0, 0, 0, 0)',
       thirdAreaGradTo: 'rgba(0, 0, 0, 0)',
@@ -181,92 +228,91 @@ export const CORPORATE_THEME = {
     },
 
     profit: {
-      bg: '#ffffff',
-      textColor: '#ffffff',
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
-      splitLineColor: 'rgba(161, 161 ,229, 0.2)',
+      bg: theme.bg,
+      textColor: theme.fgText,
+      axisLineColor: theme.border4,
+      splitLineColor: theme.separator,
       areaOpacity: '1',
 
       axisFontSize: '16',
-      axisTextColor: '#b2bac2',
+      axisTextColor: theme.fg,
 
       // first bar
-      firstLineGradFrom: '#719efc',
-      firstLineGradTo: '#719efc',
-      firstLineShadow: 'rgba(14, 16, 48, 0.4)',
+      firstLineGradFrom: theme.bg3,
+      firstLineGradTo: theme.bg3,
+      firstLineShadow: 'rgba(0, 0, 0, 0)',
 
       // second bar
-      secondLineGradFrom: '#5dcfe3',
-      secondLineGradTo: '#5dcfe3',
-      secondLineShadow: 'rgba(14, 16, 48, 0.4)',
+      secondLineGradFrom: theme.primary,
+      secondLineGradTo: theme.primary,
+      secondLineShadow: 'rgba(0, 0, 0, 0)',
 
       // third bar
-      thirdLineGradFrom: '#e3ecfe',
-      thirdLineGradTo: '#e3ecfe',
-      thirdLineShadow: 'rgba(14, 16, 48, 0.4)',
+      thirdLineGradFrom: theme.success,
+      thirdLineGradTo: theme.success,
+      thirdLineShadow: 'rgba(0, 0, 0, 0)',
     },
 
     orderProfitLegend: {
-      firstItem: '#719efc',
-      secondItem: '#5dcfe3',
-      thirdItem: '#e3ecfe',
+      firstItem: theme.success,
+      secondItem: theme.primary,
+      thirdItem: theme.bg3,
     },
 
     visitors: {
-      tooltipBg: '#ffffff',
+      tooltipBg: theme.bg,
       tooltipLineColor: 'rgba(0, 0, 0, 0)',
-      tooltipLineWidth: '0',
-      tooltipBorderColor: '#ebeef2',
+      tooltipLineWidth: '1',
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
       tooltipFontSize: '20',
 
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
+      axisLineColor: theme.border4,
       axisFontSize: '16',
-      axisTextColor: '#b2bac2',
-      yAxisSplitLine: 'rgba(161, 161 ,229, 0.2)',
+      axisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#73a1ff',
+      itemBorderColor: theme.primary,
       lineStyle: 'dotted',
       lineWidth: '6',
-      lineGradFrom: '#73a1ff',
-      lineGradTo: '#73a1ff',
+      lineGradFrom: '#ffffff',
+      lineGradTo: '#ffffff',
       lineShadow: 'rgba(0, 0, 0, 0)',
 
-      areaGradFrom: 'rgba(146, 181, 252, 1)',
-      areaGradTo: 'rgba(146, 181, 252, 1)',
-      shadowLineDarkBg: '#a695ff',
+      areaGradFrom: theme.primary,
+      areaGradTo: theme.primaryLight,
 
       innerLineStyle: 'solid',
       innerLineWidth: '1',
 
-      innerAreaGradFrom: 'rgba(227, 236, 254, 1)',
-      innerAreaGradTo: 'rgba(227, 236, 254, 1)',
+      innerAreaGradFrom: theme.success,
+      innerAreaGradTo: theme.success,
     },
 
     visitorsLegend: {
-      firstIcon: '#e3ecfe',
-      secondIcon: '#719efc',
+      firstIcon: theme.success,
+      secondIcon: theme.primary,
     },
 
     visitorsPie: {
-      firstPieGradientLeft: '#94e2ed',
-      firstPieGradientRight: '#94e2ed',
+      firstPieGradientLeft: theme.success,
+      firstPieGradientRight: theme.success,
       firstPieShadowColor: 'rgba(0, 0, 0, 0)',
       firstPieRadius: ['65%', '90%'],
 
-      secondPieGradientLeft: '#719efc',
-      secondPieGradientRight: '#719efc',
-      secondPieShadowColor: '#b2cafb',
+      secondPieGradientLeft: theme.warning,
+      secondPieGradientRight: theme.warningLight,
+      secondPieShadowColor: 'rgba(0, 0, 0, 0)',
       secondPieRadius: ['63%', '92%'],
       shadowOffsetX: '-4',
       shadowOffsetY: '-4',
     },
 
     visitorsPieLegend: {
-      firstSection: '#719efc',
-      secondSection: '#99e5ee',
+      firstSection: theme.warning,
+      secondSection: theme.success,
     },
 
     earningPie: {
@@ -275,30 +321,30 @@ export const CORPORATE_THEME = {
 
       fontSize: '22',
 
-      firstPieGradientLeft: '#719efc',
-      firstPieGradientRight: '#719efc',
+      firstPieGradientLeft: theme.success,
+      firstPieGradientRight: theme.success,
       firstPieShadowColor: 'rgba(0, 0, 0, 0)',
 
-      secondPieGradientLeft: '#ff9f6f',
-      secondPieGradientRight: '#ff9f6f',
+      secondPieGradientLeft: theme.primary,
+      secondPieGradientRight: theme.primary,
       secondPieShadowColor: 'rgba(0, 0, 0, 0)',
 
-      thirdPieGradientLeft: '#ff5e83',
-      thirdPieGradientRight: '#ff5e83',
+      thirdPieGradientLeft: theme.warning,
+      thirdPieGradientRight: theme.warning,
       thirdPieShadowColor: 'rgba(0, 0, 0, 0)',
     },
 
     earningLine: {
-      gradFrom: '#e3ecfe',
-      gradTo: '#e3ecfe',
+      gradFrom: theme.primary,
+      gradTo: theme.primary,
 
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: '400',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
       tooltipFontSize: '16',
-      tooltipBg: '#eef2f5',
-      tooltipBorderColor: '#eef2f5',
-      tooltipBorderWidth: '3',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipBorderWidth: '1',
       tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
     },
   },
-};
+} as NbJSThemeOptions;
diff --git a/src/app/@theme/styles/theme.cosmic.ts b/src/app/@theme/styles/theme.cosmic.ts
index 9fb59cc91a..ca3360c36e 100644
--- a/src/app/@theme/styles/theme.cosmic.ts
+++ b/src/app/@theme/styles/theme.cosmic.ts
@@ -1,272 +1,318 @@
+import { NbJSThemeOptions } from '@nebular/theme';
+
+const palette = {
+  primary: '#a16eff',
+  success: '#00d68f',
+  info: '#0095ff',
+  warning: '#ffaa00',
+  danger: '#ff3d71',
+};
+
+const theme = {
+  fontMain: 'Open Sans, sans-serif',
+  fontSecondary: 'Raleway, sans-serif',
+
+  bg: '#323259',
+  bg2: '#252547',
+  bg3: '#1b1b38',
+  bg4: '#13132b',
+
+  border: '#323259',
+  border2: '#252547',
+  border3: '#1b1b38',
+  border4: '#13132b',
+  border5: '#13132b',
+
+  fg: '#b4b4db',
+  fgHeading: '#ffffff',
+  fgText: '#ffffff',
+  fgHighlight: palette.primary,
+  layoutBg: '#151a30',
+  separator: '#151a30',
+
+  primary: palette.primary,
+  success: palette.success,
+  info: palette.info,
+  warning: palette.warning,
+  danger: palette.danger,
+
+  primaryLight: '#b18aff',
+  successLight: '#2ce69b',
+  infoLight: '#42aaff',
+  warningLight: '#ffc94d',
+  dangerLight: '#ff708d',
+};
+
 export const COSMIC_THEME = {
   name: 'cosmic',
-  base: 'default',
   variables: {
+    ...theme,
 
-    temperature: [
-      '#2ec7fe',
-      '#31ffad',
-      '#7bff24',
-      '#fff024',
-      '#f7bd59',
-    ],
+    temperature: {
+      arcFill: [ '#2ec7fe', '#31ffad', '#7bff24', '#fff024', '#f7bd59' ],
+      arcEmpty: theme.bg2,
+      thumbBg: '#ffffff',
+      thumbBorder: '#ffffff',
+    },
 
     solar: {
-      gradientLeft: '#7bff24',
-      gradientRight: '#2ec7fe',
-      shadowColor: '#19977E',
+      gradientLeft: theme.primary,
+      gradientRight: theme.primary,
+      shadowColor: 'rgba(0, 0, 0, 0)',
+      secondSeriesFill: theme.bg2,
       radius: ['70%', '90%'],
     },
 
     traffic: {
-      colorBlack: '#000000',
-      tooltipBg: 'rgba(0, 255, 170, 0.35)',
-      tooltipBorderColor: '#00d977',
-      tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 4px 16px;',
-      tooltipTextColor: '#ffffff',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(50, 50, 89); border-radius: 10px; padding: 4px 16px;',
+      tooltipTextColor: theme.fgText,
       tooltipFontWeight: 'normal',
 
-      lineBg: '#d1d1ff',
+      yAxisSplitLine: theme.separator,
+
+      lineBg: theme.border2,
       lineShadowBlur: '14',
-      itemColor: '#BEBBFF',
-      itemBorderColor: '#ffffff',
-      itemEmphasisBorderColor: '#ffffff',
-      shadowLineDarkBg: '#655ABD',
-      shadowLineShadow: 'rgba(33, 7, 77, 0.5)',
-      gradFrom: 'rgba(118, 89, 255, 0.4)',
-      gradTo: 'rgba(164, 84, 255, 0.5)',
+      itemColor: theme.border2,
+      itemBorderColor: theme.border2,
+      itemEmphasisBorderColor: theme.primary,
+      shadowLineDarkBg: theme.border3,
+      shadowLineShadow: theme.border3,
+      gradFrom: theme.bg,
+      gradTo: theme.bg2,
     },
 
     electricity: {
-      tooltipBg: 'rgba(0, 255, 170, 0.35)',
-      tooltipLineColor: 'rgba(255, 255, 255, 0.1)',
-      tooltipLineWidth: '1',
-      tooltipBorderColor: '#00d977',
+      tooltipBg: theme.bg,
+      tooltipLineColor: theme.fgText,
+      tooltipLineWidth: '0',
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#ffffff',
+      tooltipTextColor: theme.fgText,
       tooltipFontWeight: 'normal',
 
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
-      xAxisTextColor: '#a1a1e5',
-      yAxisSplitLine: 'rgba(161, 161 ,229, 0.2)',
+      axisLineColor: theme.border3,
+      xAxisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#ffffff',
+      itemBorderColor: theme.border2,
       lineStyle: 'dotted',
       lineWidth: '6',
-      lineGradFrom: '#00ffaa',
-      lineGradTo: '#fff835',
-      lineShadow: 'rgba(14, 16, 48, 0.4)',
+      lineGradFrom: theme.success,
+      lineGradTo: theme.warning,
+      lineShadow: theme.bg4,
 
-      areaGradFrom: 'rgba(188, 92, 255, 0.5)',
-      areaGradTo: 'rgba(188, 92, 255, 0)',
-      shadowLineDarkBg: '#a695ff',
+      areaGradFrom: theme.bg2,
+      areaGradTo: theme.bg3,
+      shadowLineDarkBg: theme.bg3,
     },
 
     bubbleMap: {
-      titleColor: '#ffffff',
-      areaColor: '#2c2961',
-      areaHoverColor: '#a1a1e5',
-      areaBorderColor: '#654ddb',
+      titleColor: theme.fgText,
+      areaColor: theme.bg4,
+      areaHoverColor: theme.fgHighlight,
+      areaBorderColor: theme.border5,
     },
 
     profitBarAnimationEchart: {
-      textColor: '#ffffff',
+      textColor: theme.fgText,
 
-      firstAnimationBarColor: '#0088ff',
-      secondAnimationBarColor: '#7659ff',
+      firstAnimationBarColor: theme.primary,
+      secondAnimationBarColor: theme.success,
 
-      splitLineStyleOpacity: '0.06',
+      splitLineStyleOpacity: '1',
       splitLineStyleWidth: '1',
-      splitLineStyleColor: '#000000',
+      splitLineStyleColor: theme.border2,
 
-      tooltipTextColor: '#ffffff',
+      tooltipTextColor: theme.fgText,
       tooltipFontWeight: 'normal',
       tooltipFontSize: '16',
-      tooltipBg: 'rgba(0, 255, 170, 0.35)',
-      tooltipBorderColor: '#00d977',
-      tooltipBorderWidth: '3',
-      tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 4px 16px;',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipBorderWidth: '1',
+      tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
     },
 
     trafficBarEchart: {
-      gradientFrom: '#fc0',
-      gradientTo: '#ffa100',
-      shadow: '#ffb600',
+      gradientFrom: theme.warningLight,
+      gradientTo: theme.warning,
+      shadow: theme.warningLight,
       shadowBlur: '5',
 
-      axisTextColor: '#a1a1e5',
+      axisTextColor: theme.fgText,
       axisFontSize: '12',
 
-      tooltipBg: 'rgba(0, 255, 170, 0.35)',
-      tooltipBorderColor: '#00d977',
-      tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 4px 16px;',
-      tooltipTextColor: '#ffffff',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
+      tooltipTextColor: theme.fgText,
       tooltipFontWeight: 'normal',
     },
 
     countryOrders: {
-      countryBorderColor: '#525dbd',
-      countryFillColor: '#4f41a6',
-      countryBorderWidth: '2',
-      hoveredCountryBorderColor: '#00f9a6',
-      hoveredCountryFillColor: '#377aa7',
-      hoveredCountryBorderWidth: '3',
-
-      chartAxisLineColor: 'rgba(161, 161 ,229, 0.3)',
-      chartAxisTextColor: '#a1a1e5',
+      countryBorderColor: theme.border4,
+      countryFillColor: theme.bg3,
+      countryBorderWidth: '1',
+      hoveredCountryBorderColor: theme.primary,
+      hoveredCountryFillColor: theme.primaryLight,
+      hoveredCountryBorderWidth: '1',
+
+      chartAxisLineColor: theme.border4,
+      chartAxisTextColor: theme.fg,
       chartAxisFontSize: '16',
-      chartGradientTo: '#00c7c7',
-      chartGradientFrom: '#00d977',
-      chartAxisSplitLine: 'rgba(161, 161 ,229, 0.2)',
-      chartShadowBarColor: '#2f296b',
+      chartGradientTo: theme.primary,
+      chartGradientFrom: theme.primaryLight,
+      chartAxisSplitLine: theme.separator,
+      chartShadowLineColor: theme.primaryLight,
 
-      chartLineBottomShadowColor: '#00977e',
+      chartLineBottomShadowColor: theme.primary,
 
-      chartInnerLineColor: '#2f296b',
+      chartInnerLineColor: theme.bg2,
     },
 
     echarts: {
-      bg: '#3d3780',
-      textColor: '#ffffff',
-      axisLineColor: '#a1a1e5',
-      splitLineColor: '#342e73',
+      bg: theme.bg,
+      textColor: theme.fgText,
+      axisLineColor: theme.fgText,
+      splitLineColor: theme.separator,
       itemHoverShadowColor: 'rgba(0, 0, 0, 0.5)',
-      tooltipBackgroundColor: '#6a7985',
+      tooltipBackgroundColor: theme.primary,
       areaOpacity: '1',
     },
 
     chartjs: {
-      axisLineColor: '#a1a1e5',
-      textColor: '#ffffff',
+      axisLineColor: theme.separator,
+      textColor: theme.fgText,
     },
 
     orders: {
-      tooltipBg: 'rgba(0, 255, 170, 0.35)',
-      tooltipLineColor: 'rgba(255, 255, 255, 0.1)',
-      tooltipLineWidth: '1',
-      tooltipBorderColor: '#00d977',
-      tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#ffffff',
+      tooltipBg: theme.bg,
+      tooltipLineColor: 'rgba(0, 0, 0, 0)',
+      tooltipLineWidth: '0',
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
+      tooltipTextColor: theme.fgText,
       tooltipFontWeight: 'normal',
       tooltipFontSize: '20',
 
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
+      axisLineColor: theme.border4,
       axisFontSize: '16',
-      axisTextColor: '#a1a1e5',
-      yAxisSplitLine: 'rgba(161, 161 ,229, 0.2)',
+      axisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#ffffff',
+      itemBorderColor: theme.primary,
       lineStyle: 'solid',
       lineWidth: '4',
 
       // first line
-      firstAreaGradFrom: 'rgba(78, 64, 164, 1)',
-      firstAreaGradTo: 'rgba(78, 64, 164, 1)',
-      firstShadowLineDarkBg: '#018dff',
+      firstAreaGradFrom: theme.bg2,
+      firstAreaGradTo: theme.bg2,
+      firstShadowLineDarkBg: theme.bg2,
 
       // second line
-      secondLineGradFrom: '#00bece',
-      secondLineGradTo: '#00da78',
+      secondLineGradFrom: theme.primary,
+      secondLineGradTo: theme.primary,
 
-      secondAreaGradFrom: 'rgba(38, 139, 145, 0.8)',
-      secondAreaGradTo: 'rgba(38, 139, 145, 0.5)',
-      secondShadowLineDarkBg: '#2c5a85',
+      secondAreaGradFrom: 'rgba(161, 110, 255, 0.8)',
+      secondAreaGradTo: 'rgba(161, 110, 255, 0.5)',
+      secondShadowLineDarkBg: theme.primary,
 
       // third line
-      thirdLineGradFrom: '#8069ff',
-      thirdLineGradTo: '#8357ff',
+      thirdLineGradFrom: theme.success,
+      thirdLineGradTo: theme.successLight,
 
-      thirdAreaGradFrom: 'rgba(118, 73, 208, 0.7)',
-      thirdAreaGradTo: 'rgba(188, 92, 255, 0.4)',
-      thirdShadowLineDarkBg: '#a695ff',
+      thirdAreaGradFrom: 'rgba(0, 214, 143, 0.7)',
+      thirdAreaGradTo: 'rgba(0, 214, 143, 0.4)',
+      thirdShadowLineDarkBg: theme.success,
     },
 
     profit: {
-      bg: '#3d3780',
-      textColor: '#ffffff',
-      axisLineColor: '#a1a1e5',
-      splitLineColor: '#342e73',
+      bg: theme.bg,
+      textColor: theme.fgText,
+      axisLineColor: theme.border4,
+      splitLineColor: theme.separator,
       areaOpacity: '1',
 
       axisFontSize: '16',
-      axisTextColor: '#a1a1e5',
+      axisTextColor: theme.fg,
 
       // first bar
-      firstLineGradFrom: '#00bece',
-      firstLineGradTo: '#00da78',
-      firstLineShadow: 'rgba(14, 16, 48, 0.4)',
+      firstLineGradFrom: theme.bg2,
+      firstLineGradTo: theme.bg2,
+      firstLineShadow: 'rgba(0, 0, 0, 0)',
 
       // second bar
-      secondLineGradFrom: '#8069ff',
-      secondLineGradTo: '#8357ff',
-      secondLineShadow: 'rgba(14, 16, 48, 0.4)',
+      secondLineGradFrom: theme.primary,
+      secondLineGradTo: theme.primary,
+      secondLineShadow: 'rgba(0, 0, 0, 0)',
 
       // third bar
-      thirdLineGradFrom: '#4e40a4',
-      thirdLineGradTo: '#4e40a4',
-      thirdLineShadow: 'rgba(14, 16, 48, 0.4)',
+      thirdLineGradFrom: theme.success,
+      thirdLineGradTo: theme.successLight,
+      thirdLineShadow: 'rgba(0, 0, 0, 0)',
     },
 
     orderProfitLegend: {
-      firstItem: 'linear-gradient(90deg, #00c7c7 0%, #00d977 100%)',
-      secondItem: 'linear-gradient(90deg, #a454ff 0%, #7659ff 100%)',
-      thirdItem: '#4e40a4',
+      firstItem: theme.success,
+      secondItem: theme.primary,
+      thirdItem: theme.bg2,
     },
 
     visitors: {
-      tooltipBg: 'rgba(0, 255, 170, 0.35)',
-      tooltipLineColor: 'rgba(255, 255, 255, 0.1)',
+      tooltipBg: theme.bg,
+      tooltipLineColor: 'rgba(0, 0, 0, 0)',
       tooltipLineWidth: '1',
-      tooltipBorderColor: '#00d977',
-      tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#ffffff',
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
+      tooltipTextColor: theme.fgText,
       tooltipFontWeight: 'normal',
+      tooltipFontSize: '20',
 
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
+      axisLineColor: theme.border4,
       axisFontSize: '16',
-      axisTextColor: '#a1a1e5',
-      yAxisSplitLine: 'rgba(161, 161 ,229, 0.2)',
+      axisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#ffffff',
+      itemBorderColor: theme.primary,
       lineStyle: 'dotted',
       lineWidth: '6',
       lineGradFrom: '#ffffff',
       lineGradTo: '#ffffff',
-      lineShadow: 'rgba(14, 16, 48, 0.4)',
+      lineShadow: 'rgba(0, 0, 0, 0)',
 
-      areaGradFrom: 'rgba(188, 92, 255, 1)',
-      areaGradTo: 'rgba(188, 92, 255, 0.5)',
-      shadowLineDarkBg: '#a695ff',
+      areaGradFrom: theme.primary,
+      areaGradTo: theme.primaryLight,
 
       innerLineStyle: 'solid',
       innerLineWidth: '1',
 
-      innerAreaGradFrom: 'rgba(59, 165, 243, 1)',
-      innerAreaGradTo: 'rgba(4, 133, 243 , 1)',
+      innerAreaGradFrom: theme.success,
+      innerAreaGradTo: theme.success,
     },
 
     visitorsLegend: {
-      firstIcon: 'linear-gradient(90deg, #0088ff 0%, #3dafff 100%)',
-      secondIcon: 'linear-gradient(90deg, #a454ff 0%, #7659ff 100%)',
+      firstIcon: theme.success,
+      secondIcon: theme.primary,
     },
 
     visitorsPie: {
-      firstPieGradientLeft: '#7bff24',
-      firstPieGradientRight: '#2ec7fe',
-      firstPieShadowColor: '#19977E',
+      firstPieGradientLeft: theme.success,
+      firstPieGradientRight: theme.successLight,
+      firstPieShadowColor: 'rgba(0, 0, 0, 0)',
       firstPieRadius: ['70%', '90%'],
 
-      secondPieGradientLeft: '#ff894a',
-      secondPieGradientRight: '#ffcc10',
-      secondPieShadowColor: '#cf7c1c',
+      secondPieGradientLeft: theme.warning,
+      secondPieGradientRight: theme.warningLight,
+      secondPieShadowColor: 'rgba(0, 0, 0, 0)',
       secondPieRadius: ['60%', '95%'],
       shadowOffsetX: '0',
       shadowOffsetY: '3',
     },
 
     visitorsPieLegend: {
-      firstSection: 'linear-gradient(90deg, #ffcb17 0%, #ff874c 100%)',
-      secondSection: 'linear-gradient(90deg, #00c7c7 0%, #00d977 100%)',
+      firstSection: theme.warning,
+      secondSection: theme.success,
     },
 
     earningPie: {
@@ -275,30 +321,30 @@ export const COSMIC_THEME = {
 
       fontSize: '22',
 
-      firstPieGradientLeft: '#00d77f',
-      firstPieGradientRight: '#00d77f',
+      firstPieGradientLeft: theme.success,
+      firstPieGradientRight: theme.success,
       firstPieShadowColor: 'rgba(0, 0, 0, 0)',
 
-      secondPieGradientLeft: '#7756f7',
-      secondPieGradientRight: '#7756f7',
+      secondPieGradientLeft: theme.primary,
+      secondPieGradientRight: theme.primary,
       secondPieShadowColor: 'rgba(0, 0, 0, 0)',
 
-      thirdPieGradientLeft: '#ffca00',
-      thirdPieGradientRight: '#ffca00',
+      thirdPieGradientLeft: theme.warning,
+      thirdPieGradientRight: theme.warning,
       thirdPieShadowColor: 'rgba(0, 0, 0, 0)',
     },
 
     earningLine: {
-      gradFrom: 'rgba(118, 89, 255, 0.4)',
-      gradTo: 'rgba(164, 84, 255, 0.5)',
+      gradFrom: theme.primary,
+      gradTo: theme.primary,
 
-      tooltipTextColor: '#ffffff',
+      tooltipTextColor: theme.fgText,
       tooltipFontWeight: 'normal',
       tooltipFontSize: '16',
-      tooltipBg: 'rgba(0, 255, 170, 0.35)',
-      tooltipBorderColor: '#00d977',
-      tooltipBorderWidth: '3',
-      tooltipExtraCss: 'box-shadow: 0px 2px 46px 0 rgba(0, 255, 170, 0.35); border-radius: 10px; padding: 4px 16px;',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipBorderWidth: '1',
+      tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
     },
   },
-};
+} as NbJSThemeOptions;
diff --git a/src/app/@theme/styles/theme.dark.ts b/src/app/@theme/styles/theme.dark.ts
new file mode 100644
index 0000000000..f42cd8bee1
--- /dev/null
+++ b/src/app/@theme/styles/theme.dark.ts
@@ -0,0 +1,350 @@
+import { NbJSThemeOptions } from '@nebular/theme';
+
+const palette = {
+  primary: '#3366ff',
+  success: '#00d68f',
+  info: '#0095ff',
+  warning: '#ffaa00',
+  danger: '#ff3d71',
+};
+
+const theme = {
+  fontMain: 'Open Sans, sans-serif',
+  fontSecondary: 'Raleway, sans-serif',
+
+  bg: '#222b45',
+  bg2: '#1a2138',
+  bg3: '#151a30',
+  bg4: '#101426',
+
+  border: '#222b45',
+  border2: '#1a2138',
+  border3: '#151a30',
+  border4: '#101426',
+  border5: '#101426',
+
+  fg: '#8f9bb3',
+  fgHeading: '#ffffff',
+  fgText: '#ffffff',
+  fgHighlight: palette.primary,
+  layoutBg: '#1b1b38',
+  separator: '#1b1b38',
+
+  primary: palette.primary,
+  success: palette.success,
+  info: palette.info,
+  warning: palette.warning,
+  danger: palette.danger,
+
+  primaryLight: '#598bff',
+  successLight: '#2ce69b',
+  infoLight: '#42aaff',
+  warningLight: '#ffc94d',
+  dangerLight: '#ff708d',
+};
+
+export const DARK_THEME = {
+  name: 'dark',
+  variables: {
+    ...theme,
+
+    temperature: {
+      arcFill: [ theme.primary, theme.primary, theme.primary, theme.primary, theme.primary ],
+      arcEmpty: theme.bg2,
+      thumbBg: theme.bg2,
+      thumbBorder: theme.primary,
+    },
+
+    solar: {
+      gradientLeft: theme.primary,
+      gradientRight: theme.primary,
+      shadowColor: 'rgba(0, 0, 0, 0)',
+      secondSeriesFill: theme.bg2,
+      radius: ['80%', '90%'],
+    },
+
+    traffic: {
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
+
+      yAxisSplitLine: theme.separator,
+
+      lineBg: theme.border4,
+      lineShadowBlur: '1',
+      itemColor: theme.border4,
+      itemBorderColor: theme.border4,
+      itemEmphasisBorderColor: theme.primary,
+      shadowLineDarkBg: 'rgba(0, 0, 0, 0)',
+      shadowLineShadow: 'rgba(0, 0, 0, 0)',
+      gradFrom: theme.bg2,
+      gradTo: theme.bg2,
+    },
+
+    electricity: {
+      tooltipBg: theme.bg,
+      tooltipLineColor: theme.fgText,
+      tooltipLineWidth: '0',
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
+
+      axisLineColor: theme.border3,
+      xAxisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
+
+      itemBorderColor: theme.primary,
+      lineStyle: 'solid',
+      lineWidth: '4',
+      lineGradFrom: theme.primary,
+      lineGradTo: theme.primary,
+      lineShadow: 'rgba(0, 0, 0, 0)',
+
+      areaGradFrom: theme.bg2,
+      areaGradTo: theme.bg2,
+      shadowLineDarkBg: 'rgba(0, 0, 0, 0)',
+    },
+
+    bubbleMap: {
+      titleColor: theme.fgText,
+      areaColor: theme.bg4,
+      areaHoverColor: theme.fgHighlight,
+      areaBorderColor: theme.border5,
+    },
+
+    profitBarAnimationEchart: {
+      textColor: theme.fgText,
+
+      firstAnimationBarColor: theme.primary,
+      secondAnimationBarColor: theme.success,
+
+      splitLineStyleOpacity: '1',
+      splitLineStyleWidth: '1',
+      splitLineStyleColor: theme.separator,
+
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
+      tooltipFontSize: '16',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipBorderWidth: '1',
+      tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
+    },
+
+    trafficBarEchart: {
+      gradientFrom: theme.warningLight,
+      gradientTo: theme.warning,
+      shadow: theme.warningLight,
+      shadowBlur: '0',
+
+      axisTextColor: theme.fgText,
+      axisFontSize: '12',
+
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
+    },
+
+    countryOrders: {
+      countryBorderColor: theme.border4,
+      countryFillColor: theme.bg3,
+      countryBorderWidth: '1',
+      hoveredCountryBorderColor: theme.primary,
+      hoveredCountryFillColor: theme.primaryLight,
+      hoveredCountryBorderWidth: '1',
+
+      chartAxisLineColor: theme.border4,
+      chartAxisTextColor: theme.fg,
+      chartAxisFontSize: '16',
+      chartGradientTo: theme.primary,
+      chartGradientFrom: theme.primaryLight,
+      chartAxisSplitLine: theme.separator,
+      chartShadowLineColor: theme.primaryLight,
+
+      chartLineBottomShadowColor: theme.primary,
+
+      chartInnerLineColor: theme.bg2,
+    },
+
+    echarts: {
+      bg: theme.bg,
+      textColor: theme.fgText,
+      axisLineColor: theme.fgText,
+      splitLineColor: theme.separator,
+      itemHoverShadowColor: 'rgba(0, 0, 0, 0.5)',
+      tooltipBackgroundColor: theme.primary,
+      areaOpacity: '0.7',
+    },
+
+    chartjs: {
+      axisLineColor: theme.separator,
+      textColor: theme.fgText,
+    },
+
+    orders: {
+      tooltipBg: theme.bg,
+      tooltipLineColor: 'rgba(0, 0, 0, 0)',
+      tooltipLineWidth: '0',
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
+      tooltipFontSize: '20',
+
+      axisLineColor: theme.border4,
+      axisFontSize: '16',
+      axisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
+
+      itemBorderColor: theme.primary,
+      lineStyle: 'solid',
+      lineWidth: '4',
+
+      // first line
+      firstAreaGradFrom: theme.bg3,
+      firstAreaGradTo: theme.bg3,
+      firstShadowLineDarkBg: 'rgba(0, 0, 0, 0)',
+
+      // second line
+      secondLineGradFrom: theme.primary,
+      secondLineGradTo: theme.primary,
+
+      secondAreaGradFrom: 'rgba(51, 102, 255, 0.2)',
+      secondAreaGradTo: 'rgba(51, 102, 255, 0)',
+      secondShadowLineDarkBg: 'rgba(0, 0, 0, 0)',
+
+      // third line
+      thirdLineGradFrom: theme.success,
+      thirdLineGradTo: theme.successLight,
+
+      thirdAreaGradFrom: 'rgba(0, 214, 143, 0.2)',
+      thirdAreaGradTo: 'rgba(0, 214, 143, 0)',
+      thirdShadowLineDarkBg: 'rgba(0, 0, 0, 0)',
+    },
+
+    profit: {
+      bg: theme.bg,
+      textColor: theme.fgText,
+      axisLineColor: theme.border4,
+      splitLineColor: theme.separator,
+      areaOpacity: '1',
+
+      axisFontSize: '16',
+      axisTextColor: theme.fg,
+
+      // first bar
+      firstLineGradFrom: theme.bg3,
+      firstLineGradTo: theme.bg3,
+      firstLineShadow: 'rgba(0, 0, 0, 0)',
+
+      // second bar
+      secondLineGradFrom: theme.primary,
+      secondLineGradTo: theme.primary,
+      secondLineShadow: 'rgba(0, 0, 0, 0)',
+
+      // third bar
+      thirdLineGradFrom: theme.success,
+      thirdLineGradTo: theme.successLight,
+      thirdLineShadow: 'rgba(0, 0, 0, 0)',
+    },
+
+    orderProfitLegend: {
+      firstItem: theme.success,
+      secondItem: theme.primary,
+      thirdItem: theme.bg3,
+    },
+
+    visitors: {
+      tooltipBg: theme.bg,
+      tooltipLineColor: 'rgba(0, 0, 0, 0)',
+      tooltipLineWidth: '0',
+      tooltipBorderColor: theme.border2,
+      tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
+      tooltipFontSize: '20',
+
+      axisLineColor: theme.border4,
+      axisFontSize: '16',
+      axisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
+
+      itemBorderColor: theme.primary,
+      lineStyle: 'dotted',
+      lineWidth: '6',
+      lineGradFrom: '#ffffff',
+      lineGradTo: '#ffffff',
+      lineShadow: 'rgba(0, 0, 0, 0)',
+
+      areaGradFrom: theme.primary,
+      areaGradTo: theme.primaryLight,
+
+      innerLineStyle: 'solid',
+      innerLineWidth: '1',
+
+      innerAreaGradFrom: theme.success,
+      innerAreaGradTo: theme.success,
+    },
+
+    visitorsLegend: {
+      firstIcon: theme.success,
+      secondIcon: theme.primary,
+    },
+
+    visitorsPie: {
+      firstPieGradientLeft: theme.success,
+      firstPieGradientRight: theme.success,
+      firstPieShadowColor: 'rgba(0, 0, 0, 0)',
+      firstPieRadius: ['70%', '90%'],
+
+      secondPieGradientLeft: theme.warning,
+      secondPieGradientRight: theme.warningLight,
+      secondPieShadowColor: 'rgba(0, 0, 0, 0)',
+      secondPieRadius: ['60%', '97%'],
+      shadowOffsetX: '0',
+      shadowOffsetY: '0',
+    },
+
+    visitorsPieLegend: {
+      firstSection: theme.warning,
+      secondSection: theme.success,
+    },
+
+    earningPie: {
+      radius: ['65%', '100%'],
+      center: ['50%', '50%'],
+
+      fontSize: '22',
+
+      firstPieGradientLeft: theme.success,
+      firstPieGradientRight: theme.success,
+      firstPieShadowColor: 'rgba(0, 0, 0, 0)',
+
+      secondPieGradientLeft: theme.primary,
+      secondPieGradientRight: theme.primary,
+      secondPieShadowColor: 'rgba(0, 0, 0, 0)',
+
+      thirdPieGradientLeft: theme.warning,
+      thirdPieGradientRight: theme.warning,
+      thirdPieShadowColor: 'rgba(0, 0, 0, 0)',
+    },
+
+    earningLine: {
+      gradFrom: theme.primary,
+      gradTo: theme.primary,
+
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
+      tooltipFontSize: '16',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipBorderWidth: '1',
+      tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
+    },
+  },
+} as NbJSThemeOptions;
diff --git a/src/app/@theme/styles/theme.default.ts b/src/app/@theme/styles/theme.default.ts
index a7e0656ac8..6e25e7d71c 100644
--- a/src/app/@theme/styles/theme.default.ts
+++ b/src/app/@theme/styles/theme.default.ts
@@ -1,266 +1,309 @@
+import { NbJSThemeOptions } from '@nebular/theme';
+
+const palette = {
+  primary: '#3366ff',
+  success: '#00d68f',
+  info: '#0095ff',
+  warning: '#ffaa00',
+  danger: '#ff3d71',
+};
+
+const theme = {
+  fontMain: 'Open Sans, sans-serif',
+  fontSecondary: 'Raleway, sans-serif',
+
+  bg: '#ffffff',
+  bg2: '#f7f9fc',
+  bg3: '#edf1f7',
+  bg4: '#e4e9f2',
+
+  border: '#ffffff',
+  border2: '#f7f9fc',
+  border3: '#edf1f7',
+  border4: '#e4e9f2',
+  border5: '#c5cee0',
+
+  fg: '#8f9bb3',
+  fgHeading: '#1a2138',
+  fgText: '#1a2138',
+  fgHighlight: palette.primary,
+  layoutBg: '#f7f9fc',
+  separator: '#edf1f7',
+
+  primary: palette.primary,
+  success: palette.success,
+  info: palette.info,
+  warning: palette.warning,
+  danger: palette.danger,
+
+  primaryLight: '#598bff',
+  successLight: '#2ce69b',
+  infoLight: '#42aaff',
+  warningLight: '#ffc94d',
+  dangerLight: '#ff708d',
+};
+
 export const DEFAULT_THEME = {
   name: 'default',
-  base: null,
   variables: {
+    ...theme,
 
-    // Safari fix
-    temperature: [
-      '#42db7d',
-      '#42db7d',
-      '#42db7d',
-      '#42db7d',
-      '#42db7d',
-    ],
+    temperature: {
+      arcFill: [ theme.primary, theme.primary, theme.primary, theme.primary, theme.primary ],
+      arcEmpty: theme.bg2,
+      thumbBg: theme.bg2,
+      thumbBorder: theme.primary,
+    },
 
     solar: {
-      gradientLeft: '#42db7d',
-      gradientRight: '#42db7d',
+      gradientLeft: theme.primary,
+      gradientRight: theme.primary,
       shadowColor: 'rgba(0, 0, 0, 0)',
+      secondSeriesFill: theme.bg2,
       radius: ['80%', '90%'],
     },
 
     traffic: {
-      colorBlack: '#000000',
-      tooltipBg: '#ffffff',
-      tooltipBorderColor: '#c0c8d1',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
 
-      lineBg: '#c0c8d1',
+      yAxisSplitLine: theme.separator,
+
+      lineBg: theme.border4,
       lineShadowBlur: '1',
-      itemColor: '#bcc3cc',
-      itemBorderColor: '#bcc3cc',
-      itemEmphasisBorderColor: '#42db7d',
+      itemColor: theme.border4,
+      itemBorderColor: theme.border4,
+      itemEmphasisBorderColor: theme.primary,
       shadowLineDarkBg: 'rgba(0, 0, 0, 0)',
       shadowLineShadow: 'rgba(0, 0, 0, 0)',
-      gradFrom: '#ebeef2',
-      gradTo: '#ebeef2',
+      gradFrom: theme.bg2,
+      gradTo: theme.bg2,
     },
 
     electricity: {
-      tooltipBg: '#ffffff',
-      tooltipLineColor: 'rgba(0, 0, 0, 0)',
+      tooltipBg: theme.bg,
+      tooltipLineColor: theme.fgText,
       tooltipLineWidth: '0',
-      tooltipBorderColor: '#ebeef2',
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
 
-      axisLineColor: 'rgba(0, 0, 0, 0)',
-      xAxisTextColor: '#2a2a2a',
-      yAxisSplitLine: '#ebeef2',
+      axisLineColor: theme.border3,
+      xAxisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#42db7d',
+      itemBorderColor: theme.primary,
       lineStyle: 'solid',
       lineWidth: '4',
-      lineGradFrom: '#42db7d',
-      lineGradTo: '#42db7d',
+      lineGradFrom: theme.primary,
+      lineGradTo: theme.primary,
       lineShadow: 'rgba(0, 0, 0, 0)',
 
-      areaGradFrom: 'rgba(235, 238, 242, 0.5)',
-      areaGradTo: 'rgba(235, 238, 242, 0.5)',
+      areaGradFrom: theme.bg2,
+      areaGradTo: theme.bg2,
       shadowLineDarkBg: 'rgba(0, 0, 0, 0)',
     },
 
     bubbleMap: {
-      titleColor: '#484848',
-      areaColor: '#dddddd',
-      areaHoverColor: '#cccccc',
-      areaBorderColor: '#ebeef2',
+      titleColor: theme.fgText,
+      areaColor: theme.bg4,
+      areaHoverColor: theme.fgHighlight,
+      areaBorderColor: theme.border5,
     },
 
     profitBarAnimationEchart: {
-      textColor: '#484848',
+      textColor: theme.fgText,
 
-      firstAnimationBarColor: '#3edd81',
-      secondAnimationBarColor: '#8d7fff',
+      firstAnimationBarColor: theme.primary,
+      secondAnimationBarColor: theme.success,
 
-      splitLineStyleOpacity: '0.06',
+      splitLineStyleOpacity: '1',
       splitLineStyleWidth: '1',
-      splitLineStyleColor: '#000000',
+      splitLineStyleColor: theme.separator,
 
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
       tooltipFontSize: '16',
-      tooltipBg: '#ffffff',
-      tooltipBorderColor: '#c0c8d1',
-      tooltipBorderWidth: '3',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipBorderWidth: '1',
       tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
     },
 
     trafficBarEchart: {
-      gradientFrom: '#fc0',
-      gradientTo: '#ffa100',
-      shadow: '#ffb600',
+      gradientFrom: theme.warningLight,
+      gradientTo: theme.warning,
+      shadow: theme.warningLight,
       shadowBlur: '0',
 
-      axisTextColor: '#b2bac2',
+      axisTextColor: theme.fgText,
       axisFontSize: '12',
 
-      tooltipBg: '#ffffff',
-      tooltipBorderColor: '#c0c8d1',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
     },
 
     countryOrders: {
-      countryBorderColor: 'rgba(255, 255, 255, 1)',
-      countryFillColor: 'rgba(236, 242, 245, 1)',
+      countryBorderColor: theme.border4,
+      countryFillColor: theme.bg3,
       countryBorderWidth: '1',
-      hoveredCountryBorderColor: '#40dc7e',
-      hoveredCountryFillColor: '#c7f4d9',
-      hoveredCountryBorderWidth: '3',
+      hoveredCountryBorderColor: theme.primary,
+      hoveredCountryFillColor: theme.primaryLight,
+      hoveredCountryBorderWidth: '1',
 
-      chartAxisLineColor: 'rgba(0, 0, 0, 0)',
-      chartAxisTextColor: '#b2bac2',
+      chartAxisLineColor: theme.border4,
+      chartAxisTextColor: theme.fg,
       chartAxisFontSize: '16',
-      chartGradientTo: '#3edd81',
-      chartGradientFrom: '#3bddaf',
-      chartAxisSplitLine: '#ebeef2',
-      chartShadowLineColor: '#2f296b',
+      chartGradientTo: theme.primary,
+      chartGradientFrom: theme.primaryLight,
+      chartAxisSplitLine: theme.separator,
+      chartShadowLineColor: theme.primaryLight,
 
-      chartLineBottomShadowColor: '#eceff4',
+      chartLineBottomShadowColor: theme.primary,
 
-      chartInnerLineColor: '#eceff4',
+      chartInnerLineColor: theme.bg2,
     },
 
     echarts: {
-      bg: '#ffffff',
-      textColor: '#484848',
-      axisLineColor: '#bbbbbb',
-      splitLineColor: '#ebeef2',
+      bg: theme.bg,
+      textColor: theme.fgText,
+      axisLineColor: theme.fgText,
+      splitLineColor: theme.separator,
       itemHoverShadowColor: 'rgba(0, 0, 0, 0.5)',
-      tooltipBackgroundColor: '#6a7985',
+      tooltipBackgroundColor: theme.primary,
       areaOpacity: '0.7',
     },
 
     chartjs: {
-      axisLineColor: '#cccccc',
-      textColor: '#484848',
+      axisLineColor: theme.separator,
+      textColor: theme.fgText,
     },
 
     orders: {
-      tooltipBg: '#ffffff',
+      tooltipBg: theme.bg,
       tooltipLineColor: 'rgba(0, 0, 0, 0)',
       tooltipLineWidth: '0',
-      tooltipBorderColor: '#ebeef2',
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
       tooltipFontSize: '20',
 
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
+      axisLineColor: theme.border4,
       axisFontSize: '16',
-      axisTextColor: '#b2bac2',
-      yAxisSplitLine: 'rgba(161, 161 ,229, 0.2)',
+      axisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#42db7d',
+      itemBorderColor: theme.primary,
       lineStyle: 'solid',
       lineWidth: '4',
 
       // first line
-      firstAreaGradFrom: 'rgba(236, 242, 245, 0.8)',
-      firstAreaGradTo: 'rgba(236, 242, 245, 0.8)',
+      firstAreaGradFrom: theme.bg3,
+      firstAreaGradTo: theme.bg3,
       firstShadowLineDarkBg: 'rgba(0, 0, 0, 0)',
 
       // second line
-      secondLineGradFrom: 'rgba(164, 123, 255, 1)',
-      secondLineGradTo: 'rgba(164, 123, 255, 1)',
+      secondLineGradFrom: theme.primary,
+      secondLineGradTo: theme.primary,
 
-      secondAreaGradFrom: 'rgba(188, 92, 255, 0.2)',
-      secondAreaGradTo: 'rgba(188, 92, 255, 0)',
+      secondAreaGradFrom: 'rgba(51, 102, 255, 0.2)',
+      secondAreaGradTo: 'rgba(51, 102, 255, 0)',
       secondShadowLineDarkBg: 'rgba(0, 0, 0, 0)',
 
       // third line
-      thirdLineGradFrom: 'rgba(55, 220, 136, 1)',
-      thirdLineGradTo: 'rgba(55, 220, 136, 1)',
+      thirdLineGradFrom: theme.success,
+      thirdLineGradTo: theme.successLight,
 
-      thirdAreaGradFrom: 'rgba(31 ,106, 124, 0.2)',
-      thirdAreaGradTo: 'rgba(4, 126, 230, 0)',
+      thirdAreaGradFrom: 'rgba(0, 214, 143, 0.2)',
+      thirdAreaGradTo: 'rgba(0, 214, 143, 0)',
       thirdShadowLineDarkBg: 'rgba(0, 0, 0, 0)',
     },
 
-    // TODO: need design for default theme
     profit: {
-      bg: '#ffffff',
-      textColor: '#ffffff',
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
-      splitLineColor: 'rgba(161, 161 ,229, 0.2)',
+      bg: theme.bg,
+      textColor: theme.fgText,
+      axisLineColor: theme.border4,
+      splitLineColor: theme.separator,
       areaOpacity: '1',
 
       axisFontSize: '16',
-      axisTextColor: '#b2bac2',
+      axisTextColor: theme.fg,
 
       // first bar
-      firstLineGradFrom: '#00bece',
-      firstLineGradTo: '#00da78',
-      firstLineShadow: 'rgba(14, 16, 48, 0.4)',
+      firstLineGradFrom: theme.bg3,
+      firstLineGradTo: theme.bg3,
+      firstLineShadow: 'rgba(0, 0, 0, 0)',
 
       // second bar
-      secondLineGradFrom: '#8069ff',
-      secondLineGradTo: '#8357ff',
-      secondLineShadow: 'rgba(14, 16, 48, 0.4)',
+      secondLineGradFrom: theme.primary,
+      secondLineGradTo: theme.primary,
+      secondLineShadow: 'rgba(0, 0, 0, 0)',
 
       // third bar
-      thirdLineGradFrom: 'rgba(236, 242, 245, 0.8)',
-      thirdLineGradTo: 'rgba(236, 242, 245, 0.8)',
-      thirdLineShadow: 'rgba(14, 16, 48, 0.4)',
+      thirdLineGradFrom: theme.success,
+      thirdLineGradTo: theme.successLight,
+      thirdLineShadow: 'rgba(0, 0, 0, 0)',
     },
 
     orderProfitLegend: {
-      firstItem: 'linear-gradient(90deg, #3edd81 0%, #3bddad 100%)',
-      secondItem: 'linear-gradient(90deg, #8d7fff 0%, #b17fff 100%)',
-      thirdItem: 'rgba(236, 242, 245, 0.8)',
+      firstItem: theme.success,
+      secondItem: theme.primary,
+      thirdItem: theme.bg3,
     },
 
     visitors: {
-      tooltipBg: '#ffffff',
+      tooltipBg: theme.bg,
       tooltipLineColor: 'rgba(0, 0, 0, 0)',
-      tooltipLineWidth: '0',
-      tooltipBorderColor: '#ebeef2',
+      tooltipLineWidth: '1',
+      tooltipBorderColor: theme.border2,
       tooltipExtraCss: 'border-radius: 10px; padding: 8px 24px;',
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
       tooltipFontSize: '20',
 
-      axisLineColor: 'rgba(161, 161 ,229, 0.3)',
+      axisLineColor: theme.border4,
       axisFontSize: '16',
-      axisTextColor: '#b2bac2',
-      yAxisSplitLine: 'rgba(161, 161 ,229, 0.2)',
+      axisTextColor: theme.fg,
+      yAxisSplitLine: theme.separator,
 
-      itemBorderColor: '#42db7d',
+      itemBorderColor: theme.primary,
       lineStyle: 'dotted',
       lineWidth: '6',
       lineGradFrom: '#ffffff',
       lineGradTo: '#ffffff',
-      lineShadow: 'rgba(14, 16, 48, 0)',
+      lineShadow: 'rgba(0, 0, 0, 0)',
 
-      areaGradFrom: 'rgba(188, 92, 255, 1)',
-      areaGradTo: 'rgba(188, 92, 255, 0.5)',
-      shadowLineDarkBg: '#a695ff',
+      areaGradFrom: theme.primary,
+      areaGradTo: theme.primaryLight,
 
       innerLineStyle: 'solid',
       innerLineWidth: '1',
 
-      innerAreaGradFrom: 'rgba(60, 221, 156, 1)',
-      innerAreaGradTo: 'rgba(60, 221, 156, 1)',
+      innerAreaGradFrom: theme.success,
+      innerAreaGradTo: theme.success,
     },
 
     visitorsLegend: {
-      firstIcon: 'linear-gradient(90deg, #3edd81 0%, #3bddad 100%)',
-      secondIcon: 'linear-gradient(90deg, #8d7fff 0%, #b17fff 100%)',
+      firstIcon: theme.success,
+      secondIcon: theme.primary,
     },
 
     visitorsPie: {
-      firstPieGradientLeft: '#8defbb',
-      firstPieGradientRight: '#8defbb',
+      firstPieGradientLeft: theme.success,
+      firstPieGradientRight: theme.success,
       firstPieShadowColor: 'rgba(0, 0, 0, 0)',
       firstPieRadius: ['70%', '90%'],
 
-      secondPieGradientLeft: '#ff894a',
-      secondPieGradientRight: '#ffcc10',
+      secondPieGradientLeft: theme.warning,
+      secondPieGradientRight: theme.warningLight,
       secondPieShadowColor: 'rgba(0, 0, 0, 0)',
       secondPieRadius: ['60%', '97%'],
       shadowOffsetX: '0',
@@ -268,8 +311,8 @@ export const DEFAULT_THEME = {
     },
 
     visitorsPieLegend: {
-      firstSection: 'linear-gradient(90deg, #ffcb17 0%, #ff874c 100%)',
-      secondSection: '#8defbb',
+      firstSection: theme.warning,
+      secondSection: theme.success,
     },
 
     earningPie: {
@@ -278,30 +321,30 @@ export const DEFAULT_THEME = {
 
       fontSize: '22',
 
-      firstPieGradientLeft: '#00d77f',
-      firstPieGradientRight: '#00d77f',
+      firstPieGradientLeft: theme.success,
+      firstPieGradientRight: theme.success,
       firstPieShadowColor: 'rgba(0, 0, 0, 0)',
 
-      secondPieGradientLeft: '#7756f7',
-      secondPieGradientRight: '#7756f7',
+      secondPieGradientLeft: theme.primary,
+      secondPieGradientRight: theme.primary,
       secondPieShadowColor: 'rgba(0, 0, 0, 0)',
 
-      thirdPieGradientLeft: '#ffca00',
-      thirdPieGradientRight: '#ffca00',
+      thirdPieGradientLeft: theme.warning,
+      thirdPieGradientRight: theme.warning,
       thirdPieShadowColor: 'rgba(0, 0, 0, 0)',
     },
 
     earningLine: {
-      gradFrom: 'rgba(188, 92, 255, 0.5)',
-      gradTo: 'rgba(188, 92, 255, 0.5)',
+      gradFrom: theme.primary,
+      gradTo: theme.primary,
 
-      tooltipTextColor: '#2a2a2a',
-      tooltipFontWeight: 'bolder',
+      tooltipTextColor: theme.fgText,
+      tooltipFontWeight: 'normal',
       tooltipFontSize: '16',
-      tooltipBg: '#ffffff',
-      tooltipBorderColor: '#c0c8d1',
-      tooltipBorderWidth: '3',
+      tooltipBg: theme.bg,
+      tooltipBorderColor: theme.border2,
+      tooltipBorderWidth: '1',
       tooltipExtraCss: 'border-radius: 10px; padding: 4px 16px;',
     },
   },
-};
+} as NbJSThemeOptions;
diff --git a/src/app/@theme/styles/themes.scss b/src/app/@theme/styles/themes.scss
index cdbd4dc899..4a6051c51f 100644
--- a/src/app/@theme/styles/themes.scss
+++ b/src/app/@theme/styles/themes.scss
@@ -3,95 +3,110 @@
 // @nebular out of the box themes
 @import '~@nebular/theme/styles/themes';
 
-// which themes you what to enable (empty to enable all)
-$nb-enabled-themes: (default, cosmic, corporate);
-
 $nb-themes: nb-register-theme((
- // app wise variables for each theme
-  sidebar-header-gap: 2rem,
-  sidebar-header-height: initial,
-  layout-content-width: 1400px,
-
-  font-main: Roboto,
-  font-secondary: Exo,
-
-  switcher-background: #ebeff5,
-  switcher-background-percentage: 50%,
-  drops-icon-line-gadient: -webkit-linear-gradient(#01dbb5, #0bbb79),
-
-  list-item-border-width: 1px,
-
-  slide-out-container-width: 30%,
-  slide-out-background: linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
-  slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
-  slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
-
-  chart-panel-summary-box-shadow: none,
-  chart-panel-summary-background-color: #ecf2f5,
-  chart-panel-summary-border-color: #ebeff1,
-  chart-panel-summary-border-width: 1px,
-
-  ecommerce-card-border-width: 1px,
-
-  progress-bar-background: linear-gradient(90deg, #3edd81 0%, #3bddaf 100%),
+  font-family-secondary: font-family-primary,
+  layout-padding-top: 2.25rem,
+  layout-window-mode-padding-top: 0,
+
+  menu-item-icon-margin: 0 0.5rem 0 0,
+
+  card-height-tiny: 13.5rem,
+  card-height-small: 21.1875rem,
+  card-height-medium: 28.875rem,
+  card-height-large: 36.5625rem,
+  card-height-giant: 44.25rem,
+  card-margin-bottom: 1.875rem,
+  card-header-with-select-padding-top: 0.5rem,
+  card-header-with-select-padding-bottom: 0.5rem,
+
+  select-min-width: 6rem,
+
+  slide-out-background: #f7f9fc,
+  slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
+  slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
+
+  smart-table-bg-even: background-basic-color-2,
+  smart-table-bg-active: background-basic-color-3,
+  smart-table-paging-hover: transparent,
 ), default, default);
 
 $nb-themes: nb-register-theme((
-  // app wise variables for each theme
-  sidebar-header-gap: 2rem,
-  sidebar-header-height: initial,
-  layout-content-width: 1400px,
-
-  font-main: Roboto,
-  font-secondary: Exo,
-
-  switcher-background: #4e41a5,
-  switcher-background-percentage: 14%,
-  drops-icon-line-gadient: -webkit-linear-gradient(#a258fe, #7958fa),
-
-  list-item-border-width: 1px,
-
-  slide-out-container-width: 30%,
-  slide-out-background: radial-gradient(circle, #302c6e 0%, #423f8c 100%),
-  slide-out-shadow-color: 2px 0 3px rgba(19, 19, 94, 0.9),
-  slide-out-shadow-color-rtl: -2px 0 3px rgba(19, 19, 94, 0.9),
-
-  chart-panel-summary-box-shadow: none,
-  chart-panel-summary-background-color: rgba(0, 0, 0, 0.1),
-  chart-panel-summary-border-color: #332e73,
-  chart-panel-summary-border-width: 1px,
-
-  ecommerce-card-border-width: 1px,
-
-  progress-bar-background: linear-gradient(90deg, #00c7c7 0%, #00d977 100%),
+  font-family-secondary: font-family-primary,
+  layout-padding-top: 2.25rem,
+  layout-window-mode-padding-top: 0,
+
+  menu-item-icon-margin: 0 0.5rem 0 0,
+
+  card-height-tiny: 13.5rem,
+  card-height-small: 21.1875rem,
+  card-height-medium: 28.875rem,
+  card-height-large: 36.5625rem,
+  card-height-giant: 44.25rem,
+  card-margin-bottom: 1.875rem,
+  card-header-with-select-padding-top: 0.5rem,
+  card-header-with-select-padding-bottom: 0.5rem,
+
+  select-min-width: 6rem,
+
+  slide-out-background: #252547,
+  slide-out-shadow-color: 2px 0 3px #29157a,
+  slide-out-shadow-color-rtl: -2px 0 3px #29157a,
+
+  smart-table-bg-even: background-basic-color-2,
+  smart-table-bg-active: background-basic-color-3,
+  smart-table-paging-hover: transparent,
 ), cosmic, cosmic);
 
 $nb-themes: nb-register-theme((
-  // app wise variables for each theme
-  sidebar-header-gap: 2rem,
-  sidebar-header-height: initial,
-  layout-content-width: 1400px,
-
-  font-main: Roboto,
-  font-secondary: Exo,
-
-  switcher-background: #2b2d34,
-  switcher-background-percentage: 14%,
-  drops-icon-line-gadient: -webkit-linear-gradient(#e9e8eb, #a7a2be),
-
-  list-item-border-width: 1px,
-
-  slide-out-container-width: 30%,
-  slide-out-background: 	linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),
-  slide-out-shadow-color: 0 4px 14px 0 #a2d2c8,
-  slide-out-shadow-color-rtl: 0 4px 14px 0 #a2d2c8,
-
-  chart-panel-summary-box-shadow: none,
-  chart-panel-summary-background-color: #f7fafb,
-  chart-panel-summary-border-color: #ebeff1,
-  chart-panel-summary-border-width: 1px,
-
-  ecommerce-card-border-width: 1px,
-
-  progress-bar-background: linear-gradient(90deg, #ff9f6f 0%, #ff8b97 100%),
+  font-family-secondary: font-family-primary,
+  layout-padding-top: 2.25rem,
+  layout-window-mode-padding-top: 0,
+
+  menu-item-icon-margin: 0 0.5rem 0 0,
+
+  card-height-tiny: 13.5rem,
+  card-height-small: 21.1875rem,
+  card-height-medium: 28.875rem,
+  card-height-large: 36.5625rem,
+  card-height-giant: 44.25rem,
+  card-margin-bottom: 1.875rem,
+  card-header-with-select-padding-top: 0.5rem,
+  card-header-with-select-padding-bottom: 0.5rem,
+
+  select-min-width: 6rem,
+
+  slide-out-background: linear-gradient(270deg, #edf1f7 0%, #e4e9f2 100%),
+  slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
+  slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
+
+  smart-table-bg-even: background-basic-color-2,
+  smart-table-bg-active: background-basic-color-3,
+  smart-table-paging-hover: transparent,
 ), corporate, corporate);
+
+$nb-themes: nb-register-theme((
+  font-family-secondary: font-family-primary,
+  layout-padding-top: 2.25rem,
+  layout-window-mode-padding-top: 0,
+
+  menu-item-icon-margin: 0 0.5rem 0 0,
+
+  card-height-tiny: 13.5rem,
+  card-height-small: 21.1875rem,
+  card-height-medium: 28.875rem,
+  card-height-large: 36.5625rem,
+  card-height-giant: 44.25rem,
+  card-margin-bottom: 1.875rem,
+  card-header-with-select-padding-top: 0.5rem,
+  card-header-with-select-padding-bottom: 0.5rem,
+
+  select-min-width: 6rem,
+
+  slide-out-background: linear-gradient(270deg, #222b45 0%, #151a30 100%),
+  slide-out-shadow-color: 0 4px 14px 0 #8f9bb3,
+  slide-out-shadow-color-rtl: 0 4px 14px 0 #8f9bb3,
+
+  smart-table-bg-even: background-basic-color-2,
+  smart-table-bg-active: background-basic-color-3,
+  smart-table-paging-hover: transparent,
+), dark, dark);
diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index 4d967c9e8f..ec66139a92 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -1,56 +1,26 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
 import {
   NbActionsModule,
-  NbCardModule,
   NbLayoutModule,
   NbMenuModule,
-  NbRouteTabsetModule,
   NbSearchModule,
   NbSidebarModule,
-  NbTabsetModule,
-  NbThemeModule,
   NbUserModule,
-  NbCheckboxModule,
-  NbPopoverModule,
   NbContextMenuModule,
-  NbProgressBarModule,
-  NbCalendarModule,
-  NbCalendarRangeModule,
-  NbStepperModule,
   NbButtonModule,
-  NbInputModule,
-  NbAccordionModule,
-  NbDatepickerModule,
-  NbDialogModule,
-  NbWindowModule,
-  NbListModule,
-  NbToastrModule,
-  NbAlertModule,
-  NbSpinnerModule,
-  NbRadioModule,
   NbSelectModule,
-  NbChatModule,
-  NbTooltipModule,
-  NbCalendarKitModule,
+  NbIconModule,
+  NbThemeModule,
 } from '@nebular/theme';
-
+import { NbEvaIconsModule } from '@nebular/eva-icons';
 import { NbSecurityModule } from '@nebular/security';
 
 import {
   FooterComponent,
   HeaderComponent,
   SearchInputComponent,
-  ThemeSettingsComponent,
-  SwitcherComponent,
-  LayoutDirectionSwitcherComponent,
-  ThemeSwitcherComponent,
   TinyMCEComponent,
-  ThemeSwitcherListComponent,
-  ToggleSettingsButtonComponent,
 } from './components';
 import {
   CapitalizePipe,
@@ -58,115 +28,67 @@ import {
   RoundPipe,
   TimingPipe,
   NumberWithCommasPipe,
-  EvaIconsPipe,
 } from './pipes';
 import {
   OneColumnLayoutComponent,
-  SampleLayoutComponent,
   ThreeColumnsLayoutComponent,
   TwoColumnsLayoutComponent,
 } from './layouts';
+import { WindowModeBlockScrollService } from './services/window-mode-block-scroll.service';
 import { DEFAULT_THEME } from './styles/theme.default';
 import { COSMIC_THEME } from './styles/theme.cosmic';
 import { CORPORATE_THEME } from './styles/theme.corporate';
-
-const BASE_MODULES = [CommonModule, FormsModule, ReactiveFormsModule];
+import { DARK_THEME } from './styles/theme.dark';
 
 const NB_MODULES = [
-  NbCardModule,
   NbLayoutModule,
-  NbTabsetModule,
-  NbRouteTabsetModule,
   NbMenuModule,
   NbUserModule,
   NbActionsModule,
   NbSearchModule,
   NbSidebarModule,
-  NbCheckboxModule,
-  NbPopoverModule,
   NbContextMenuModule,
-  NgbModule,
-  NbSecurityModule, // *nbIsGranted directive,
-  NbProgressBarModule,
-  NbCalendarModule,
-  NbCalendarRangeModule,
-  NbStepperModule,
+  NbSecurityModule,
   NbButtonModule,
-  NbListModule,
-  NbToastrModule,
-  NbInputModule,
-  NbAccordionModule,
-  NbDatepickerModule,
-  NbDialogModule,
-  NbWindowModule,
-  NbAlertModule,
-  NbSpinnerModule,
-  NbRadioModule,
   NbSelectModule,
-  NbChatModule,
-  NbTooltipModule,
-  NbCalendarKitModule,
+  NbIconModule,
+  NbEvaIconsModule,
 ];
-
 const COMPONENTS = [
-  SwitcherComponent,
-  LayoutDirectionSwitcherComponent,
-  ThemeSwitcherComponent,
-  ThemeSwitcherListComponent,
   HeaderComponent,
   FooterComponent,
   SearchInputComponent,
-  ThemeSettingsComponent,
   TinyMCEComponent,
   OneColumnLayoutComponent,
-  SampleLayoutComponent,
   ThreeColumnsLayoutComponent,
   TwoColumnsLayoutComponent,
-  ToggleSettingsButtonComponent,
 ];
-
-const ENTRY_COMPONENTS = [
-  ThemeSwitcherListComponent,
-];
-
 const PIPES = [
   CapitalizePipe,
   PluralPipe,
   RoundPipe,
   TimingPipe,
   NumberWithCommasPipe,
-  EvaIconsPipe,
-];
-
-const NB_THEME_PROVIDERS = [
-  ...NbThemeModule.forRoot(
-    {
-      name: 'cosmic',
-    },
-    [ DEFAULT_THEME, COSMIC_THEME, CORPORATE_THEME ],
-  ).providers,
-  ...NbSidebarModule.forRoot().providers,
-  ...NbMenuModule.forRoot().providers,
-  ...NbDatepickerModule.forRoot().providers,
-  ...NbDialogModule.forRoot().providers,
-  ...NbWindowModule.forRoot().providers,
-  ...NbToastrModule.forRoot().providers,
-  ...NbChatModule.forRoot({
-    messageGoogleMapKey: 'AIzaSyA_wNuCzia92MAmdLRzmqitRGvCF7wCZPY',
-  }).providers,
 ];
 
 @NgModule({
-  imports: [...BASE_MODULES, ...NB_MODULES],
-  exports: [...BASE_MODULES, ...NB_MODULES, ...COMPONENTS, ...PIPES],
+  imports: [CommonModule, ...NB_MODULES],
+  exports: [CommonModule, ...PIPES, ...COMPONENTS],
   declarations: [...COMPONENTS, ...PIPES],
-  entryComponents: [...ENTRY_COMPONENTS],
 })
 export class ThemeModule {
   static forRoot(): ModuleWithProviders {
     return <ModuleWithProviders>{
       ngModule: ThemeModule,
-      providers: [...NB_THEME_PROVIDERS],
+      providers: [
+        ...NbThemeModule.forRoot(
+          {
+            name: 'default',
+          },
+          [ DEFAULT_THEME, COSMIC_THEME, CORPORATE_THEME, DARK_THEME ],
+        ).providers,
+        WindowModeBlockScrollService,
+      ],
     };
   }
 }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 5490a21cf9..e6de7fe2e0 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -10,7 +10,11 @@ import {
 } from '@nebular/auth';
 
 const routes: Routes = [
-  { path: 'pages', loadChildren: 'app/pages/pages.module#PagesModule' },
+  {
+    path: 'pages',
+    loadChildren: () => import('app/pages/pages.module')
+      .then(m => m.PagesModule),
+  },
   {
     path: 'auth',
     component: NbAuthComponent,
@@ -46,7 +50,7 @@ const routes: Routes = [
 ];
 
 const config: ExtraOptions = {
-  useHash: true,
+  useHash: false,
 };
 
 @NgModule({
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index c8c047dace..0616603a93 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -3,17 +3,23 @@
  * Copyright Akveo. All Rights Reserved.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
-import { APP_BASE_HREF } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
 import { HttpClientModule } from '@angular/common/http';
 import { CoreModule } from './@core/core.module';
-
+import { ThemeModule } from './@theme/theme.module';
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-import { ThemeModule } from './@theme/theme.module';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NbChatModule,
+  NbDatepickerModule,
+  NbDialogModule,
+  NbMenuModule,
+  NbSidebarModule,
+  NbToastrModule,
+  NbWindowModule,
+} from '@nebular/theme';
 
 @NgModule({
   declarations: [AppComponent],
@@ -23,14 +29,20 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
     HttpClientModule,
     AppRoutingModule,
 
-    NgbModule.forRoot(),
     ThemeModule.forRoot(),
+
+    NbSidebarModule.forRoot(),
+    NbMenuModule.forRoot(),
+    NbDatepickerModule.forRoot(),
+    NbDialogModule.forRoot(),
+    NbWindowModule.forRoot(),
+    NbToastrModule.forRoot(),
+    NbChatModule.forRoot({
+      messageGoogleMapKey: 'AIzaSyA_wNuCzia92MAmdLRzmqitRGvCF7wCZPY',
+    }),
     CoreModule.forRoot(),
   ],
   bootstrap: [AppComponent],
-  providers: [
-    { provide: APP_BASE_HREF, useValue: '/' },
-  ],
 })
 export class AppModule {
 }
diff --git a/src/app/pages/bootstrap/bootstrap-routing.module.ts b/src/app/pages/bootstrap/bootstrap-routing.module.ts
deleted file mode 100644
index b7aa642b25..0000000000
--- a/src/app/pages/bootstrap/bootstrap-routing.module.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { BootstrapComponent } from './bootstrap.component';
-import { ModalsComponent } from './modals/modals.component';
-import { ButtonsComponent } from './buttons/buttons.component';
-import { FormInputsComponent } from './form-inputs/form-inputs.component';
-
-
-const routes: Routes = [{
-  path: '',
-  component: BootstrapComponent,
-  children: [
-    {
-      path: 'inputs',
-      component: FormInputsComponent,
-    },
-    {
-      path: 'buttons',
-      component: ButtonsComponent,
-    },
-    {
-      path: 'modal',
-      component: ModalsComponent,
-    },
-  ],
-}];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class BootstrapRoutingModule { }
diff --git a/src/app/pages/bootstrap/bootstrap.module.ts b/src/app/pages/bootstrap/bootstrap.module.ts
deleted file mode 100644
index 361d00a7a1..0000000000
--- a/src/app/pages/bootstrap/bootstrap.module.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { ThemeModule } from '../../@theme/theme.module';
-
-import { BootstrapRoutingModule } from './bootstrap-routing.module';
-import { ModalsComponent } from './modals/modals.component';
-import { ModalComponent } from './modals/modal/modal.component';
-import { BootstrapComponent } from './bootstrap.component';
-import { ButtonsModule } from './buttons/buttons.module';
-import { FormInputsComponent } from './form-inputs/form-inputs.component';
-
-const COMPONENTS = [
-  BootstrapComponent,
-  ModalsComponent,
-  ModalComponent,
-  FormInputsComponent,
-];
-
-const ENTRY_COMPONENTS = [
-  ModalComponent,
-];
-
-@NgModule({
-  imports: [
-    ThemeModule,
-    BootstrapRoutingModule,
-    ButtonsModule,
-  ],
-  declarations: [
-    ...COMPONENTS,
-  ],
-  entryComponents: [
-    ...ENTRY_COMPONENTS,
-  ],
-})
-export class BootstrapModule { }
diff --git a/src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.html b/src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.html
deleted file mode 100644
index 9bf3d12412..0000000000
--- a/src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<nb-card>
-  <nb-card-header>Block Level Buttons</nb-card-header>
-  <nb-card-body>
-    <div class="row block-level-buttons">
-      <div class="col-md-12">
-        <div class="btn-group btn-group-full-width" role="group">
-          <button type="button" class="btn btn-primary btn-group-icon btn-group-divider btn-fixed">
-            <i class="nb-home"></i>
-          </button>
-          <button type="button" class="btn btn-primary">Icon Block Button</button>
-        </div>
-        <button type="button" class="btn btn-outline-primary btn-block">Block Button</button>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.ts b/src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.ts
deleted file mode 100644
index d7f1a7fdfb..0000000000
--- a/src/app/pages/bootstrap/buttons/block-level-buttons/block-level-buttons.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-block-level-buttons',
-  templateUrl: './block-level-buttons.component.html',
-})
-export class BlockLevelButtonsComponent {
-}
diff --git a/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.html b/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.html
deleted file mode 100644
index 2283f62d4d..0000000000
--- a/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<nb-card>
-  <nb-card-header>Button Groups</nb-card-header>
-  <nb-card-body>
-    <div class="row">
-      <div class="col-md-12">
-        <div class="example-container toggle-types">
-          <div class="container-title">Toggle Types</div>
-          <div [(ngModel)]="radioModel" ngbRadioGroup
-               class="btn-group btn-group-toggle btn-outline-toggle-group btn-group-full-width btn-toggle-radio-group">
-            <label ngbButtonLabel class="btn btn-outline-primary">
-              <input ngbButton type="radio" value="left"> Left
-            </label>
-            <label ngbButtonLabel class="btn btn-outline-primary">
-              <input ngbButton type="radio" value="middle"> Middle
-            </label>
-            <label ngbButtonLabel class="btn btn-outline-primary">
-              <input ngbButton type="radio" value="right"> Right
-            </label>
-          </div>
-          <div class="btn-group btn-group-toggle btn-group-full-width" data-toggle="buttons">
-            <label ngbButtonLabel class="btn btn-primary" [class.active]="checkboxModel.left">
-              <input ngbButton type="checkbox" [(ngModel)]="checkboxModel.left"> Left
-            </label>
-            <label ngbButtonLabel class="btn btn-primary" [class.active]="checkboxModel.middle">
-              <input ngbButton type="checkbox" [(ngModel)]="checkboxModel.middle"> Middle
-            </label>
-            <label ngbButtonLabel class="btn btn-primary" [class.active]="checkboxModel.right">
-              <input ngbButton type="checkbox" [(ngModel)]="checkboxModel.right"> Right
-            </label>
-          </div>
-        </div>
-        <div class="example-container toolbars-container">
-          <div class="pagination-container">
-            <div class="container-title">Pagination</div>
-            <div class="btn-group btn-group-toggle btn-outline-toggle-group" data-toggle="buttons"
-                 [(ngModel)]="paginationModel" ngbRadioGroup>
-              <label ngbButtonLabel class="btn btn-outline-success">
-                <input ngbButton type="radio" [value]="1"> 1
-              </label>
-              <label ngbButtonLabel class="btn btn-outline-success">
-                <input ngbButton type="radio" [value]="2"> 2
-              </label>
-              <label ngbButtonLabel class="btn btn-outline-success">
-                <input ngbButton type="radio" [value]="3"> 3
-              </label>
-              <label ngbButtonLabel class="btn btn-outline-success">
-                <input ngbButton type="radio" [value]="4"> 4
-              </label>
-              <label ngbButtonLabel class="btn btn-outline-success">
-                <input ngbButton type="radio" [value]="5"> 5
-              </label>
-            </div>
-          </div>
-
-          <div class="icon-toolbar-container">
-            <div class="container-title">Icon Toolbar</div>
-            <div class="btn-group btn-group-toggle" data-toggle="buttons">
-              <label ngbButtonLabel class="btn btn-success" [class.active]="iconToolbarModel.one">
-                <input ngbButton type="checkbox" [(ngModel)]="iconToolbarModel.one"> 1
-              </label>
-              <label ngbButtonLabel class="btn btn-success" [class.active]="iconToolbarModel.two">
-                <input ngbButton type="checkbox" [(ngModel)]="iconToolbarModel.two"> 2
-              </label>
-              <label ngbButtonLabel class="btn btn-success" [class.active]="iconToolbarModel.three">
-                <input ngbButton type="checkbox" [(ngModel)]="iconToolbarModel.three"> 3
-              </label>
-              <label ngbButtonLabel class="btn btn-success" [class.active]="iconToolbarModel.four">
-                <input ngbButton type="checkbox" [(ngModel)]="iconToolbarModel.four"> 4
-              </label>
-              <label ngbButtonLabel class="btn btn-success" [class.active]="iconToolbarModel.five">
-                <input ngbButton type="checkbox" [(ngModel)]="iconToolbarModel.five"> 5
-              </label>
-            </div>
-          </div>
-        </div>
-        <div class="example-container">
-          <div class="container-title divided-button-group">Divided Button Group</div>
-          <div class="btn-group btn-group-toggle btn-divided-group btn-outline-divided-group btn-group-full-width btn-divided-checkbox-group "
-            data-toggle="buttons">
-            <label ngbButtonLabel class="btn btn-outline-success btn-icon" [class.active]="dividedCheckboxModel.monday">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedCheckboxModel.monday"> <i
-              class="nb-arrow-thin-down"></i>
-            </label>
-            <label ngbButtonLabel class="btn btn-outline-success btn-icon" [class.active]="dividedCheckboxModel.tuesday">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedCheckboxModel.tuesday"> <i
-              class="nb-arrow-thin-up"></i>
-            </label>
-            <label ngbButtonLabel class="btn btn-outline-success btn-icon" [class.active]="dividedCheckboxModel.wednesday">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedCheckboxModel.wednesday"> <i class="nb-arrow-thin-left"></i>
-            </label>
-            <label ngbButtonLabel class="btn btn-outline-success btn-icon" [class.active]="dividedCheckboxModel.thursday">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedCheckboxModel.thursday"> <i
-              class="nb-arrow-thin-right"></i>
-            </label>
-            <label ngbButtonLabel class="btn btn-outline-success btn-icon" [class.active]="dividedCheckboxModel.friday">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedCheckboxModel.friday"> <i class="nb-arrow-left"></i>
-            </label>
-            <label ngbButtonLabel class="btn btn-outline-success btn-icon" [class.active]="dividedCheckboxModel.saturday">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedCheckboxModel.saturday"> <i
-              class="nb-arrow-right"></i>
-            </label>
-          </div>
-        </div>
-        <div class="example-container">
-          <div class="container-title">Divided Button Group</div>
-          <div class="row">
-            <div [(ngModel)]="dividedButtonGroupOne" ngbRadioGroup
-                 class="btn-group btn-group-toggle btn-divided-group btn-outline-divided-group btn-group-full-width col-md-12">
-              <label ngbButtonLabel class="btn btn-outline-primary">
-                <input ngbButton type="radio" value="left"> Left
-              </label>
-              <label ngbButtonLabel class="btn btn-outline-primary">
-                <input ngbButton type="radio" value="middle"> Middle
-              </label>
-              <label ngbButtonLabel class="btn btn-outline-primary">
-                <input ngbButton type="radio" value="right"> Right
-              </label>
-            </div>
-          </div>
-          <div class="btn-group btn-group-toggle btn-divided-group btn-group-full-width" data-toggle="buttons">
-            <label ngbButtonLabel
-                   class="btn btn-primary"
-                   [class.active]="dividedButtonGroupTwo.left"
-                   [class.focus]="dividedButtonGroupTwo.left">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedButtonGroupTwo.left"> Left
-            </label>
-            <label ngbButtonLabel
-                   class="btn btn-primary"
-                   [class.active]="dividedButtonGroupTwo.middle"
-                   [class.focus]="dividedButtonGroupTwo.middle">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedButtonGroupTwo.middle"> Middle
-            </label>
-            <label ngbButtonLabel
-                   class="btn btn-primary"
-                   [class.active]="dividedButtonGroupTwo.right"
-                   [class.focus]="dividedButtonGroupTwo.right">
-              <input ngbButton type="checkbox" [(ngModel)]="dividedButtonGroupTwo.right"> Right
-            </label>
-          </div>
-        </div>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.scss b/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.scss
deleted file mode 100644
index 7a8f9b5ea5..0000000000
--- a/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.scss
+++ /dev/null
@@ -1,67 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-
-  .toolbars-container {
-    display: flex;
-    flex-direction: column;
-  }
-
-  .pagination-container {
-    @include nb-ltr(margin-right, 1rem);
-    @include nb-rtl(margin-left, 1rem);
-
-    .btn-group > .btn {
-      padding-left: 1.125rem;
-      padding-right: 1.125rem;
-    }
-  }
-
-  .icon-toolbar-container {
-    .btn-group > .btn {
-      padding-left: 1.125rem;
-      padding-right: 1.125rem;
-    }
-  }
-
-  .toggle-types {
-    .btn-toggle-radio-group {
-      margin-bottom: 1rem;
-    }
-  }
-
-  .divided-button-group {
-    .btn-divided-checkbox-group {
-      margin-bottom: 1rem;
-      flex-wrap: wrap;
-    }
-  }
-
-  .example-container:not(:last-child) {
-    margin-bottom: 1.5rem;
-  }
-
-  .example-container > div {
-    &:not(:last-child) {
-      margin-bottom: 1rem;
-    }
-  }
-
-  .example-container > .btn-divided-checkbox-group {
-    flex-wrap: wrap;
-
-    > label {
-      flex-basis: 10%;
-      @include nb-ltr(margin, 0 0.25rem 0.5rem 0);
-      @include nb-rtl(margin, 0 0 0.5rem 0.25rem);
-    }
-  }
-
-  @include media-breakpoint-down(sm) {
-    .btn {
-      padding: 0.75rem 0.7rem;
-    }
-  }
-}
diff --git a/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.ts b/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.ts
deleted file mode 100644
index 6d646bef5e..0000000000
--- a/src/app/pages/bootstrap/buttons/button-groups/button-groups.component.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-button-groups',
-  styleUrls: ['./button-groups.component.scss'],
-  templateUrl: './button-groups.component.html',
-})
-export class ButtonGroupsComponent {
-
-  radioModel = 'left';
-
-  checkboxModel = {
-    left: false,
-    middle: false,
-    right: false,
-  };
-
-  dividedCheckboxModel = {
-    monday: true,
-    tuesday: true,
-    wednesday: false,
-    thursday: false,
-    friday: false,
-    saturday: false,
-  };
-
-  paginationModel = 1;
-
-  iconToolbarModel = {
-    one: false,
-    two: false,
-    three: true,
-    four: false,
-    five: false,
-  };
-
-  dividedButtonGroupOne = 'left';
-
-  dividedButtonGroupTwo = {
-    left: false,
-    middle: false,
-    right: false,
-  };
-}
diff --git a/src/app/pages/bootstrap/buttons/buttons.component.html b/src/app/pages/bootstrap/buttons/buttons.component.html
deleted file mode 100644
index 9a8d7ebd0d..0000000000
--- a/src/app/pages/bootstrap/buttons/buttons.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="row">
-  <div class="col-lg-12">
-    <ngx-hero-buttons></ngx-hero-buttons>
-  </div>
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
-    <ngx-shape-buttons></ngx-shape-buttons>
-
-    <div class="row">
-      <div class="col-lg-5">
-        <ngx-dropdown-buttons></ngx-dropdown-buttons>
-        <ngx-icon-buttons></ngx-icon-buttons>
-      </div>
-      <div class="col-lg-7">
-        <ngx-button-groups></ngx-button-groups>
-      </div>
-    </div>
-  </div>
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
-    <ngx-size-buttons></ngx-size-buttons>
-    <ngx-default-buttons></ngx-default-buttons>
-    <ngx-block-level-buttons></ngx-block-level-buttons>
-  </div>
-</div>
diff --git a/src/app/pages/bootstrap/buttons/buttons.component.scss b/src/app/pages/bootstrap/buttons/buttons.component.scss
deleted file mode 100644
index c972d13f9a..0000000000
--- a/src/app/pages/bootstrap/buttons/buttons.component.scss
+++ /dev/null
@@ -1,103 +0,0 @@
-@import '../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-  /deep/ {
-    $button-size: 50px;
-
-    .container-title {
-      color: nb-theme(color-fg);
-      font-family: nb-theme(font-secondary);
-      margin-bottom: 0.5rem;
-    }
-
-    .header {
-      color: nb-theme(color-fg-header);
-      font-size: 0.875rem;
-    }
-
-    .subheader {
-      font-size: 0.75rem;
-      font-weight: nb-theme(font-weight-light);
-      color: nb-theme(color-fg);
-    }
-
-    .btn-demo {
-      width: 180px;
-    }
-
-    .state-container {
-      display: flex;
-
-      &:not(:last-child) {
-        margin-bottom: 1rem;
-      }
-
-      .state-value {
-        width: $button-size;
-        height: $button-size;
-        border-radius: nb-theme(btn-border-radius);
-
-        @include nb-for-theme(corporate) {
-          border-radius: nb-theme(btn-semi-round-border-radius);
-        }
-      }
-
-      .state-details {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        margin-left: 1rem;
-        margin-right: 1rem;
-        height: $button-size;
-      }
-    }
-
-    .example-container {
-      @include nb-ltr(padding-right, 0);
-      @include nb-rtl(padding-left, 0);
-    }
-
-    .example-container .container-btn {
-      margin-bottom: 1.5rem;
-    }
-
-    .block-level-buttons .btn-group {
-      margin-bottom: 1rem;
-    }
-  }
-
-  @include media-breakpoint-down(is) {
-    ngx-default-buttons /deep/ nb-card-header {
-      flex-direction: column;
-      align-items: left;
-
-      span {
-        margin-bottom: 1rem;
-      }
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-
-    /deep/.icon-buttons .icon-button-examples {
-      button {
-        @include nb-ltr(margin-right, 1rem);
-        @include nb-rtl(margin-left, 1rem);
-      }
-    }
-
-    ngx-default-buttons /deep/ nb-card-header {
-      flex-direction: column;
-      margin-bottom: 0.5rem;
-    }
-
-    ngx-block-level-buttons /deep/ {
-      .btn-primary {
-        padding: 0.75rem 1rem;
-      }
-    }
-  }
-}
diff --git a/src/app/pages/bootstrap/buttons/buttons.component.ts b/src/app/pages/bootstrap/buttons/buttons.component.ts
deleted file mode 100644
index c632c86983..0000000000
--- a/src/app/pages/bootstrap/buttons/buttons.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-buttons',
-  styleUrls: ['./buttons.component.scss'],
-  templateUrl: './buttons.component.html',
-})
-export class ButtonsComponent {
-}
diff --git a/src/app/pages/bootstrap/buttons/buttons.module.ts b/src/app/pages/bootstrap/buttons/buttons.module.ts
deleted file mode 100644
index a56930070f..0000000000
--- a/src/app/pages/bootstrap/buttons/buttons.module.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { ThemeModule } from '../../../@theme/theme.module';
-import { DefaultButtonsComponent } from './default-buttons/default-buttons.component';
-import { HeroButtonComponent } from './hero-buttons/hero-buttons.component';
-import { ShapeButtonsComponent } from './shape-buttons/shape-buttons.component';
-import { SizeButtonsComponent } from './size-buttons/size-buttons.component';
-import { ButtonsComponent } from './buttons.component';
-import { DropdownButtonsComponent } from './dropdown-buttons/dropdown-button.component';
-import { BlockLevelButtonsComponent } from './block-level-buttons/block-level-buttons.component';
-import { ButtonGroupsComponent } from './button-groups/button-groups.component';
-import { IconButtonsComponent } from './icon-buttons/icon-buttons.component';
-
-const components = [
-  ButtonsComponent,
-  DefaultButtonsComponent,
-  HeroButtonComponent,
-  ShapeButtonsComponent,
-  SizeButtonsComponent,
-  DropdownButtonsComponent,
-  BlockLevelButtonsComponent,
-  ButtonGroupsComponent,
-  IconButtonsComponent,
-];
-
-@NgModule({
-  imports: [
-    ThemeModule,
-  ],
-  exports: [
-    ...components,
-  ],
-  declarations: [
-    ...components,
-  ],
-  providers: [],
-})
-export class ButtonsModule { }
diff --git a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.html b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.html
deleted file mode 100644
index 3346b9cd69..0000000000
--- a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<nb-card>
-  <nb-card-header>
-    <span>Default Buttons</span>
-    <div class="dropdown" ngbDropdown>
-      <button class="btn btn-primary" type="button" ngbDropdownToggle>
-        {{ selectedView.title }}
-      </button>
-      <ul class="dropdown-menu" ngbDropdownMenu>
-        <li class="dropdown-item" *ngFor="let v of buttonsViews" (click)="this.selectedView = v">{{ v.title }}</li>
-      </ul>
-    </div>
-  </nb-card-header>
-  <nb-card-body>
-    <div class="row">
-      <div class="example-container col-md-4" *ngFor="let b of buttons[selectedView.key]">
-        <div class="container-title">
-          <span>{{ b.containerTitle }}</span>
-        </div>
-        <div class="container-btn">
-          <button class="btn {{ b.class }} btn-demo">{{ b.title }}</button>
-        </div>
-        <div class="{{ b.container }}">
-          <div class="state-container">
-            <div class="state-value original"></div>
-            <div class="state-details">
-              <span class="header">Default</span>
-              <span class="subheader">{{ b.default }}</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value hover"></div>
-            <div class="state-details">
-              <span class="header">Hover</span>
-              <span class="subheader">14% white</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value active"></div>
-            <div class="state-details">
-              <span class="header">Active</span>
-              <span class="subheader">14% black</span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.scss b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.scss
deleted file mode 100644
index febd14106a..0000000000
--- a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.scss
+++ /dev/null
@@ -1,126 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-
-@include nb-install-component() {
-
-  nb-card-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    .dropdown {
-      flex-basis: 30%;
-      min-width: 220px;
-    }
-  }
-
-  nb-card-body {
-    padding-bottom: 0;
-  }
-
-  .example-container {
-    margin-bottom: 1.5rem;
-  }
-
-  .primary-container {
-    .original {
-      background-color: nb-theme(btn-primary-bg);
-    }
-    .hover {
-      @include btn-primary-hover();
-    }
-    .active {
-      @include btn-primary-active();
-    }
-  }
-
-  .primary-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-primary-bg);
-  }
-
-  .success-container {
-    .original {
-      background-color: nb-theme(btn-success-bg);
-    }
-    .hover {
-      @include btn-success-hover();
-    }
-    .active {
-      @include btn-success-active();
-    }
-  }
-
-  .success-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-success-bg);
-  }
-
-  .warning-container {
-    .original {
-      background-color: nb-theme(btn-warning-bg);
-    }
-    .hover {
-      @include btn-warning-hover();
-    }
-    .active {
-      @include btn-warning-active();
-    }
-  }
-
-  .warning-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-warning-bg);
-  }
-
-  .info-container {
-    .original {
-      background-color: nb-theme(btn-info-bg);
-    }
-    .hover {
-      @include btn-info-hover();
-    }
-    .active {
-      @include btn-info-active();
-    }
-  }
-
-  .info-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-info-bg);
-  }
-
-  .danger-container {
-    .original {
-      background-color: nb-theme(btn-danger-bg);
-    }
-    .hover {
-      @include btn-danger-hover();
-    }
-    .active {
-      @include btn-danger-active();
-    }
-  }
-
-  .danger-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-danger-bg);
-  }
-
-  .secondary-container {
-    .original {
-      border: 2px solid nb-theme(btn-secondary-border);
-    }
-    .hover {
-      @include btn-secondary-hover();
-    }
-    .active {
-      @include btn-secondary-active();
-    }
-  }
-
-  .secondary-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-secondary-border);
-  }
-}
diff --git a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.ts b/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.ts
deleted file mode 100644
index af7b7078d1..0000000000
--- a/src/app/pages/bootstrap/buttons/default-buttons/default-buttons.component.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-default-buttons',
-  styleUrls: ['./default-buttons.component.scss'],
-  templateUrl: './default-buttons.component.html',
-})
-export class DefaultButtonsComponent {
-
-  buttonsViews = [{
-    title: 'Default Buttons',
-    key: 'default',
-  }, {
-    title: 'Outline Buttons',
-    key: 'outline',
-  }];
-
-  selectedView = this.buttonsViews[0];
-
-  buttons = {
-    'default': [
-      {
-        class: 'btn-primary',
-        container: 'primary-container',
-        containerTitle: 'Primary Button',
-        title: 'Primary',
-        default: '#7659ff',
-      }, {
-        class: 'btn-warning',
-        container: 'warning-container',
-        containerTitle: 'Warning Button',
-        title: 'Warning',
-        default: '#ffcb17',
-      }, {
-        class: 'btn-success',
-        container: 'success-container',
-        containerTitle: 'Success Button',
-        title: 'Success',
-        default: '#00d977',
-      }, {
-        class: 'btn-info',
-        container: 'info-container',
-        containerTitle: 'Info Button',
-        title: 'Info',
-        default: '#0088ff',
-      }, {
-        class: 'btn-danger',
-        container: 'danger-container',
-        containerTitle: 'Danger Button',
-        title: 'Danger',
-        default: '#ff386a',
-      }, {
-        class: 'btn-secondary',
-        container: 'secondary-container',
-        containerTitle: 'Default Button',
-        title: 'Default',
-        default: '#bdbaff',
-      },
-    ],
-
-    'outline': [
-      {
-        class: 'btn-outline-primary',
-        container: 'primary-container outline',
-        containerTitle: 'Primary Button',
-        title: 'Primary',
-        default: '#7659ff',
-      }, {
-        class: 'btn-outline-warning',
-        container: 'warning-container outline',
-        containerTitle: 'Warning Button',
-        title: 'Warning',
-        default: '#ffcb17',
-      }, {
-        class: 'btn-outline-success',
-        container: 'success-container outline',
-        containerTitle: 'Success Button',
-        title: 'Success',
-        default: '#00d977',
-      }, {
-        class: 'btn-outline-info',
-        container: 'info-container',
-        containerTitle: 'Info Button',
-        title: 'Info',
-        default: '#0088ff',
-      }, {
-        class: 'btn-outline-danger',
-        container: 'danger-container outline',
-        containerTitle: 'Danger Button',
-        title: 'Danger',
-        default: '#ff386a',
-      }, {
-        class: 'btn-outline-secondary',
-        container: 'secondary-container outline',
-        containerTitle: 'Default Button',
-        title: 'Default',
-        default: '#bdbaff',
-      },
-    ],
-  };
-}
diff --git a/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.html b/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.html
deleted file mode 100644
index 7ad12f1800..0000000000
--- a/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<nb-card>
-  <nb-card-header>Button Dropdowns</nb-card-header>
-  <nb-card-body>
-    <div class="dropdown btn-group" ngbDropdown>
-      <button type="button" class="btn btn-primary">Dropdown</button>
-      <button type="button" class="btn btn-primary" ngbDropdownToggle></button>
-      <ul class="dropdown-menu" ngbDropdownMenu>
-        <li class="dropdown-item">Icon Button</li>
-        <li class="dropdown-item">Hero Button</li>
-        <li class="dropdown-item">Default</li>
-      </ul>
-    </div>
-    <div class="dropdown" ngbDropdown>
-      <button class="btn btn-primary" type="button" ngbDropdownToggle>
-        Dropdown
-      </button>
-      <ul class="dropdown-menu" ngbDropdownMenu>
-        <li class="dropdown-item">Icon Button</li>
-        <li class="dropdown-item">Hero Button</li>
-        <li class="dropdown-item">Default</li>
-      </ul>
-    </div>
-    <div class="dropdown" placement="top" ngbDropdown>
-      <button class="btn btn-outline-primary" type="button" ngbDropdownToggle>
-        Dropup
-      </button>
-      <ul class="dropdown-menu" ngbDropdownMenu>
-        <li class="dropdown-item">Icon Button</li>
-        <li class="dropdown-item">Hero Button</li>
-        <li class="dropdown-item">Default</li>
-      </ul>
-    </div>
-    <div class="dropdown ghost-dropdown" ngbDropdown>
-      <button class="btn btn-primary" type="button" ngbDropdownToggle>
-        Dropdown
-      </button>
-      <ul class="dropdown-menu" ngbDropdownMenu>
-        <li class="dropdown-item">Icon Button</li>
-        <li class="dropdown-item">Hero Button</li>
-        <li class="dropdown-item">Default</li>
-      </ul>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.scss b/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.scss
deleted file mode 100644
index 078b71e120..0000000000
--- a/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@import '../../../../@theme/styles/themes';
-
-@include nb-install-component() {
-  text-align: center;
-
-  .dropdown, .dropup, .btn-group {
-    margin-bottom: 1rem;
-  }
-
-  nb-card-body {
-    overflow: visible;
-  }
-}
diff --git a/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.ts b/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.ts
deleted file mode 100644
index 00507c9de3..0000000000
--- a/src/app/pages/bootstrap/buttons/dropdown-buttons/dropdown-button.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-dropdown-buttons',
-  styleUrls: ['./dropdown-button.component.scss'],
-  templateUrl: './dropdown-button.component.html',
-})
-
-export class DropdownButtonsComponent {
-}
diff --git a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.html b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.html
deleted file mode 100644
index ff39ea39ac..0000000000
--- a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<nb-card>
-  <nb-card-header>Hero Buttons</nb-card-header>
-  <nb-card-body>
-    <div class="row">
-      <div class="example-container col-sm-6 col-md-4 col-xl-3 col-xxxl-2" *ngFor="let hb of settings">
-        <div class="container-title">
-          <span>{{ hb.title }}</span>
-        </div>
-        <div class="container-btn">
-          <button class="btn {{ hb.class }} btn-demo">{{ hb.buttonTitle }}</button>
-        </div>
-        <div class="{{ hb.container }}">
-          <div class="state-container" *ngIf="hb[themeName].border">
-            <div class="state-value border"></div>
-            <div class="state-details">
-              <span class="header">Border</span>
-              <span class="subheader">{{ hb[themeName].border }}</span>
-            </div>
-          </div>
-          <div class="state-container" *ngIf="hb[themeName].color">
-            <div class="state-value color"></div>
-            <div class="state-details">
-              <span class="header">Color</span>
-              <span class="subheader">{{ hb[themeName].color }}</span>
-            </div>
-          </div>
-          <div class="state-container" *ngIf="hb[themeName].gradientLeft">
-            <div class="state-value gradient"></div>
-            <div class="state-details">
-              <span class="header">Linear Gradient</span>
-              <span class="subheader">{{ hb[themeName].gradientLeft }}</span>
-              <span class="subheader">{{ hb[themeName].gradientRight }}</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value bevel" [ngClass]="{ 'none': !hb[themeName].bevel }"></div>
-            <div class="state-details" *ngIf="hb[themeName].bevel">
-              <span class="header">Bevel</span>
-              <span class="subheader">0 3px 0 0</span>
-              <span class="subheader">{{ hb[themeName].bevel }}</span>
-            </div>
-            <div class="state-details" *ngIf="!hb[themeName].bevel">
-              <span class="header">No Bevel</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value shadow" [ngClass]="{ 'none': !hb[themeName].shadow }"></div>
-            <div class="state-details" *ngIf="hb[themeName].shadow">
-              <span class="header">Shadow</span>
-              <span class="subheader">0 4px 10px 0</span>
-              <span class="subheader">{{ hb[themeName].shadow }}</span>
-            </div>
-            <div class="state-details" *ngIf="!hb[themeName].shadow">
-              <span class="header">No Shadow</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value glow" [ngClass]="{ 'none': !hb[themeName].glow }"></div>
-            <div class="state-details" *ngIf="hb[themeName].glow">
-              <span class="header">Glow</span>
-              <span class="subheader">{{ hb[themeName].glow.params }}</span>
-              <span class="subheader">{{ hb[themeName].glow.color }}</span>
-            </div>
-            <div class="state-details" *ngIf="!hb[themeName].glow">
-              <span class="header">No Glow</span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.scss b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.scss
deleted file mode 100644
index d2e3cfde48..0000000000
--- a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.scss
+++ /dev/null
@@ -1,135 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    padding-bottom: 0;
-  }
-
-  .none {
-    position: relative;
-    transform: rotate(45deg);
-
-    &::before, &::after {
-      position: absolute;
-      content: '';
-      background: nb-theme(form-control-border-color);
-    }
-
-    &::before {
-      left: 50%;
-      top: 10%;
-      transform: translateX(-50%);
-      width: 1px;
-      height: 80%;
-    }
-
-    &::after {
-      top: 50%;
-      left: 10%;
-      transform: translateY(-50%);
-      height: 1px;
-      width: 80%;
-    }
-  }
-
-  .shadow {
-    box-shadow: nb-theme(btn-hero-shadow);
-  }
-
-  .primary-container {
-    .color {
-      background-color: nb-theme(color-primary);
-    }
-    .gradient {
-      @include btn-hero-primary-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-primary-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-primary-bevel();
-    }
-  }
-
-  .warning-container {
-    .color {
-      background-color: nb-theme(color-warning);
-    }
-    .gradient {
-      @include btn-hero-warning-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-warning-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-warning-bevel();
-    }
-  }
-
-  .success-container {
-    .color {
-      background-color: nb-theme(color-success);
-    }
-    .gradient {
-      @include btn-hero-success-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-success-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-success-bevel();
-    }
-  }
-
-  .info-container {
-    .color {
-      background-color: nb-theme(color-info);
-    }
-    .gradient {
-      @include btn-hero-info-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-info-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-info-bevel();
-    }
-  }
-
-  .danger-container {
-    .color {
-      background-color: nb-theme(color-danger);
-    }
-    .gradient {
-      @include btn-hero-danger-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-danger-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-danger-bevel();
-    }
-  }
-
-  .secondary-container {
-    .color {
-      background-color: nb-theme(btn-secondary-bg);
-    }
-    .border {
-      color: nb-theme(btn-secondary-color);
-      border: nb-theme(btn-secondary-border-width) solid nb-theme(btn-secondary-border);
-    }
-    .glow {
-      box-shadow: btn-hero-secondary-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-secondary-bevel();
-    }
-  }
-
-  .example-container {
-    margin-bottom: 1.5rem;
-  }
-}
diff --git a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.ts b/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.ts
deleted file mode 100644
index c0c22cae73..0000000000
--- a/src/app/pages/bootstrap/buttons/hero-buttons/hero-buttons.component.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import { Component, OnDestroy } from '@angular/core';
-import { NbThemeService } from '@nebular/theme';
-import { Subscription } from 'rxjs';
-
-@Component({
-  selector: 'ngx-hero-buttons',
-  styleUrls: ['./hero-buttons.component.scss'],
-  templateUrl: './hero-buttons.component.html',
-})
-export class HeroButtonComponent implements OnDestroy {
-
-  themeName = 'default';
-  settings: Array<any>;
-  themeSubscription: Subscription;
-
-  constructor(private themeService: NbThemeService) {
-    this.themeSubscription = this.themeService.getJsTheme().subscribe(theme => {
-      this.themeName = theme.name;
-      this.init(theme.variables);
-    });
-  }
-
-  init(colors: any) {
-    this.settings = [{
-      class: 'btn-hero-primary',
-      container: 'primary-container',
-      title: 'Primary Button',
-      buttonTitle: 'Primary',
-      default: {
-        gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
-        gradientRight: colors.primary,
-      },
-      corporate: {
-        color: colors.primary,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (115, 161, 255, 0.5)',
-        },
-      },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
-        gradientRight: colors.primary,
-        bevel: `shade(${colors.primary}, 14%)`,
-        shadow: 'rgba (6, 7, 64, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.primary}, 10deg)`,
-        },
-      },
-    }, {
-      class: 'btn-hero-warning',
-      container: 'warning-container',
-      title: 'Warning Button',
-      buttonTitle: 'Warning',
-      default: {
-        gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
-        gradientRight: colors.warning,
-      },
-      corporate: {
-        color: colors.warning,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (256, 163, 107, 0.5)',
-        },
-      },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
-        gradientRight: colors.warning,
-        bevel: `shade(${colors.warning}, 14%)`,
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.warning}, 5deg)`,
-        },
-      },
-    }, {
-      class: 'btn-hero-success',
-      container: 'success-container',
-      title: 'Success Button',
-      buttonTitle: 'Success',
-      default: {
-        gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
-        gradientRight: colors.success,
-      },
-      corporate: {
-        color: colors.success,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (93, 207, 227, 0.5)',
-        },
-      },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
-        gradientRight: colors.success,
-        bevel: `shade(${colors.success}, 14%)`,
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.success}, 10deg)`,
-        },
-      },
-    }, {
-      class: 'btn-hero-info',
-      container: 'info-container',
-      title: 'Info Button',
-      buttonTitle: 'Info',
-      default: {
-        gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
-        gradientRight: colors.info,
-      },
-      corporate: {
-        color: colors.info,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (186, 127, 236, 0.5)',
-        },
-      },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
-        gradientRight: colors.info,
-        bevel: `shade(${colors.info}, 14%)`,
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.info}, -5deg)`,
-        },
-      },
-    }, {
-      class: 'btn-hero-danger',
-      container: 'danger-container',
-      title: 'Danger Button',
-      buttonTitle: 'Danger',
-      default: {
-        gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
-        gradientRight: colors.danger,
-      },
-      corporate: {
-        color: colors.danger,
-        glow: {
-          params: '0 0 20px 0',
-          color: 'rgba (255, 107, 131, 0.5)',
-        },
-      },
-      cosmic: {
-        gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
-        gradientRight: colors.danger,
-        bevel: `shade(${colors.danger}, 14%)`,
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: `adjust-hue(${colors.danger}, -10deg)`,
-        },
-      },
-    }, {
-      class: 'btn-hero-secondary',
-      container: 'secondary-container',
-      title: 'Ghost Button',
-      buttonTitle: 'Ghost',
-      default: {
-        border: '#dadfe6',
-      },
-      corporate: {
-        color: '#edf2f5',
-      },
-      cosmic: {
-        border: colors.primary,
-        bevel: '#665ebd',
-        shadow: 'rgba (33, 7, 77, 0.5)',
-        glow: {
-          params: '0 2px 12px 0',
-          color: 'rgba (146, 141, 255, 1)',
-        },
-      },
-    }];
-  }
-
-  ngOnDestroy() {
-    this.themeSubscription.unsubscribe();
-  }
-}
diff --git a/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.html b/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.html
deleted file mode 100644
index edf53dffcc..0000000000
--- a/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<nb-card>
-  <nb-card-header>Icon buttons</nb-card-header>
-  <nb-card-body>
-    <div class="row icon-buttons">
-      <div class="col-md-12">
-        <div class="btn-group">
-          <button type="button" class="btn btn-primary btn-group-icon btn-group-divider">
-            <i class="nb-home"></i>
-          </button>
-          <button type="button" class="btn btn-primary">Icon Button</button>
-        </div>
-        <div class="btn-with-icon-example">
-          <button type="button" class="btn btn-primary btn-with-icon">
-            <i class="nb-home"></i>
-            <span>Icon Button</span>
-          </button>
-        </div>
-        <div class="icon-button-examples">
-          <button type="button" class="btn btn-outline-primary btn-icon">
-            <i class="nb-layout-centre"></i>
-          </button>
-          <button type="button" class="btn btn-outline-success btn-icon">
-            <i class="nb-layout-default"></i>
-          </button>
-          <button type="button" class="btn btn-outline-danger btn-icon">
-            <i class="nb-layout-one-column"></i>
-          </button>
-        </div>
-        <div class="icon-button-examples">
-          <button type="button" class="btn btn-primary btn-icon">
-            <i class="nb-shuffle"></i>
-          </button>
-          <button type="button" class="btn btn-success btn-icon">
-            <i class="nb-skip-backward-outline"></i>
-          </button>
-          <button type="button" class="btn btn-danger btn-icon">
-            <i class="nb-skip-forward-outline"></i>
-          </button>
-        </div>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.scss b/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.scss
deleted file mode 100644
index d23e06f968..0000000000
--- a/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-nb-card-body {
-  div:not(:last-child) {
-    margin-bottom: 1rem;
-  }
-}
-
-.btn-with-icon-example {
-  width: 100%;
-
-  .btn {
-    width: 100%;
-  }
-}
-
-.btn-group:not(:last-child) {
-  margin-bottom: 1rem;
-}
-
-.icon-button-examples {
-  display: flex;
-  justify-content: space-between;
-
-  button {
-    min-width: 4rem;
-  }
-}
-
-.icon-button-examples:not(:last-child) {
-  margin-bottom: 1rem;
-}
diff --git a/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.ts b/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.ts
deleted file mode 100644
index 6dc286440a..0000000000
--- a/src/app/pages/bootstrap/buttons/icon-buttons/icon-buttons.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-icon-buttons',
-  styleUrls: ['./icon-buttons.component.scss'],
-  templateUrl: './icon-buttons.component.html',
-})
-export class IconButtonsComponent {
-}
diff --git a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.html b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.html
deleted file mode 100644
index 814c85fc3c..0000000000
--- a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<nb-card>
-  <nb-card-header>Button Shapes</nb-card-header>
-  <nb-card-body>
-    <div class="shape-container">
-      <div class="container-title">
-        <span>Rectangle Button</span>
-      </div>
-      <div class="subheader">
-        <span>Border radius:</span>
-        <span>4px</span>
-      </div>
-      <div>
-        <button class="btn btn-success btn-rectangle btn-demo">Rectangle</button>
-      </div>
-    </div>
-
-    <div class="shape-container">
-      <div class="container-title">
-        <span>Semi-round Button</span>
-      </div>
-      <div class="subheader">
-        <span>Border radius:</span>
-        <span>12px</span>
-      </div>
-      <div>
-        <button class="btn btn-success btn-semi-round btn-demo">Semi-round</button>
-      </div>
-    </div>
-
-    <div class="shape-container">
-      <div class="container-title">
-        <span>Rounded Button</span>
-      </div>
-      <div class="subheader">
-        <span>Border radius:</span>
-        <span>round</span>
-      </div>
-      <div>
-        <button class="btn btn-success btn-round btn-demo">Round</button>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.scss b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.scss
deleted file mode 100644
index 996e682166..0000000000
--- a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    padding: 0 0 29px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-  }
-
-  .shape-container {
-    margin: 1.25rem 1.25rem 0;
-  }
-
-  .container-title {
-    margin-bottom: 0.25rem;
-  }
-
-  .subheader {
-    margin-bottom: 1rem;
-    font-size: 0.875rem;
-
-    span:nth-child(2) {
-      color: nb-theme(color-fg-heading);
-      font-weight: nb-theme(font-weight-bold);
-    }
-  }
-}
diff --git a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.ts b/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.ts
deleted file mode 100644
index dde928d8ba..0000000000
--- a/src/app/pages/bootstrap/buttons/shape-buttons/shape-buttons.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-shape-buttons',
-  styleUrls: ['./shape-buttons.component.scss'],
-  templateUrl: './shape-buttons.component.html',
-})
-export class ShapeButtonsComponent {
-}
diff --git a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.html b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.html
deleted file mode 100644
index dda2e2a76a..0000000000
--- a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<nb-card>
-  <nb-card-header>Button Sizes</nb-card-header>
-
-  <nb-card-body>
-    <div class="size-container">
-      <div class="container-title">
-        <span>Large Button</span>
-      </div>
-      <div class="subheader">
-        <span>0.875rem 1.75rem</span>
-      </div>
-      <div>
-        <button class="btn btn-primary btn-lg">Large Button</button>
-      </div>
-    </div>
-    <div class="size-container">
-      <div class="container-title">
-        <span>Medium Button</span>
-      </div>
-      <div class="subheader">
-        <span>0.75rem 1.5rem</span>
-      </div>
-      <div>
-        <button class="btn btn-primary btn-md">Medium Button</button>
-      </div>
-    </div>
-    <div class="size-container">
-      <div class="container-title">
-        <span>Small Button</span>
-      </div>
-      <div class="subheader">
-        <span>0.675rem 1.5rem</span>
-      </div>
-      <div>
-        <button class="btn btn-primary btn-sm">Small Button</button>
-      </div>
-    </div>
-    <div class="size-container">
-      <div class="container-title">
-        <span>X-Small Button</span>
-      </div>
-      <div class="subheader">
-        <span>0.5rem 1.25rem</span>
-      </div>
-      <div>
-        <button class="btn btn-primary btn-xs">X-Small Button</button>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.scss b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.scss
deleted file mode 100644
index 67d7ae288d..0000000000
--- a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    padding: 0 1.25rem 1.25rem 0;
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  .container-title {
-    margin-bottom: 0.25rem;
-  }
-
-  .size-container {
-    margin: 1.25rem 0 0 1.25rem;
-  }
-
-  .subheader {
-    margin-bottom: 0.75rem;
-    font-size: 0.875rem;
-    font-weight: nb-theme(font-weight-bolder);
-    color: nb-theme(color-fg-heading);
-  }
-}
diff --git a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.ts b/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.ts
deleted file mode 100644
index bdc9bb3391..0000000000
--- a/src/app/pages/bootstrap/buttons/size-buttons/size-buttons.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-size-buttons',
-  styleUrls: ['./size-buttons.component.scss'],
-  templateUrl: './size-buttons.component.html',
-})
-export class SizeButtonsComponent {
-}
diff --git a/src/app/pages/bootstrap/form-inputs/form-inputs.component.html b/src/app/pages/bootstrap/form-inputs/form-inputs.component.html
deleted file mode 100644
index 6331c2b7c5..0000000000
--- a/src/app/pages/bootstrap/form-inputs/form-inputs.component.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<div class="row">
-  <div class="col-lg-6">
-    <nb-card>
-      <nb-card-header>Default Inputs</nb-card-header>
-      <nb-card-body>
-        <div class="input-group">
-          <input type="text" placeholder="Project" class="form-control"/>
-        </div>
-        <div class="row full-name-inputs">
-          <div class="col-sm-6 input-group">
-            <input type="text" placeholder="Nick" class="form-control"/>
-          </div>
-          <div class="col-sm-6 input-group">
-            <input type="text" placeholder="Last Name" class="form-control"/>
-          </div>
-        </div>
-        <div class="input-group">
-          <input type="password" placeholder="Password" class="form-control"/>
-        </div>
-        <div class="input-group has-person-icon">
-          <input type="text" placeholder="With Icon" class="form-control"/>
-        </div>
-        <div class="input-group input-group-rounded">
-          <input type="text" placeholder="Rounded border" class="form-control"/>
-        </div>
-        <div class="form-group">
-          <input type="text" placeholder="Project" class="form-control"/>
-          <small class="form-text">A block of help text that breaks into a new line and may extend beyond one line.
-          </small>
-        </div>
-        <div class="input-group">
-          <input type="text" placeholder="Disabled input" class="form-control" disabled/>
-        </div>
-        <div class="input-group">
-          <textarea rows="5" placeholder="Text Area" class="form-control"></textarea>
-        </div>
-        <div class="input-group input-group-sm">
-          <input type="text" placeholder="Small Input" class="form-control"/>
-        </div>
-        <div class="input-group input-group-lg">
-          <input type="text" placeholder="Large Input" class="form-control"/>
-        </div>
-      </nb-card-body>
-    </nb-card>
-
-    <nb-card>
-      <nb-card-header>Input Groups</nb-card-header>
-      <nb-card-body>
-        <div class="input-group">
-          <span class="input-group-addon success">@</span>
-          <input type="text" class="form-control" placeholder="Username"/>
-        </div>
-
-        <div class="input-group mail-btn-group">
-          <span class="input-group-prepend">
-            <button class="btn btn-primary btn-icon input-group-text">
-              <i class="ion-ios-email-outline"></i>
-            </button>
-          </span>
-          <input type="text" class="form-control" placeholder="Recipient's username">
-          <span class="input-group-append">
-            <button class="btn btn-primary input-group-text">
-              @example.com
-            </button>
-          </span>
-        </div>
-        <div class="input-group">
-          <input type="text" class="form-control" placeholder="Search for...">
-          <span class="input-group-append">
-            <button class="btn btn-danger input-group-text">
-              Search
-            </button>
-          </span>
-        </div>
-        <div class="input-group">
-          <div class="dropdown input-group-prepend input-group-btn" ngbDropdown>
-            <button type="button" class="btn btn-success dropdown-toggle" ngbDropdownToggle>
-              Action
-            </button>
-            <ul class="dropdown-menu" ngbDropdownMenu>
-              <li class="dropdown-item">Action</li>
-              <li class="dropdown-item">Another action</li>
-              <li class="dropdown-item">Something else here</li>
-              <div role="separator" class="dropdown-divider"></div>
-              <li class="dropdown-item">Separated link</li>
-            </ul>
-          </div>
-          <input type="text" class="form-control">
-        </div>
-      </nb-card-body>
-    </nb-card>
-
-    <nb-card>
-      <nb-card-header>Selects</nb-card-header>
-      <nb-card-body>
-        <div class="form-group">
-          <label>Simple Select</label>
-          <select class="form-control">
-            <option>Minsk</option>
-            <option>Gomel</option>
-            <option>Brest</option>
-            <option>Grodno</option>
-            <option>Mogilev</option>
-          </select>
-        </div>
-        <div class="form-group">
-          <label>Multiple Select</label>
-          <select multiple class="form-control">
-            <option>Item 1</option>
-            <option>Item 2</option>
-            <option>Item 3</option>
-            <option>Item 4</option>
-            <option>Item 5</option>
-          </select>
-        </div>
-      </nb-card-body>
-    </nb-card>
-  </div>
-
-  <div class="col-lg-6">
-    <nb-card>
-      <nb-card-header>Input Styles</nb-card-header>
-      <nb-card-body>
-        <div class="input-group input-group-border-only">
-          <input type="text" placeholder="Border Only" class="form-control"/>
-        </div>
-        <div class="input-group">
-          <input type="text" placeholder="Default Input" class="form-control">
-        </div>
-        <div class="input-group input-group-fill-only">
-          <input type="text" placeholder="Fill Only" class="form-control">
-        </div>
-      </nb-card-body>
-    </nb-card>
-
-    <nb-card>
-      <nb-card-header>Validation States</nb-card-header>
-      <nb-card-body>
-        <div class="form-group">
-          <input type="text" placeholder="Input with Success" class="form-control form-control-success">
-        </div>
-        <div class="form-group">
-          <input type="text" placeholder="Input with Warning" class="form-control form-control-warning">
-        </div>
-        <div class="form-group">
-          <input type="text" placeholder="Input with Danger" class="form-control form-control-danger">
-        </div>
-        <div class="form-group validation-checkboxes row">
-          <nb-checkbox status="success" class="col-sm-4">Checkbox with Success</nb-checkbox>
-          <nb-checkbox status="warning" class="col-sm-4">Checkbox with Warning</nb-checkbox>
-          <nb-checkbox status="danger" class="col-sm-4">Checkbox with Danger</nb-checkbox>
-        </div>
-        <div class="form-group has-success">
-          <input type="text" placeholder="Input with Success Icon" class="form-control form-control-success">
-        </div>
-        <div class="form-group has-warning">
-          <input type="text" placeholder="Input with Warning Icon" class="form-control form-control-warning">
-        </div>
-        <div class="form-group has-danger">
-          <input type="text" placeholder="Input with Danger Icon" class="form-control form-control-danger">
-        </div>
-      </nb-card-body>
-    </nb-card>
-
-    <nb-card>
-      <nb-card-header>Checkboxes & Radios</nb-card-header>
-      <nb-card-body>
-        <div class="row demo-checkboxes-radio">
-          <div class="demo-checkboxes col-sm-4">
-            <nb-checkbox>Checkbox 1</nb-checkbox>
-            <nb-checkbox [value]="true">Checkbox 2</nb-checkbox>
-
-            <div class="custom-control custom-checkbox">
-              <input type="checkbox" class="custom-control-input" id="b-checkbox">
-              <label class="custom-control-label" for="b-checkbox">Bootstrap Checkbox</label>
-            </div>
-          </div>
-          <div class="demo-radio col-sm-4">
-            <label class="custom-control custom-radio">
-              <input type="radio" class="custom-control-input" name="customRadio">
-              <span class="custom-control-indicator"></span>
-              <span class="custom-control-description">Radio 1</span>
-            </label>
-            <label class="custom-control custom-radio">
-              <input type="radio" class="custom-control-input" name="customRadio" checked>
-              <span class="custom-control-indicator"></span>
-              <span class="custom-control-description">Radio 2</span>
-            </label>
-            <label class="custom-control custom-radio">
-              <input type="radio" class="custom-control-input" name="customRadio">
-              <span class="custom-control-indicator"></span>
-              <span class="custom-control-description">Radio 3</span>
-            </label>
-          </div>
-          <div class="demo-disabled-checkbox-radio col-sm-4">
-            <nb-checkbox disabled>Disabled Checkbox</nb-checkbox>
-            <label class="custom-control custom-radio">
-              <input type="radio" class="custom-control-input" disabled>
-              <span class="custom-control-indicator"></span>
-              <span class="custom-control-description">Disabled Radio</span>
-            </label>
-          </div>
-        </div>
-      </nb-card-body>
-    </nb-card>
-
-    <nb-card>
-      <nb-card-body class="demo-rating">
-        <span class="rating-header">Rating</span>
-        <div>
-          <ngb-rating [(rate)]="starRate" max=5>
-            <ng-template let-fill="fill">
-              <span class="star fill" [class.filled]="fill === 100">
-                <i class="ion-android-star" *ngIf="fill === 100"></i>
-                <i class="ion-android-star-outline" *ngIf="fill !== 100"></i>
-              </span>
-            </ng-template>
-          </ngb-rating>
-          <span class="current-rate">{{ starRate }}</span>
-        </div>
-        <div>
-          <ngb-rating [(rate)]="heartRate" max=5>
-            <ng-template let-fill="fill">
-              <span class="star fill" [class.filled]="fill === 100">
-                <i class="ion-ios-heart" *ngIf="fill === 100"></i>
-                <i class="ion-ios-heart-outline" *ngIf="fill !== 100"></i>
-              </span>
-            </ng-template>
-          </ngb-rating>
-          <span class="current-rate">{{ heartRate }}</span>
-        </div>
-      </nb-card-body>
-    </nb-card>
-  </div>
-</div>
diff --git a/src/app/pages/bootstrap/form-inputs/form-inputs.component.scss b/src/app/pages/bootstrap/form-inputs/form-inputs.component.scss
deleted file mode 100644
index 763b31ae3f..0000000000
--- a/src/app/pages/bootstrap/form-inputs/form-inputs.component.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@import '../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    overflow: visible;
-  }
-
-  .input-group {
-    margin-bottom: 1rem;
-  }
-
-  .validation-checkboxes {
-    display: flex;
-    justify-content: space-between;
-
-    .custom-control {
-      margin-left: 1rem;
-    }
-  }
-
-  .demo-checkboxes {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 1rem;
-  }
-
-  .demo-radio {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 1rem;
-  }
-
-  .demo-disabled-checkbox-radio {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 1rem;
-  }
-
-  .demo-checkboxes-radio {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .demo-rating {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-  }
-
-  .star {
-    font-size: 1.5rem;
-    color: nb-theme(color-fg);
-  }
-
-  .filled {
-    color: nb-theme(color-fg);
-  }
-
-  // TODO: Replace with the card header styles mixin
-  .rating-header {
-    line-height: 2rem;
-    font-size: 1.25rem;
-    font-family: nb-theme(font-secondary);
-    font-weight: nb-theme(font-weight-bolder);
-    color: nb-theme(color-fg-heading);
-  }
-
-  .current-rate {
-    font-size: 1.5rem;
-    @include nb-ltr(padding-left, 1rem);
-    @include nb-rtl(padding-right, 1rem);
-    color: nb-theme(color-fg-heading);
-  }
-
-  .full-name-inputs {
-    display: flex;
-  }
-
-  .input-group.has-person-icon {
-    position: relative;
-
-    .form-control {
-
-      padding-left: 3rem;
-    }
-
-    &::before {
-      content: '\F47D';
-      font-family: 'Ionicons';
-      font-size: 2rem;
-      position: absolute;
-      z-index: 100;
-      left: 1rem;
-      top: 0.25rem;
-    }
-  }
-
-  .dropdown {
-    min-width: 7rem;
-  }
-
-  .dropdown-menu {
-    width: auto;
-  }
-
-  .form-group label {
-    padding: 0 0 0.75rem;
-  }
-
-  ngb-rating {
-    outline: none;
-  }
-
-  ngb-rating i {
-    color: nb-theme(color-success);
-    @include nb-for-theme(cosmic) {
-      color: nb-theme(color-primary);
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    button:not(.btn-icon) {
-      padding: 0.75rem 1rem;
-      font-size: 0.75rem;
-    }
-  }
-}
diff --git a/src/app/pages/bootstrap/form-inputs/form-inputs.component.ts b/src/app/pages/bootstrap/form-inputs/form-inputs.component.ts
deleted file mode 100644
index 6299738fec..0000000000
--- a/src/app/pages/bootstrap/form-inputs/form-inputs.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-form-inputs',
-  styleUrls: ['./form-inputs.component.scss'],
-  templateUrl: './form-inputs.component.html',
-})
-export class FormInputsComponent {
-
-  starRate = 2;
-  heartRate = 4;
-}
diff --git a/src/app/pages/bootstrap/modals/modal/modal.component.html b/src/app/pages/bootstrap/modals/modal/modal.component.html
deleted file mode 100644
index 8b13789179..0000000000
--- a/src/app/pages/bootstrap/modals/modal/modal.component.html
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/app/pages/bootstrap/modals/modal/modal.component.ts b/src/app/pages/bootstrap/modals/modal/modal.component.ts
deleted file mode 100644
index 9619cde4ed..0000000000
--- a/src/app/pages/bootstrap/modals/modal/modal.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Component } from '@angular/core';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-
-@Component({
-  selector: 'ngx-modal',
-  template: `
-    <div class="modal-header">
-      <span>{{ modalHeader }}</span>
-      <button class="close" aria-label="Close" (click)="closeModal()">
-        <span aria-hidden="true">&times;</span>
-      </button>
-    </div>
-    <div class="modal-body">
-      {{ modalContent }}
-    </div>
-    <div class="modal-footer">
-      <button class="btn btn-md btn-primary" (click)="closeModal()">Save changes</button>
-    </div>
-  `,
-})
-export class ModalComponent {
-
-  modalHeader: string;
-  modalContent = `Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy
-    nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis
-    nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.`;
-
-  constructor(private activeModal: NgbActiveModal) { }
-
-  closeModal() {
-    this.activeModal.close();
-  }
-}
diff --git a/src/app/pages/bootstrap/modals/modals.component.html b/src/app/pages/bootstrap/modals/modals.component.html
deleted file mode 100644
index c33caefb4b..0000000000
--- a/src/app/pages/bootstrap/modals/modals.component.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="row">
-  <div class="col-md-12">
-    <nb-card>
-      <nb-card-header>Modals</nb-card-header>
-      <nb-card-body>
-        <button class="btn btn-success" (click)="showLargeModal()">Large modal</button>
-        <button class="btn btn-warning" (click)="showSmallModal()">Small modal</button>
-        <button class="btn btn-primary" (click)="showStaticModal()">Static modal</button>
-      </nb-card-body>
-    </nb-card>
-  </div>
-</div>
diff --git a/src/app/pages/bootstrap/modals/modals.component.scss b/src/app/pages/bootstrap/modals/modals.component.scss
deleted file mode 100644
index 72de19793e..0000000000
--- a/src/app/pages/bootstrap/modals/modals.component.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import '~@nebular/theme/styles/core/mixins';
-
-:host {
-  button {
-    @include nb-ltr(margin, 0 0.75rem 2rem 0);
-    @include nb-rtl(margin, 0 0 2rem 0.75rem);
-  }
-}
diff --git a/src/app/pages/bootstrap/modals/modals.component.ts b/src/app/pages/bootstrap/modals/modals.component.ts
deleted file mode 100644
index 07bc9fe72b..0000000000
--- a/src/app/pages/bootstrap/modals/modals.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Component } from '@angular/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-
-import { ModalComponent } from './modal/modal.component';
-
-@Component({
-  selector: 'ngx-modals',
-  styleUrls: ['./modals.component.scss'],
-  templateUrl: './modals.component.html',
-})
-export class ModalsComponent {
-
-  constructor(private modalService: NgbModal) { }
-
-  showLargeModal() {
-    const activeModal = this.modalService.open(ModalComponent, { size: 'lg', container: 'nb-layout' });
-
-    activeModal.componentInstance.modalHeader = 'Large Modal';
-  }
-  showSmallModal() {
-    const activeModal = this.modalService.open(ModalComponent, { size: 'sm', container: 'nb-layout' });
-
-    activeModal.componentInstance.modalHeader = 'Small Modal';
-  }
-
-  showStaticModal() {
-    const activeModal = this.modalService.open(ModalComponent, {
-      size: 'sm',
-      backdrop: 'static',
-      container: 'nb-layout',
-    });
-
-    activeModal.componentInstance.modalHeader = 'Static modal';
-    activeModal.componentInstance.modalContent = `This is static modal, backdrop click
-                                                    will not close it. Click × or confirmation button to close modal.`;
-  }
-
-}
diff --git a/src/app/pages/charts/chartjs/chartjs.component.scss b/src/app/pages/charts/chartjs/chartjs.component.scss
index 90f4b0a03a..6c4e18916a 100644
--- a/src/app/pages/charts/chartjs/chartjs.component.scss
+++ b/src/app/pages/charts/chartjs/chartjs.component.scss
@@ -11,7 +11,7 @@
     height: nb-theme(card-height-medium);
     width: 100%;
 
-    /deep/ chart {
+    ::ng-deep chart {
       display: block;
       height: 100%;
       width: 100%;
diff --git a/src/app/pages/charts/charts.module.ts b/src/app/pages/charts/charts.module.ts
index 8d0711ff0b..32b4fd99e4 100644
--- a/src/app/pages/charts/charts.module.ts
+++ b/src/app/pages/charts/charts.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { NgxEchartsModule } from 'ngx-echarts';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { ChartModule } from 'angular2-chartjs';
+import { NbCardModule } from '@nebular/theme';
 
 import { ThemeModule } from '../../@theme/theme.module';
 
@@ -49,7 +50,14 @@ const components = [
 ];
 
 @NgModule({
-  imports: [ThemeModule, ChartsRoutingModule, NgxEchartsModule, NgxChartsModule, ChartModule],
+  imports: [
+    ThemeModule,
+    ChartsRoutingModule,
+    NgxEchartsModule,
+    NgxChartsModule,
+    ChartModule,
+    NbCardModule,
+  ],
   declarations: [...routedComponents, ...components],
 })
 export class ChartsModule {}
diff --git a/src/app/pages/charts/d3/d3.component.scss b/src/app/pages/charts/d3/d3.component.scss
index b11c36b04e..3ddb4e8fba 100644
--- a/src/app/pages/charts/d3/d3.component.scss
+++ b/src/app/pages/charts/d3/d3.component.scss
@@ -11,30 +11,36 @@
     width: 100%;
     height: nb-theme(card-height-medium);
 
-    /deep/ {
+    ::ng-deep {
       .pie-label {
-        fill: nb-theme(color-fg-heading);
-      }
-
-      .grid-line-path {
-        stroke: nb-theme(separator);
+        fill: nb-theme(text-basic-color);
       }
 
       text {
-        fill: nb-theme(color-fg-heading);
+        fill: nb-theme(text-hint-color);
       }
 
       .chart-legend {
         .legend-labels {
-          background: nb-theme(color-bg);
+          background: nb-theme(background-basic-color-2);
         }
         .legend-label {
-          color: nb-theme(color-fg-heading);
+          color: nb-theme(text-hint-color);
           .active .legend-label-text {
-            color: nb-theme(color-fg-heading);
+            color: nb-theme(text-basic-color);
           }
         }
       }
+
+      .total-value,
+      .item-value,
+      .item-percent {
+        line-height: 1.25;
+      }
+
+      .legend-items {
+        overflow-y: hidden;
+      }
     }
   }
 }
diff --git a/src/app/pages/charts/echarts/echarts.component.scss b/src/app/pages/charts/echarts/echarts.component.scss
index bd7f3998c2..6f3cb3c8b4 100644
--- a/src/app/pages/charts/echarts/echarts.component.scss
+++ b/src/app/pages/charts/echarts/echarts.component.scss
@@ -13,7 +13,7 @@
     width: 100%;
   }
 
-  /deep/ .echart {
+  ::ng-deep .echart {
     height: 100%;
     width: 100%;
   }
diff --git a/src/app/pages/dashboard/contacts/contacts.component.html b/src/app/pages/dashboard/contacts/contacts.component.html
index 2d060f9668..0aac40bfee 100644
--- a/src/app/pages/dashboard/contacts/contacts.component.html
+++ b/src/app/pages/dashboard/contacts/contacts.component.html
@@ -1,16 +1,23 @@
-<nb-card [size]="breakpoint.width >= breakpoints.xxxl || breakpoint.width < breakpoints.md ? 'large' : 'xlarge'">
+<nb-card size="giant">
   <nb-tabset fullWidth>
+
     <nb-tab tabTitle="Contacts">
-      <div class="contact" *ngFor="let c of contacts">
-        <nb-user [picture]="c.user.picture" [name]="c.user.name" [title]="c.type" size="large"></nb-user>
-        <i class="i-contact nb-phone"></i>
-      </div>
+      <nb-list>
+        <nb-list-item class="contact" *ngFor="let c of contacts">
+          <nb-user [picture]="c.user.picture" [name]="c.user.name" [title]="c.type" size="large"></nb-user>
+          <nb-icon icon="phone-outline" pack="eva"></nb-icon>
+        </nb-list-item>
+      </nb-list>
     </nb-tab>
+
     <nb-tab tabTitle="Recent">
-      <div class="contact" *ngFor="let c of recent">
-        <nb-user [picture]="c.user.picture" [name]="c.user.name" [title]="c.type" size="large"></nb-user>
-        <span class="time">{{ c.time | date: 'shortTime' }}</span>
-      </div>
+      <nb-list>
+        <nb-list-item class="contact" *ngFor="let c of recent">
+          <nb-user [picture]="c.user.picture" [name]="c.user.name" [title]="c.type" size="large"></nb-user>
+          <span class="caption">{{ c.time | date: 'shortTime' }}</span>
+        </nb-list-item>
+      </nb-list>
     </nb-tab>
+
   </nb-tabset>
 </nb-card>
diff --git a/src/app/pages/dashboard/contacts/contacts.component.scss b/src/app/pages/dashboard/contacts/contacts.component.scss
index c046d28c1d..787ed0bed7 100644
--- a/src/app/pages/dashboard/contacts/contacts.component.scss
+++ b/src/app/pages/dashboard/contacts/contacts.component.scss
@@ -1,16 +1,24 @@
 @import '../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/hero-buttons';
 
 @include nb-install-component() {
+  nb-card {
+    overflow: hidden;
+  }
+
   nb-tabset {
-    height: 100%;
     display: flex;
     flex-direction: column;
+
+    ::ng-deep ul {
+      // make same size as card header
+      padding-bottom: 1px;
+      ::ng-deep .tab-link {
+        padding: 1.25rem 2rem;
+      }
+    }
   }
 
   nb-tab {
-    flex: 1;
-    overflow-y: auto;
     padding: 0;
   }
 
@@ -18,50 +26,9 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    color: nb-theme(color-fg);
-    padding: 1rem;
-
-    &:not(:last-child) {
-      border-bottom: 1px solid nb-theme(separator);
-
-      @include nb-for-theme(corporate) {
-        border-bottom-color: nb-theme(tabs-separator);
-      }
-    }
-  }
-
-  .i-contact {
-    font-size: 2rem;
-    cursor: pointer;
-  }
-
-  .time {
-    font-size: 0.875rem;
-    font-weight: nb-theme(font-weight-light);
-    text-transform: uppercase;
-  }
-
-  nb-user /deep/ {
-    .info-container {
-      @include nb-ltr(margin-left, 0.875rem);
-      @include nb-rtl(margin-right, 0.875rem);
-    }
-
-    .user-name {
-      font-family: nb-theme(font-secondary);
-      font-weight: nb-theme(font-weight-bold);
-      color: nb-theme(color-fg-heading);
-      font-size: 1.25rem;
-
-      @include nb-for-theme(cosmic) {
-        font-weight: nb-theme(font-weight-bolder);
-      }
-    }
 
-    .user-title {
-      font-size: 0.875rem;
-      font-weight: nb-theme(font-weight-light);
-      text-transform: uppercase;
+    &:first-child {
+      border-top: none;
     }
   }
 }
diff --git a/src/app/pages/dashboard/contacts/contacts.component.ts b/src/app/pages/dashboard/contacts/contacts.component.ts
index cebb7c5abb..c8a523d670 100644
--- a/src/app/pages/dashboard/contacts/contacts.component.ts
+++ b/src/app/pages/dashboard/contacts/contacts.component.ts
@@ -1,5 +1,4 @@
 import { Component, OnDestroy } from '@angular/core';
-import { NbThemeService, NbMediaBreakpoint, NbMediaBreakpointsService } from '@nebular/theme';
 import { takeWhile } from 'rxjs/operators';
 import { forkJoin } from 'rxjs';
 
@@ -16,19 +15,8 @@ export class ContactsComponent implements OnDestroy {
 
   contacts: any[];
   recent: any[];
-  breakpoint: NbMediaBreakpoint;
-  breakpoints: any;
-
-  constructor(private userService: UserData,
-              private themeService: NbThemeService,
-              private breakpointService: NbMediaBreakpointsService) {
-    this.breakpoints = this.breakpointService.getBreakpointsMap();
-    this.themeService.onMediaQueryChange()
-      .pipe(takeWhile(() => this.alive))
-      .subscribe(([oldValue, newValue]) => {
-        this.breakpoint = newValue;
-      });
 
+  constructor(private userService: UserData) {
     forkJoin(
       this.userService.getContacts(),
       this.userService.getRecentUsers(),
diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html
index 167035ed1a..6b99758a92 100644
--- a/src/app/pages/dashboard/dashboard.component.html
+++ b/src/app/pages/dashboard/dashboard.component.html
@@ -1,7 +1,6 @@
 <div class="row">
   <div class="col-xxxl-3 col-md-6" *ngFor="let statusCard of statusCards">
-    <ngx-status-card [title]="statusCard.title"
-                     [type]="statusCard.type">
+    <ngx-status-card [title]="statusCard.title" [type]="statusCard.type">
       <i [ngClass]="statusCard.iconClass"></i>
     </ngx-status-card>
   </div>
diff --git a/src/app/pages/dashboard/dashboard.component.scss b/src/app/pages/dashboard/dashboard.component.scss
index 6aa31a5f82..c9e3499f9b 100644
--- a/src/app/pages/dashboard/dashboard.component.scss
+++ b/src/app/pages/dashboard/dashboard.component.scss
@@ -13,10 +13,4 @@
       display: none;
     }
   }
-
-  @include media-breakpoint-down(is) {
-    /deep/ nb-card.large-card {
-      height: nb-theme(card-height-medium);
-    }
-  }
 }
diff --git a/src/app/pages/dashboard/dashboard.component.ts b/src/app/pages/dashboard/dashboard.component.ts
index 087550d638..c359216af2 100644
--- a/src/app/pages/dashboard/dashboard.component.ts
+++ b/src/app/pages/dashboard/dashboard.component.ts
@@ -53,6 +53,7 @@ export class DashboardComponent implements OnDestroy {
     default: CardSettings[];
     cosmic: CardSettings[];
     corporate: CardSettings[];
+    dark: CardSettings[];
   } = {
     default: this.commonStatusCardsSet,
     cosmic: this.commonStatusCardsSet,
@@ -71,9 +72,10 @@ export class DashboardComponent implements OnDestroy {
       },
       {
         ...this.coffeeMakerCard,
-        type: 'secondary',
+        type: 'info',
       },
     ],
+    dark: this.commonStatusCardsSet,
   };
 
   constructor(private themeService: NbThemeService,
diff --git a/src/app/pages/dashboard/dashboard.module.ts b/src/app/pages/dashboard/dashboard.module.ts
index 2ffdd614c9..b938dd6793 100644
--- a/src/app/pages/dashboard/dashboard.module.ts
+++ b/src/app/pages/dashboard/dashboard.module.ts
@@ -1,5 +1,15 @@
 import { NgModule } from '@angular/core';
-
+import {
+  NbActionsModule,
+  NbButtonModule,
+  NbCardModule,
+  NbTabsetModule,
+  NbUserModule,
+  NbRadioModule,
+  NbSelectModule,
+  NbListModule,
+  NbIconModule,
+} from '@nebular/theme';
 import { NgxEchartsModule } from 'ngx-echarts';
 
 import { ThemeModule } from '../../@theme/theme.module';
@@ -10,7 +20,6 @@ import { RoomsComponent } from './rooms/rooms.component';
 import { RoomSelectorComponent } from './rooms/room-selector/room-selector.component';
 import { TemperatureComponent } from './temperature/temperature.component';
 import { TemperatureDraggerComponent } from './temperature/temperature-dragger/temperature-dragger.component';
-import { TeamComponent } from './team/team.component';
 import { KittenComponent } from './kitten/kitten.component';
 import { SecurityCamerasComponent } from './security-cameras/security-cameras.component';
 import { ElectricityComponent } from './electricity/electricity.component';
@@ -20,10 +29,22 @@ import { SolarComponent } from './solar/solar.component';
 import { PlayerComponent } from './rooms/player/player.component';
 import { TrafficComponent } from './traffic/traffic.component';
 import { TrafficChartComponent } from './traffic/traffic-chart.component';
+import { FormsModule } from '@angular/forms';
 
 @NgModule({
   imports: [
+    FormsModule,
     ThemeModule,
+    NbCardModule,
+    NbUserModule,
+    NbButtonModule,
+    NbTabsetModule,
+    NbActionsModule,
+    NbRadioModule,
+    NbSelectModule,
+    NbListModule,
+    NbIconModule,
+    NbButtonModule,
     NgxEchartsModule,
   ],
   declarations: [
@@ -34,7 +55,6 @@ import { TrafficChartComponent } from './traffic/traffic-chart.component';
     RoomSelectorComponent,
     TemperatureComponent,
     RoomsComponent,
-    TeamComponent,
     KittenComponent,
     SecurityCamerasComponent,
     ElectricityComponent,
diff --git a/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts b/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts
index 014151f1a2..11865102aa 100644
--- a/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts
+++ b/src/app/pages/dashboard/electricity/electricity-chart/electricity-chart.component.ts
@@ -66,7 +66,7 @@ export class ElectricityChartComponent implements AfterViewInit, OnDestroy {
             position: 'top',
             backgroundColor: eTheme.tooltipBg,
             borderColor: eTheme.tooltipBorderColor,
-            borderWidth: 3,
+            borderWidth: 1,
             formatter: '{c0} kWh',
             extraCssText: eTheme.tooltipExtraCss,
           },
diff --git a/src/app/pages/dashboard/electricity/electricity.component.html b/src/app/pages/dashboard/electricity/electricity.component.html
index 4b91fecdd1..7085cbd7cb 100644
--- a/src/app/pages/dashboard/electricity/electricity.component.html
+++ b/src/app/pages/dashboard/electricity/electricity.component.html
@@ -1,57 +1,47 @@
-<nb-card size="large">
-  <div class="consumption-table">
-    <div class="table-header">
-      <div>Electricity</div>
-      <div class="subtitle">Consumption</div>
-    </div>
+<nb-card class="cards-container">
+  <nb-card size="large" class="table-card">
+    <nb-card-header>
+      Electricity Consumption
+    </nb-card-header>
 
     <nb-tabset fullWidth>
       <nb-tab *ngFor="let year of listData" [tabTitle]="year.title" [active]="year.active">
-        <div class="stats-month" *ngFor="let month of year.months">
-          <div>
+        <nb-list>
+          <nb-list-item *ngFor="let month of year.months">
             <span class="month">{{ month.month }}</span>
-            <span class="delta" [ngClass]="{ 'down': month.down }">{{ month.delta }}</span>
-          </div>
-          <div class="results">
-            <b>{{ month.kWatts }}</b> kWh / <b>{{ month.cost }}</b> USD
-          </div>
-        </div>
+            <span>
+              <nb-icon
+                [class.down]="month.down"
+                [class.up]="!month.down"
+                [icon]="month.down ? 'arrow-down' : 'arrow-up'" pack="eva">
+              </nb-icon>
+              {{ month.delta }}
+            </span>
+            <span class="results">
+              {{ month.kWatts }} <span class="caption">kWh</span> / {{ month.cost }} <span class="caption">USD</span>
+            </span>
+          </nb-list-item>
+        </nb-list>
       </nb-tab>
     </nb-tabset>
-  </div>
+  </nb-card>
 
-  <div class="chart-container">
-    <div class="chart-header">
-      <div class="header-stats">
-        <div class="stats-block">
-          <div class="subtitle">Consumed</div>
-          <div>
-            <span class="value">816</span>
-            <span class="unit">kWh</span>
-          </div>
-        </div>
+  <nb-card size="large" class="chart-card">
+    <nb-card-header>
+      <span class="stats">
+        <span class="caption">Consumed</span>
+        <span>816 <span class="caption">kWh</span></span>
+      </span>
+      <span class="stats">
+        <span class="caption">Spent</span>
+        <span>291 <span class="caption">USD</span></span>
+      </span>
 
-        <div class="stats-block currency">
-          <div class="subtitle">Spent</div>
-          <div>
-            <span class="value">291</span>
-            <span class="unit">USD</span>
-          </div>
-        </div>
-      </div>
+      <nb-select [(selected)]="type" class="type-select">
+        <nb-option *ngFor="let t of types" [value]="t">{{ t }}</nb-option>
+      </nb-select>
+    </nb-card-header>
 
-      <div class="dropdown"
-           [ngClass]="{ 'ghost-dropdown': currentTheme === 'corporate' }"
-           ngbDropdown>
-        <button type="button" ngbDropdownToggle class="btn"
-                [ngClass]="{ 'btn-outline-success': currentTheme == 'default', 'btn-primary': currentTheme != 'default'}">
-          {{ type }}
-        </button>
-        <ul class="dropdown-menu" ngbDropdownMenu>
-          <li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
-        </ul>
-      </div>
-    </div>
     <ngx-electricity-chart [data]="chartData"></ngx-electricity-chart>
-  </div>
+  </nb-card>
 </nb-card>
diff --git a/src/app/pages/dashboard/electricity/electricity.component.scss b/src/app/pages/dashboard/electricity/electricity.component.scss
index a29d9412d1..6c976689a9 100644
--- a/src/app/pages/dashboard/electricity/electricity.component.scss
+++ b/src/app/pages/dashboard/electricity/electricity.component.scss
@@ -1,328 +1,90 @@
 @import '../../../@theme/styles/themes';
-@import '~@nebular/theme/components/card/card.component.theme';
-@import '~@nebular/theme/styles/global/typography/typography';
 @import '~bootstrap/scss/mixins/breakpoints';
 @import '~@nebular/theme/styles/global/breakpoints';
-@import '~@nebular/bootstrap/styles/hero-buttons';
 
 @include nb-install-component() {
 
-  nb-card {
+  .cards-container {
     display: flex;
     flex-direction: row;
-  }
-
-  nb-card-body {
     overflow: hidden;
   }
 
-  .consumption-table {
-    display: flex;
-    flex-direction: column;
-    width: 20rem;
-    height: 100%;
-    z-index: 2;
-    box-shadow: nb-theme(card-shadow);
-
-    @include nb-for-theme(corporate) {
-      border-right: 1px solid nb-theme(card-border-color);
-    }
+  .table-card,
+  .chart-card {
+    box-shadow: none;
+    margin-bottom: 0;
+    border-width: 0;
   }
 
-  .table-header {
-    @include nb-card-header();
-    font-size: 1.25rem;
-
-    .subtitle {
-      color: nb-theme(color-fg);
-      font-family: nb-theme(font-main);
-      font-size: 1rem;
-      font-weight: nb-theme(font-weight-light);
-    }
+  .table-card {
+    flex: 0 0 auto;
   }
 
-  nb-tabset /deep/ {
-    flex: 1;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-
-    ul {
-      align-items: center;
-      padding: 1rem;
-    }
-
-    ul li a {
-      font-weight: nb-theme(font-weight-bolder);
-      padding: 0.75rem 1rem;
-    }
-
-    ul li.active {
-      position: relative;
-      background-color: nb-theme(layout-bg);
-      border-radius: nb-theme(radius) nb-theme(radius) 0 0;
-
-      &::before {
-        position: absolute;
-        content: '';
-        width: 100%;
-        height: 5px;
-        border-radius: 2.5px;
-        bottom: 0;
-        left: 0;
-        background: nb-theme(color-success);
-      }
-
-      a {
-        font-size: 1.5rem;
-      }
-      a::before {
-        display: none;
-      }
-    }
-
-    nb-tab {
-      flex: 1;
-      overflow-y: auto;
-    }
+  .chart-card {
+    flex: 1 0 auto;
   }
 
-  .stats-month {
+  .chart-card nb-card-header {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-    padding: nb-theme(padding);
-    color: nb-theme(color-fg);
-    position: relative;
-
-    &:not(:first-child) {
-      border-top: 1px solid nb-theme(separator);
-
-      @include nb-for-theme(corporate) {
-        border-top-color: nb-theme(tabs-separator);
-      }
-    }
-
-    &:hover {
-      background-color: nb-theme(layout-bg);
-
-      &::before {
-        position: absolute;
-        content: '';
-        height: 100%;
-        width: 6px;
-        left: 0;
-        top: 0;
-        background-color: nb-theme(color-success);
-        border-radius: nb-theme(radius);
-      }
-    }
+    padding-top: nb-theme(card-header-with-select-padding-top);
+    padding-bottom: nb-theme(card-header-with-select-padding-bottom);
 
-    .month {
-      display: inline-block;
-      width: 2.75rem;
-      font-family: nb-theme(font-secondary);
-      font-size: 1.25rem;
-      font-weight: nb-theme(font-weight-bolder);
-      color: nb-theme(color-fg-heading);
-    }
-
-    .delta {
-      position: relative;
-      display: inline-block;
-      padding-left: 1rem;
-      font-size: 0.75rem;
-
-      color: text-danger();
-
-      &::before {
-        position: absolute;
-        content: '';
-        bottom: 3px;
-        left: 2px;
-
-        border-left: 5px solid transparent;
-        border-right: 5px solid transparent;
-        border-bottom: 8px solid text-danger();
-      }
-
-      &.down {
-        color: text-success();
+    // prevents double border from chart yAxisSplitLine
+    margin-bottom: -1px;
+  }
 
-        &::before {
-          top: 3px;
-          border-top: 8px solid text-success();
-          border-bottom: none;
-        }
-      }
-    }
+  .type-select {
+    margin-left: auto;
+  }
 
-    .results {
-      font-size: 0.875rem;
-      font-weight: nb-theme(font-weight-light);
+  .stats {
+    margin-right: 1rem;
 
-      b {
-        font-family: nb-theme(font-secondary);
-        font-size: 1rem;
-        font-weight: nb-theme(font-weight-bolder);
-        color: nb-theme(color-fg-heading);
-      }
+    > .caption {
+      display: block;
     }
   }
 
-  .chart-container {
-    flex: 1;
-    height: 100%;
-    background-image: nb-theme(radial-gradient);
+  nb-tabset {
     display: flex;
     flex-direction: column;
     overflow: hidden;
   }
 
-  .chart-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 1rem 1.75rem 1rem 1rem;
+  nb-tab {
+    padding: 0;
   }
 
-  .header-stats {
+  nb-list-item {
     display: flex;
-    align-items: center;
-  }
-
-  .stats-block {
-    display: flex;
-    flex-direction: column;
-    align-items: normal;
-    color: nb-theme(color-fg);
-    padding: 0 1.5rem;
-    border-right: 1px solid nb-theme(separator);
-
-    .subtitle {
-      font-size: 1rem;
-      font-weight: nb-theme(font-weight-light);
-    }
+    align-items: baseline;
 
-    .value {
-      font-family: nb-theme(font-secondary);
-      font-size: 1.5rem;
-      font-weight: nb-theme(font-weight-bold);
-      color: nb-theme(color-fg-heading);
-    }
-
-    .unit {
-      font-family: nb-theme(font-secondary);
-      font-size: 1.25rem;
-      font-weight: nb-theme(font-weight-light);
+    &:first-child {
+      border-top: none;
     }
   }
 
-  .dropdown {
-    min-width: 130px;
+  .month {
+    width: 2rem;
   }
 
-  @include nb-for-theme(cosmic) {
-    nb-tabset /deep/ ul li.active {
-      background-color: nb-theme(color-primary);
-      border-radius: nb-theme(radius);
-
-      &::before {
-        display: none;
-      }
-    }
-
-    .stats-block .value {
-      font-weight: nb-theme(font-weight-bolder);
-    }
-
-    .stats-month {
-      &:hover {
-        &::before {
-          $color-top: nb-theme(btn-success-bg);
-          $color-bottom: btn-hero-success-left-color();
-
-          background-image: linear-gradient(to top, $color-top, $color-bottom);
-          box-shadow: 0 0 16px -2px btn-hero-success-middle-color();
-        }
-      }
-    }
+  nb-icon.down {
+    color: nb-theme(color-danger-default);
   }
 
-  @include nb-for-theme(corporate) {
-    nb-tabset /deep/ ul li.active {
-      &::before {
-        display: none;
-      }
-    }
-
-    .stats-block {
-      border-right: none;
-    }
-
-    .stats-month {
-      &:hover {
-        &::before {
-          background-color: nb-theme(color-primary);
-        }
-      }
-
-      .delta {
-        &.down {
-          color: text-primary();
-
-          &::before {
-            border-top: 8px solid text-primary();
-          }
-        }
-      }
-    }
+  nb-icon.up {
+    color: nb-theme(color-success-default);
   }
 
-  @include media-breakpoint-down(xxl) {
-    .stats-block {
-      border: none;
-      padding: 0 1rem;
-    }
-  }
-  @include media-breakpoint-between(md, xl) {
-    .consumption-table {
-      display: none;
-    }
-  }
-  @include media-breakpoint-down(md) {
-    .chart-header {
-      padding: 1rem;
-    }
-    .dropdown {
-      min-width: 100px;
-      button {
-        padding-left: 0.75rem;
-        padding-right: 0.75rem;
-      }
-    }
+  .results {
+    margin-left: auto;
   }
-  @include media-breakpoint-down(sm) {
-    .consumption-table {
-      display: none;
-    }
-  }
-  @include media-breakpoint-down(xs) {
-    .stats-block {
-      padding: 0;
-      &:first-child {
-        padding: 0 0.5rem;
-      }
 
-      .subtitle {
-        font-size: 1rem;
-      }
-      .value {
-        font-size: 1.5rem;
-      }
-      .unit {
-        display: none;
-      }
+  @include media-breakpoint-down(xl) {
+    .table-card {
+      display: none;
     }
   }
 }
diff --git a/src/app/pages/dashboard/kitten/kitten.component.html b/src/app/pages/dashboard/kitten/kitten.component.html
index 8a1d3be930..774f14ed38 100644
--- a/src/app/pages/dashboard/kitten/kitten.component.html
+++ b/src/app/pages/dashboard/kitten/kitten.component.html
@@ -1,30 +1,25 @@
 <nb-card size="medium">
-  <nb-card-body>
-    <div class="picture" style.background-image="url('assets/images/kitten-{{currentTheme}}.png')"></div>
+  <div class="picture" style.background-image="url('assets/images/kitten-{{currentTheme}}.png')"></div>
 
-    <div class="details">
-      <div class="title">
-        React Native UI Kitten
-      </div>
-      <div class="description">
-        React Native UI Kitten is a framework that contains a set of commonly used UI components styled in a similar way. The most awesome thing: you can change themes on the fly by just passing a different set of variables. 100% native. Give our kitten a try!
-      </div>
+  <div class="details">
+    <div class="h4">UI Kitten</div>
+    <div class="description">
+      UI Kitten is a framework that contains a set of commonly used UI components styled in a similar way. The most awesome thing: you can change themes on the fly by just passing a different set of variables. 100% native. Give our kitten a try!
     </div>
-  </nb-card-body>
-
+  </div>
 
   <nb-card-footer>
     <a href="https://akveo.github.io/react-native-ui-kitten" target="_blank">
-      <i class="ion-ios-world"></i>
+      <nb-icon icon="globe" pack="eva"></nb-icon>
     </a>
     <a href="https://itunes.apple.com/us/app/kitten-tricks/id1246143230" target="_blank">
-      <i class="ion-social-apple"></i>
+      <i class="link-icon ion-social-apple"></i>
     </a>
     <a href="https://play.google.com/store/apps/details?id=com.akveo.kittenTricks" target="_blank">
-      <i class="ion-social-android"></i>
+      <i class="link-icon ion-social-android"></i>
     </a>
     <a href="https://github.com/akveo/react-native-ui-kitten" target="_blank">
-      <i class="ion-social-github"></i>
+      <nb-icon icon="github" pack="eva"></nb-icon>
     </a>
   </nb-card-footer>
 </nb-card>
diff --git a/src/app/pages/dashboard/kitten/kitten.component.scss b/src/app/pages/dashboard/kitten/kitten.component.scss
index 43c177c719..5aa678813f 100644
--- a/src/app/pages/dashboard/kitten/kitten.component.scss
+++ b/src/app/pages/dashboard/kitten/kitten.component.scss
@@ -2,12 +2,6 @@
 
 @include nb-install-component() {
 
-  nb-card-body {
-    display: flex;
-    flex-direction: column;
-    padding: 0;
-  }
-
   .picture {
     background-position: center;
     background-size: cover;
@@ -18,48 +12,28 @@
   }
 
   .details {
-    padding: 1.25rem 1.25rem 0;
-
-    .title {
-      font-family: nb-theme(font-secondary);
-      font-weight: nb-theme(font-weight-bold);
-      color: nb-theme(color-fg-heading);
-      font-size: 1.5rem;
-      margin-bottom: 1rem;
-
-      @include nb-for-theme(cosmic) {
-        font-weight: nb-theme(font-weight-bolder);
-      }
-    }
-
-    .description {
-      text-align: justify;
-      color: nb-theme(color-fg-text);
-      font-weight: nb-theme(font-weight-light);
+    padding: nb-theme(card-padding);
+  }
 
-      overflow: hidden;
-      text-overflow: ellipsis;
-      max-height: calc(1rem * 8 * #{nb-theme(line-height)});
-    }
+  .description {
+    text-align: justify;
   }
 
   nb-card-footer {
     display: flex;
     justify-content: space-around;
-    padding: 0.75rem 0;
-    border: none;
+    align-items: center;
+  }
 
-    a {
-      text-decoration: none;
-      color: nb-theme(color-fg);
+  .link-icon {
+    font-size: 1.75rem;
+  }
 
-      &:hover {
-        color: nb-theme(color-fg-heading);
-      }
+  nb-icon {
+    font-size: 1.55rem;
 
-      i {
-        font-size: 1.75rem;
-      }
+    ::ng-deep svg {
+      vertical-align: top;
     }
   }
 }
diff --git a/src/app/pages/dashboard/rooms/player/player.component.html b/src/app/pages/dashboard/rooms/player/player.component.html
index 020f015181..75323a8ad8 100644
--- a/src/app/pages/dashboard/rooms/player/player.component.html
+++ b/src/app/pages/dashboard/rooms/player/player.component.html
@@ -1,46 +1,59 @@
-<div class="header">My Playlist</div>
-
-<div class="body">
-
-  <div class="track-info">
-    <div class="cover" style.background-image="url('{{track.cover}}')"></div>
-    <div class="details">
-      <h4>{{ track.name }}</h4>
-      <span>{{ track.artist }}</span>
+<nb-card>
+  <nb-card-header class="header">My Playlist</nb-card-header>
+
+  <nb-card-body class="body">
+    <div class="track-info">
+      <div class="cover" style.background-image="url('{{track.cover}}')"></div>
+      <div class="details">
+        <h4 [class.subtitle]="collapsed">{{ track.name }}</h4>
+        <span>{{ track.artist }}</span>
+      </div>
     </div>
-  </div>
-
-  <div class="progress-wrap">
-    <input dir="ltr" type="range" class="progress" [value]="getProgress()" min="0" max="100" step="0.01"
-           (input)="setProgress(duration.value)" #duration>
-    <div class="progress-foreground" [style.width.%]="getProgress()"></div>
-  </div>
-
-  <div class="timing">
-    <small class="current">{{ player.currentTime | timing }}</small>
-    <small class="remaining">- {{ player.duration - player.currentTime | timing }}</small>
-  </div>
-
-  <div class="controls">
-    <i class="nb-shuffle shuffle" [class.active]="shuffle" (click)="toggleShuffle()"></i>
-    <i class="nb-skip-backward prev" (click)="prev()"></i>
-    <i class="play" [class.nb-play]="player.paused" [class.nb-pause]="!player.paused" (click)="playPause()"></i>
-    <i class="nb-skip-forward next" (click)="next()"></i>
-    <i class="nb-loop loop" [class.active]="player.loop" (click)="toggleLoop()"></i>
-  </div>
-
-</div>
 
-<div class="footer">
-
-  <div class="volume">
-    <i class="nb-volume-mute"></i>
     <div class="progress-wrap">
-      <input type="range" class="progress" [value]="getVolume()" max="100"
-             (input)="setVolume(volume.value)" #volume>
-      <div class="progress-foreground" [style.width.%]="getVolume()"></div>
+      <input dir="ltr" type="range" class="progress" [value]="getProgress()" min="0" max="100" step="0.01"
+             (input)="setProgress(duration.value)" #duration>
+      <div class="progress-foreground" [style.width.%]="getProgress()"></div>
+    </div>
+
+    <div class="timing">
+      <small class="current">{{ player.currentTime | timing }}</small>
+      <small class="remaining">- {{ player.duration - player.currentTime | timing }}</small>
     </div>
-    <i class="nb-volume-high"></i>
-  </div>
 
-</div>
+    <div class="controls">
+      <button class="control-button" nbButton ghost size="tiny" (click)="toggleShuffle()" [class.on]="shuffle">
+        <nb-icon icon="shuffle-2-outline" pack="eva"></nb-icon>
+      </button>
+      <button class="control-button" nbButton ghost size="medium" (click)="prev()">
+        <nb-icon class="skip" icon="skip-back-outline" pack="eva"></nb-icon>
+      </button>
+      <button class="control-button play-button" nbButton ghost size="medium" (click)="playPause()">
+        <nb-icon class="play" [icon]="player.paused ? 'play-circle-outline' : 'pause-circle-outline'" pack="eva">
+        </nb-icon>
+      </button>
+      <button class="control-button skip-forward-button" nbButton ghost size="medium" (click)="next()">
+        <nb-icon class="skip" icon="skip-forward-outline" pack="eva"></nb-icon>
+      </button>
+      <button class="control-button" nbButton ghost size="tiny" (click)="toggleLoop()" [class.on]="player.loop">
+        <nb-icon icon="repeat-outline" pack="eva"></nb-icon>
+      </button>
+    </div>
+  </nb-card-body>
+
+  <nb-card-footer class="footer">
+    <div class="volume">
+      <button nbButton ghost size="small" (click)="setVolume(0)">
+        <nb-icon class="volume-icon" icon="volume-down-outline" pack="eva"></nb-icon>
+      </button>
+      <div class="progress-wrap">
+        <input type="range" class="progress" [value]="getVolume()" max="100"
+               (input)="setVolume(volume.value)" #volume>
+        <div class="progress-foreground" [style.width.%]="getVolume()"></div>
+      </div>
+      <button nbButton ghost size="small" (click)="setVolume(100)">
+        <nb-icon class="volume-icon" icon="volume-up-outline" pack="eva"></nb-icon>
+      </button>
+    </div>
+  </nb-card-footer>
+</nb-card>
diff --git a/src/app/pages/dashboard/rooms/player/player.component.scss b/src/app/pages/dashboard/rooms/player/player.component.scss
index a28cd1a47e..d708330447 100644
--- a/src/app/pages/dashboard/rooms/player/player.component.scss
+++ b/src/app/pages/dashboard/rooms/player/player.component.scss
@@ -1,28 +1,28 @@
 @import '../../../../@theme/styles/themes';
 @import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/components/card/card.component.theme';
 @import '~@nebular/theme/styles/global/breakpoints';
-@import '~@nebular/theme/styles/core/mixins';
 
 @include nb-install-component() {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
   height: 100%;
 
-  .header {
-    @include nb-card-header();
+  nb-card {
+    box-shadow: none;
+    border-width: 0;
+    margin: 0;
+    height: 100%;
+  }
+
+  .subtitle {
+    font-family: nb-theme(text-subtitle-font-family);
+    font-size: nb-theme(text-subtitle-font-size);
+    font-weight: nb-theme(text-subtitle-font-weight);
+    line-height: nb-theme(text-subtitle-line-height);
   }
 
   .body {
     display: flex;
     flex-direction: column;
-    flex: 1;
-  }
-
-  .footer {
-    padding: nb-theme(card-padding);
-    border-top: 1px solid nb-theme(separator);
+    padding: 0;
   }
 
   .track-info {
@@ -32,83 +32,63 @@
     flex-direction: column;
     flex: 1;
     padding: nb-theme(card-padding);
+  }
 
-    .cover {
-      border-radius: nb-theme(radius) / 2;
-      background-size: cover;
-      background-position: center;
-      background-repeat: no-repeat;
-      width: 10rem;
-      height: 10rem;
-    }
+  .cover {
+    border-radius: nb-theme(card-border-radius);
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+    width: 10rem;
+    height: 10rem;
+  }
 
-    .details {
-      text-align: center;
-      padding-top: 1.5rem;
+  .details {
+    text-align: center;
+    padding-top: 1.5rem;
 
-      span {
-        color: nb-theme(color-fg);
-      }
+    span {
+      color: nb-theme(text-hint-color);
     }
   }
 
   .progress-wrap {
     position: relative;
     height: 1rem;
+  }
 
-    .progress-foreground {
-      background-color: nb-theme(color-success);
-      height: 2px;
-      position: absolute;
-      left: 0;
-      margin-top: calc(0.75rem - 1px);
-      width: 100px;
-
-      @include nb-for-theme(cosmic) {
-        background-color: nb-theme(link-color);
-      }
+  .progress-foreground {
+    background-color: nb-theme(color-primary-default);
+    height: 2px;
+    position: absolute;
+    left: 0;
+    margin-top: calc(0.75rem - 1px);
+    width: 100px;
+  }
 
-      @include nb-for-theme(corporate) {
-        background-color: nb-theme(color-primary);
-      }
+  .progress {
+    appearance: none;
+    width: 100%;
+    background: transparent;
+    height: 1.5rem;
+    outline: none;
+    position: absolute;
+
+    @include install-thumb() {
+      width: 1rem;
+      height: 1rem;
+      border-radius: 50%;
+      background: nb-theme(color-primary-default);
+      cursor: pointer;
+      margin-top: calc(-0.5rem + 1px);
+      border: none;
     }
 
-    .progress {
-      -webkit-appearance: none;
+    @include install-track() {
       width: 100%;
-      background: transparent;
-      height: 1.5rem;
-      outline: none;
-      position: absolute;
-
-      @include install-thumb() {
-        width: 1rem;
-        height: 1rem;
-        border-radius: 50%;
-        background: nb-theme(color-success);
-        cursor: pointer;
-        margin-top: calc(-0.5rem + 1px);
-        border: none;
-      }
-
-      @include install-track() {
-        width: 100%;
-        height: 2px;
-        cursor: pointer;
-        background: nb-theme(separator);
-      }
-
-      @include nb-for-theme(cosmic) {
-        @include install-thumb() {
-          background: nb-theme(link-color);
-        }
-      }
-
-      @include nb-for-theme(corporate) {
-        @include install-thumb() {
-          background: nb-theme(color-primary);
-        }
-      }
+      height: 2px;
+      cursor: pointer;
+      background: nb-theme(border-basic-color-3);
     }
   }
 
@@ -117,7 +97,7 @@
     margin: 0 0.5rem;
     display: flex;
     justify-content: space-between;
-    color: nb-theme(color-fg);
+    color: nb-theme(text-hint-color);
 
     .current {
       @include nb-ltr(order, 0);
@@ -134,41 +114,21 @@
     justify-content: space-between;
     align-items: center;
     @include nb-rtl(flex-direction, row-reverse);
-    padding: 0.25rem 2rem 1rem;
+    padding: 1rem;
     max-width: 400px;
     width: 100%;
     margin: 0 auto;
+  }
 
-    i {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      cursor: pointer;
-    }
-
-    .shuffle, .loop {
-      font-size: 1.5rem;
-      color: nb-theme(color-fg);
-
-      &.active {
-        color: nb-theme(color-success);
-
-        @include nb-for-theme(cosmic) {
-          color: nb-theme(link-color);
-        }
-      }
-    }
+  .control-button {
+    color: nb-theme(text-hint-color);
 
-    .prev, .next {
-      width: 3.5rem;
-      height: 3.5rem;
-      border: 2px solid nb-theme(separator);
-      border-radius: 50%;
-      font-size: 1.75rem;
+    &.on {
+      color: nb-theme(color-primary-default);
     }
 
-    .play {
-      font-size: 2rem;
+    nb-icon {
+      font-size: 1.5em;
     }
   }
 
@@ -180,12 +140,6 @@
     position: relative;
     max-width: 400px;
 
-    i {
-      font-size: 1.5rem;
-      margin: 0.25rem;
-      color: nb-theme(color-fg);
-    }
-
     .progress-wrap {
       height: 2.25rem;
       margin: 0;
@@ -195,18 +149,20 @@
         left: auto;
         margin-top: calc(1rem + 1px);
         z-index: 0;
+        max-width: 99.5%;
       }
 
       .progress {
         height: 2.25rem;
+        overflow: visible;
 
         @include install-thumb() {
           width: 1.5rem;
           height: 1.5rem;
-          background-color: nb-theme(color-white);
-          box-shadow: 0 0.125rem 0.5rem 0 rgba(nb-theme(color-fg), 0.4);
-          border: solid 1px rgba(nb-theme(color-fg), 0.4);
-          margin-top: calc(-0.875rem + 1px);
+          background-color: nb-theme(background-basic-color-1);
+          box-shadow: 0 0.125rem 0.5rem 0 nb-theme(border-basic-color-3);
+          border: 1px solid nb-theme(border-basic-color-3);
+          margin-top: -0.75rem;
           position: relative;
           z-index: 10;
         }
@@ -214,6 +170,11 @@
     }
   }
 
+  .volume-icon {
+    font-size: 1em;
+    color: nb-theme(text-hint-color);
+  }
+
   &.collapsed {
     $player-height: 4.5rem;
 
@@ -230,6 +191,7 @@
       justify-content: space-between;
       align-items: center;
       padding: 0;
+      overflow: visible;
     }
 
     .footer {
@@ -245,7 +207,6 @@
       .cover {
         height: $player-height;
         width: $player-height;
-        border-radius: 0 0 0 nb-theme(radius);
         flex: none;
       }
 
@@ -279,18 +240,26 @@
       width: inherit;
       margin: 0;
 
-      i {
-        width: inherit;
-        height: inherit;
+      button {
+        display: none;
+      }
+      .play-button,
+      .skip-forward-button {
+        display: block;
+        font-size: 1.3rem;
       }
 
-      .prev, .shuffle, .loop {
-        display: none;
+      @include media-breakpoint-down(is) {
+        .play-button,
+        .skip-forward-button {
+          padding: 0.5rem;
+        }
       }
 
-      .play, .next {
-        font-size: 2rem;
-        border: none;
+      @include media-breakpoint-down(xs) {
+        .skip-forward-button {
+          display: none;
+        }
       }
     }
 
@@ -299,27 +268,23 @@
     }
 
     .track-info .details {
-      @include media-breakpoint-down(sm) {
-        h4 {
-          font-size: 1.25rem;
-        }
-        span {
-          font-size: 0.875rem;
-        }
-      }
-
       @include media-breakpoint-down(is) {
-        h4 {
-          font-size: 1rem;
-        }
         span {
-          font-size: 0.75rem;
           display: inline-block;
           overflow: hidden;
           text-overflow: ellipsis;
-          max-height: calc(0.75rem * #{nb-theme(line-height)});
         }
       }
     }
   }
+
+  @include media-breakpoint-between(lg, lg) {
+    .controls {
+      padding: 0.5rem;
+    }
+
+    .control-button.size-medium {
+      padding: nb-theme(button-ghost-small-padding);
+    }
+  }
 }
diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html
index 8fc0c75a22..1226fa06a6 100644
--- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html
+++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html
@@ -1,86 +1,90 @@
-<div class="header">Room Management</div>
-<div class="room-selector">
-  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-       [attr.viewBox]="viewBox" preserveAspectRatio="xMidYMid">
-    <defs>
+<nb-card>
+  <nb-card-header>Room Management</nb-card-header>
+  <div class="room-selector">
+    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+         [attr.viewBox]="viewBox" preserveAspectRatio="xMidYMid">
+      <defs>
 
-      <filter id="f2" x="-50%" y="-50%" width="200%" height="200%">
-        <feGaussianBlur result="blurOut" in="StrokePaint" stdDeviation="3"/>
-      </filter>
+        <filter id="f2" x="-50%" y="-50%" width="200%" height="200%">
+          <feGaussianBlur result="blurOut" in="StrokePaint" stdDeviation="3"/>
+        </filter>
 
-      <pattern id="New_Pattern_Swatch_1" data-name="New Pattern Swatch 1" width="60" height="60"
-               patternUnits="userSpaceOnUse" viewBox="0 0 60 60">
-        <line class="stroke-pattern" x1="-113.26" y1="123.26" x2="3.26" y2="6.74"/>
-        <line class="stroke-pattern" x1="-103.26" y1="133.26" x2="13.26" y2="16.74"/>
-        <line class="stroke-pattern" x1="-93.26" y1="143.26" x2="23.26" y2="26.74"/>
-        <line class="stroke-pattern" x1="-83.26" y1="153.26" x2="33.26" y2="36.74"/>
-        <line class="stroke-pattern" x1="-73.26" y1="163.26" x2="43.26" y2="46.74"/>
-        <line class="stroke-pattern" x1="-63.26" y1="173.26" x2="53.26" y2="56.74"/>
-        <line class="stroke-pattern" x1="-53.26" y1="123.26" x2="63.26" y2="6.74"/>
-        <line class="stroke-pattern" x1="-43.26" y1="133.26" x2="73.26" y2="16.74"/>
-        <line class="stroke-pattern" x1="-33.26" y1="143.26" x2="83.26" y2="26.74"/>
-        <line class="stroke-pattern" x1="-23.26" y1="153.26" x2="93.26" y2="36.74"/>
-        <line class="stroke-pattern" x1="-13.26" y1="163.26" x2="103.26" y2="46.74"/>
-        <line class="stroke-pattern" x1="-3.26" y1="173.26" x2="113.26" y2="56.74"/>
-        <line class="stroke-pattern" x1="6.74" y1="123.26" x2="123.26" y2="6.74"/>
-        <line class="stroke-pattern" x1="16.74" y1="133.26" x2="133.26" y2="16.74"/>
-        <line class="stroke-pattern" x1="26.74" y1="143.26" x2="143.26" y2="26.74"/>
-        <line class="stroke-pattern" x1="36.74" y1="153.26" x2="153.26" y2="36.74"/>
-        <line class="stroke-pattern" x1="46.74" y1="163.26" x2="163.26" y2="46.74"/>
-        <line class="stroke-pattern" x1="56.74" y1="173.26" x2="173.26" y2="56.74"/>
-        <line class="stroke-pattern" x1="-113.26" y1="63.26" x2="3.26" y2="-53.26"/>
-        <line class="stroke-pattern" x1="-103.26" y1="73.26" x2="13.26" y2="-43.26"/>
-        <line class="stroke-pattern" x1="-93.26" y1="83.26" x2="23.26" y2="-33.26"/>
-        <line class="stroke-pattern" x1="-83.26" y1="93.26" x2="33.26" y2="-23.26"/>
-        <line class="stroke-pattern" x1="-73.26" y1="103.26" x2="43.26" y2="-13.26"/>
-        <line class="stroke-pattern" x1="-63.26" y1="113.26" x2="53.26" y2="-3.26"/>
-        <line class="stroke-pattern" x1="-53.26" y1="63.26" x2="63.26" y2="-53.26"/>
-        <line class="stroke-pattern" x1="-43.26" y1="73.26" x2="73.26" y2="-43.26"/>
-        <line class="stroke-pattern" x1="-33.26" y1="83.26" x2="83.26" y2="-33.26"/>
-        <line class="stroke-pattern" x1="-23.26" y1="93.26" x2="93.26" y2="-23.26"/>
-        <line class="stroke-pattern" x1="-13.26" y1="103.26" x2="103.26" y2="-13.26"/>
-        <line class="stroke-pattern" x1="-3.26" y1="113.26" x2="113.26" y2="-3.26"/>
-        <line class="stroke-pattern" x1="6.74" y1="63.26" x2="123.26" y2="-53.26"/>
-        <line class="stroke-pattern" x1="16.74" y1="73.26" x2="133.26" y2="-43.26"/>
-        <line class="stroke-pattern" x1="26.74" y1="83.26" x2="143.26" y2="-33.26"/>
-        <line class="stroke-pattern" x1="36.74" y1="93.26" x2="153.26" y2="-23.26"/>
-        <line class="stroke-pattern" x1="46.74" y1="103.26" x2="163.26" y2="-13.26"/>
-        <line class="stroke-pattern" x1="56.74" y1="113.26" x2="173.26" y2="-3.26"/>
-        <line class="stroke-pattern" x1="-113.26" y1="3.26" x2="3.26" y2="-113.26"/>
-        <line class="stroke-pattern" x1="-103.26" y1="13.26" x2="13.26" y2="-103.26"/>
-        <line class="stroke-pattern" x1="-93.26" y1="23.26" x2="23.26" y2="-93.26"/>
-        <line class="stroke-pattern" x1="-83.26" y1="33.26" x2="33.26" y2="-83.26"/>
-        <line class="stroke-pattern" x1="-73.26" y1="43.26" x2="43.26" y2="-73.26"/>
-        <line class="stroke-pattern" x1="-63.26" y1="53.26" x2="53.26" y2="-63.26"/>
-        <line class="stroke-pattern" x1="-53.26" y1="3.26" x2="63.26" y2="-113.26"/>
-        <line class="stroke-pattern" x1="-43.26" y1="13.26" x2="73.26" y2="-103.26"/>
-        <line class="stroke-pattern" x1="-33.26" y1="23.26" x2="83.26" y2="-93.26"/>
-        <line class="stroke-pattern" x1="-23.26" y1="33.26" x2="93.26" y2="-83.26"/>
-        <line class="stroke-pattern" x1="-13.26" y1="43.26" x2="103.26" y2="-73.26"/>
-        <line class="stroke-pattern" x1="-3.26" y1="53.26" x2="113.26" y2="-63.26"/>
-        <line class="stroke-pattern" x1="6.74" y1="3.26" x2="123.26" y2="-113.26"/>
-        <line class="stroke-pattern" x1="16.74" y1="13.26" x2="133.26" y2="-103.26"/>
-        <line class="stroke-pattern" x1="26.74" y1="23.26" x2="143.26" y2="-93.26"/>
-        <line class="stroke-pattern" x1="36.74" y1="33.26" x2="153.26" y2="-83.26"/>
-        <line class="stroke-pattern" x1="46.74" y1="43.26" x2="163.26" y2="-73.26"/>
-        <line class="stroke-pattern" x1="56.74" y1="53.26" x2="173.26" y2="-63.26"/>
-      </pattern>
-    </defs>
+        <pattern id="New_Pattern_Swatch_1" data-name="New Pattern Swatch 1" width="60" height="60"
+                 patternUnits="userSpaceOnUse" viewBox="0 0 60 60">
+          <line class="stroke-pattern" x1="-113.26" y1="123.26" x2="3.26" y2="6.74"/>
+          <line class="stroke-pattern" x1="-103.26" y1="133.26" x2="13.26" y2="16.74"/>
+          <line class="stroke-pattern" x1="-93.26" y1="143.26" x2="23.26" y2="26.74"/>
+          <line class="stroke-pattern" x1="-83.26" y1="153.26" x2="33.26" y2="36.74"/>
+          <line class="stroke-pattern" x1="-73.26" y1="163.26" x2="43.26" y2="46.74"/>
+          <line class="stroke-pattern" x1="-63.26" y1="173.26" x2="53.26" y2="56.74"/>
+          <line class="stroke-pattern" x1="-53.26" y1="123.26" x2="63.26" y2="6.74"/>
+          <line class="stroke-pattern" x1="-43.26" y1="133.26" x2="73.26" y2="16.74"/>
+          <line class="stroke-pattern" x1="-33.26" y1="143.26" x2="83.26" y2="26.74"/>
+          <line class="stroke-pattern" x1="-23.26" y1="153.26" x2="93.26" y2="36.74"/>
+          <line class="stroke-pattern" x1="-13.26" y1="163.26" x2="103.26" y2="46.74"/>
+          <line class="stroke-pattern" x1="-3.26" y1="173.26" x2="113.26" y2="56.74"/>
+          <line class="stroke-pattern" x1="6.74" y1="123.26" x2="123.26" y2="6.74"/>
+          <line class="stroke-pattern" x1="16.74" y1="133.26" x2="133.26" y2="16.74"/>
+          <line class="stroke-pattern" x1="26.74" y1="143.26" x2="143.26" y2="26.74"/>
+          <line class="stroke-pattern" x1="36.74" y1="153.26" x2="153.26" y2="36.74"/>
+          <line class="stroke-pattern" x1="46.74" y1="163.26" x2="163.26" y2="46.74"/>
+          <line class="stroke-pattern" x1="56.74" y1="173.26" x2="173.26" y2="56.74"/>
+          <line class="stroke-pattern" x1="-113.26" y1="63.26" x2="3.26" y2="-53.26"/>
+          <line class="stroke-pattern" x1="-103.26" y1="73.26" x2="13.26" y2="-43.26"/>
+          <line class="stroke-pattern" x1="-93.26" y1="83.26" x2="23.26" y2="-33.26"/>
+          <line class="stroke-pattern" x1="-83.26" y1="93.26" x2="33.26" y2="-23.26"/>
+          <line class="stroke-pattern" x1="-73.26" y1="103.26" x2="43.26" y2="-13.26"/>
+          <line class="stroke-pattern" x1="-63.26" y1="113.26" x2="53.26" y2="-3.26"/>
+          <line class="stroke-pattern" x1="-53.26" y1="63.26" x2="63.26" y2="-53.26"/>
+          <line class="stroke-pattern" x1="-43.26" y1="73.26" x2="73.26" y2="-43.26"/>
+          <line class="stroke-pattern" x1="-33.26" y1="83.26" x2="83.26" y2="-33.26"/>
+          <line class="stroke-pattern" x1="-23.26" y1="93.26" x2="93.26" y2="-23.26"/>
+          <line class="stroke-pattern" x1="-13.26" y1="103.26" x2="103.26" y2="-13.26"/>
+          <line class="stroke-pattern" x1="-3.26" y1="113.26" x2="113.26" y2="-3.26"/>
+          <line class="stroke-pattern" x1="6.74" y1="63.26" x2="123.26" y2="-53.26"/>
+          <line class="stroke-pattern" x1="16.74" y1="73.26" x2="133.26" y2="-43.26"/>
+          <line class="stroke-pattern" x1="26.74" y1="83.26" x2="143.26" y2="-33.26"/>
+          <line class="stroke-pattern" x1="36.74" y1="93.26" x2="153.26" y2="-23.26"/>
+          <line class="stroke-pattern" x1="46.74" y1="103.26" x2="163.26" y2="-13.26"/>
+          <line class="stroke-pattern" x1="56.74" y1="113.26" x2="173.26" y2="-3.26"/>
+          <line class="stroke-pattern" x1="-113.26" y1="3.26" x2="3.26" y2="-113.26"/>
+          <line class="stroke-pattern" x1="-103.26" y1="13.26" x2="13.26" y2="-103.26"/>
+          <line class="stroke-pattern" x1="-93.26" y1="23.26" x2="23.26" y2="-93.26"/>
+          <line class="stroke-pattern" x1="-83.26" y1="33.26" x2="33.26" y2="-83.26"/>
+          <line class="stroke-pattern" x1="-73.26" y1="43.26" x2="43.26" y2="-73.26"/>
+          <line class="stroke-pattern" x1="-63.26" y1="53.26" x2="53.26" y2="-63.26"/>
+          <line class="stroke-pattern" x1="-53.26" y1="3.26" x2="63.26" y2="-113.26"/>
+          <line class="stroke-pattern" x1="-43.26" y1="13.26" x2="73.26" y2="-103.26"/>
+          <line class="stroke-pattern" x1="-33.26" y1="23.26" x2="83.26" y2="-93.26"/>
+          <line class="stroke-pattern" x1="-23.26" y1="33.26" x2="93.26" y2="-83.26"/>
+          <line class="stroke-pattern" x1="-13.26" y1="43.26" x2="103.26" y2="-73.26"/>
+          <line class="stroke-pattern" x1="-3.26" y1="53.26" x2="113.26" y2="-63.26"/>
+          <line class="stroke-pattern" x1="6.74" y1="3.26" x2="123.26" y2="-113.26"/>
+          <line class="stroke-pattern" x1="16.74" y1="13.26" x2="133.26" y2="-103.26"/>
+          <line class="stroke-pattern" x1="26.74" y1="23.26" x2="143.26" y2="-93.26"/>
+          <line class="stroke-pattern" x1="36.74" y1="33.26" x2="153.26" y2="-83.26"/>
+          <line class="stroke-pattern" x1="46.74" y1="43.26" x2="163.26" y2="-73.26"/>
+          <line class="stroke-pattern" x1="56.74" y1="53.26" x2="173.26" y2="-63.26"/>
+        </pattern>
+      </defs>
 
-    <g>
-      <path class="room-border" [attr.d]="border.d" *ngFor="let border of roomSvg.borders" />
-    </g>
+      <g>
+        <path class="room-border" [attr.d]="border.d" *ngFor="let border of roomSvg.borders" />
+      </g>
 
-    <g>
-      <path class="stroked-element" [attr.d]="strokedArea.d" *ngFor="let strokedArea of roomSvg.stokedAreas"/>
-    </g>
+      <g>
+        <path class="stroked-element"
+              [attr.fill]="getUrlPath('#New_Pattern_Swatch_1')"
+              [attr.d]="strokedArea.d" *ngFor="let strokedArea of roomSvg.stokedAreas"/>
+      </g>
 
-    <g [attr.id]="room.id" [class.selected-room]="selectedRoom == room.id" *ngFor="let room of sortedRooms">
-      <path class="room-bg" (click)="selectRoom(room.id)" [attr.d]="room.area.d" [style.filter]="isIE || isFirefox ? 'inherit': ''" />
-      <path class="room-border" [attr.d]="room.border.d" />
-      <path class="room-border room-border-glow" [attr.d]="room.border.d" [style.filter]="isIE || isFirefox ? 'inherit': ''" />
-      <text class="room-text" (click)="selectRoom(room.id)" text-anchor="middle"
-            [attr.x]="room.name.x" [attr.y]="room.name.y">{{room.name.text}}</text>
-    </g>
-  </svg>
-</div>
+      <g [attr.id]="room.id" [class.selected-room]="selectedRoom == room.id" *ngFor="let room of sortedRooms">
+        <path class="room-bg" (click)="selectRoom(room.id)" [attr.d]="room.area.d" [style.filter]="isIE || isFirefox ? 'inherit': ''" />
+        <path class="room-border" [attr.d]="room.border.d" />
+        <path class="room-border room-border-glow" [attr.d]="room.border.d" [style.filter]="isIE || isFirefox ? 'inherit': ''" />
+        <text class="room-text" (click)="selectRoom(room.id)" text-anchor="middle"
+              [attr.x]="room.name.x" [attr.y]="room.name.y">{{room.name.text}}</text>
+      </g>
+    </svg>
+  </div>
+</nb-card>
diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss
index 7828b153f8..d66ebb204e 100644
--- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss
+++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss
@@ -1,8 +1,18 @@
 @import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/components/card/card.component.theme';
 
 @include nb-install-component() {
 
+  nb-card {
+    background-color: transparent;
+    border-width: 0;
+    box-shadow: none;
+    margin: 0;
+  }
+
+  nb-card-header {
+    border-color: transparent;
+  }
+
   svg {
     width: 100%;
   }
@@ -19,7 +29,6 @@
     stroke-width: 4px;
     stroke: #bdc4cd;
     stroke-miterlimit: 10;
-    fill: url('#New_Pattern_Swatch_1');
   }
 
   .room-border {
@@ -30,7 +39,7 @@
   }
 
   .room-bg {
-    fill: nb-theme(card-bg);
+    fill: nb-theme(card-background-color);
     stroke: transparent;
     cursor: pointer;
     stroke-width: 4px;
@@ -46,58 +55,22 @@
     cursor: pointer;
     user-select: none;
     pointer-events: none;
-    fill: nb-theme(color-fg);
+    fill: nb-theme(text-hint-color);
   }
 
   .selected-room {
     z-index: 40;
 
     .room-text {
-      fill: nb-theme(color-fg-heading);
-      font-weight: nb-theme(font-weight-bolder);
+      fill: nb-theme(text-basic-color);
     }
     .room-border {
-      stroke: nb-theme(color-success);
+      stroke: nb-theme(color-primary-default);
     }
   }
 
   .header {
-    @include nb-card-header();
     border-bottom: none;
     padding-bottom: 0;
   }
-
-  @include nb-for-theme(cosmic) {
-    .stroke-pattern, .stroked-element, .room-border {
-      stroke: #a1a1e5;
-    }
-
-    .room-text {
-      fill: nb-theme(color-fg-heading);
-    }
-
-    .selected-room {
-      .room-text {
-        font-weight: nb-theme(font-weight-normal);
-      }
-      .room-bg {
-        fill: rgba(0, 255, 170, 0.2);
-        filter: url('#f2');
-      }
-      .room-border {
-        stroke: #00f9a6;
-      }
-      .room-border-glow {
-        filter: url('#f2');
-      }
-    }
-  }
-
-  @include nb-for-theme(corporate) {
-    .selected-room {
-      .room-border {
-        stroke: nb-theme(color-primary);
-      }
-    }
-  }
 }
diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts
index 629dbe6e14..0fee56fc12 100644
--- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts
+++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts
@@ -1,14 +1,22 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import { Component, EventEmitter, HostBinding, OnDestroy, OnInit, Output } from '@angular/core';
+import { Location, LocationStrategy } from '@angular/common';
+import { NbThemeService } from '@nebular/theme';
+import { map, takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 
 @Component({
   selector: 'ngx-room-selector',
   templateUrl: './room-selector.component.html',
   styleUrls: ['./room-selector.component.scss'],
 })
-export class RoomSelectorComponent {
+export class RoomSelectorComponent implements OnInit, OnDestroy {
+
+  private destroy$ = new Subject<void>();
+  private hideGrid: boolean;
+
   @Output() select: EventEmitter<number> = new EventEmitter();
 
-  selectedRoom: null;
+  selectedRoom = null;
   sortedRooms = [];
   viewBox = '-20 -20 618.88 407.99';
   isIE = !!(navigator.userAgent.match(/Trident/)
@@ -58,10 +66,35 @@ export class RoomSelectorComponent {
     ],
   };
 
-  constructor() {
+  @HostBinding('style.background')
+  get background(): 'none' | null {
+    return this.hideGrid ? 'none' : null;
+  }
+
+  constructor(
+    private location: Location,
+    private locationStrategy: LocationStrategy,
+    private themeService: NbThemeService,
+  ) {
     this.selectRoom('2');
   }
 
+  ngOnInit() {
+    this.hideGrid = this.themeService.currentTheme === 'corporate';
+
+    this.themeService.onThemeChange()
+      .pipe(
+        map(({ name }) => name === 'corporate'),
+        takeUntil(this.destroy$),
+      )
+      .subscribe((hideGrid: boolean) => this.hideGrid = hideGrid);
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
   private sortRooms() {
     this.sortedRooms = this.roomSvg.rooms.slice(0).sort((a, b) => {
       if (a.id === this.selectedRoom) {
@@ -79,4 +112,14 @@ export class RoomSelectorComponent {
     this.selectedRoom = roomNumber;
     this.sortRooms();
   }
+
+  getUrlPath(id: string) {
+    let baseHref = this.locationStrategy.getBaseHref();
+    if (baseHref.endsWith('')) {
+      baseHref = baseHref.slice(0, -1);
+    }
+    const path = this.location.path();
+
+    return `url(${baseHref}${path}${id})`;
+  }
 }
diff --git a/src/app/pages/dashboard/rooms/rooms.component.scss b/src/app/pages/dashboard/rooms/rooms.component.scss
index 6a3ebc1c66..10869126e8 100644
--- a/src/app/pages/dashboard/rooms/rooms.component.scss
+++ b/src/app/pages/dashboard/rooms/rooms.component.scss
@@ -5,18 +5,13 @@
 @include nb-install-component() {
   ngx-room-selector {
     width: 70%;
-    border-right: 2px solid nb-theme(separator);
+    border-right: nb-theme(divider-width) nb-theme(divider-style) nb-theme(divider-color);
     background: url('../../../../assets/images/square_pattern.svg') repeat;
     background-size: 75px;
 
-    @include nb-for-theme(cosmic) {
+    &.dark-background {
       background-image: url('../../../../assets/images/square_pattern_cosmic.svg');
     }
-
-    @include nb-for-theme(corporate) {
-      background: none;
-      border-right-color: nb-theme(tabs-separator);
-    }
   }
 
   ngx-player {
@@ -33,7 +28,7 @@
     flex-direction: column;
     flex: 1;
 
-    /deep/ .room-selector {
+    ::ng-deep .room-selector {
       display: flex;
       align-items: center;
       justify-items: center;
@@ -62,15 +57,10 @@
       .collapse {
         display: inline-block;
         position: absolute;
-        top: 0.5rem;
+        top: 0.7rem;
         left: 50%;
         transform: translateX(-50%);
-        font-size: 3rem;
-        color: nb-theme(color-fg);
-
-        &:focus {
-          outline: none;
-        }
+        font-size: 2rem;
       }
     }
   }
diff --git a/src/app/pages/dashboard/rooms/rooms.component.ts b/src/app/pages/dashboard/rooms/rooms.component.ts
index 0b15156044..8235f4d5bf 100644
--- a/src/app/pages/dashboard/rooms/rooms.component.ts
+++ b/src/app/pages/dashboard/rooms/rooms.component.ts
@@ -1,13 +1,18 @@
 import { Component, HostBinding, OnDestroy } from '@angular/core';
 import { NbThemeService, NbMediaBreakpoint, NbMediaBreakpointsService } from '@nebular/theme';
+import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'ngx-rooms',
   styleUrls: ['./rooms.component.scss'],
   template: `
-    <nb-card [size]="breakpoint.width >= breakpoints.sm ? 'large' : 'medium'">
-      <i (click)="collapse()" class="nb-arrow-down collapse" [hidden]="isCollapsed()"></i>
-      <ngx-room-selector (select)="select($event)"></ngx-room-selector>
+    <nb-card [size]="breakpoint.width >= breakpoints.sm ? 'giant' : ''">
+      <nb-icon icon="arrow-ios-downward" pack="eva"
+               (click)="collapse()"
+               class="collapse"
+               [hidden]="isCollapsed()">
+      </nb-icon>
+      <ngx-room-selector [class.dark-background]="isDarkTheme" (select)="select($event)"></ngx-room-selector>
       <ngx-player [collapsed]="isCollapsed() && breakpoint.width <= breakpoints.md"></ngx-player>
     </nb-card>
   `,
@@ -18,18 +23,25 @@ export class RoomsComponent implements OnDestroy {
   private expanded: boolean;
   private selected: number;
 
+  isDarkTheme: boolean;
+
   breakpoint: NbMediaBreakpoint;
   breakpoints: any;
   themeSubscription: any;
+  themeChangeSubscription: any;
 
   constructor(private themeService: NbThemeService,
               private breakpointService: NbMediaBreakpointsService) {
 
     this.breakpoints = this.breakpointService.getBreakpointsMap();
     this.themeSubscription = this.themeService.onMediaQueryChange()
-      .subscribe(([oldValue, newValue]) => {
+      .subscribe(([, newValue]) => {
         this.breakpoint = newValue;
       });
+
+    this.themeChangeSubscription = this.themeService.onThemeChange()
+      .pipe(map(({ name }) => name === 'cosmic' || name === 'dark'))
+      .subscribe((isDark: boolean) => this.isDarkTheme = isDark);
   }
 
   select(roomNumber) {
@@ -60,5 +72,6 @@ export class RoomsComponent implements OnDestroy {
 
   ngOnDestroy() {
     this.themeSubscription.unsubscribe();
+    this.themeChangeSubscription.unsubscribe();
   }
 }
diff --git a/src/app/pages/dashboard/security-cameras/security-cameras.component.html b/src/app/pages/dashboard/security-cameras/security-cameras.component.html
index 54863311fe..739acc0555 100644
--- a/src/app/pages/dashboard/security-cameras/security-cameras.component.html
+++ b/src/app/pages/dashboard/security-cameras/security-cameras.component.html
@@ -1,43 +1,60 @@
-<nb-card size="xlarge">
+<nb-card size="giant">
+
   <nb-card-header>
-    <div class="cameras-card-header">
-      <span class="cameras-card-title">Security Cameras</span>
-      <span class="cameras-filter">
-        <a [class.active]="isSingleView" (click)="isSingleView = true">
-          <i class="nb-square"></i>
-        </a>
-        <a [class.active]="!isSingleView" (click)="isSingleView = false">
-          <i class="nb-grid-a"></i>
-        </a>
-      </span>
-    </div>
+    Security Cameras
+
+    <button class="single-view-button"
+            nbButton
+            size="small"
+            [appearance]="isSingleView ? 'filled' : 'outline'"
+            (click)="isSingleView = true">
+      <i class="nb-square"></i>
+    </button>
+    <button class="grid-view-button"
+            nbButton
+            size="small"
+            [appearance]="isSingleView ? 'outline' : 'filled'"
+            (click)="isSingleView = false">
+      <nb-icon icon="grid" pack="eva"></nb-icon>
+    </button>
   </nb-card-header>
-  <nb-card-body>
-    <div class="cameras single-view" *ngIf="isSingleView">
+
+  <div class="grid-container">
+
+    <div class="single-view" *ngIf="isSingleView">
       <div class="camera" [style.background-image]="'url(' + selectedCamera.source + ')'">
-        <span>{{ selectedCamera.title }}</span>
+        <span class="camera-name">{{ selectedCamera.title }}</span>
       </div>
     </div>
-    <div class="cameras" *ngIf="!isSingleView">
-      <div class="camera col-sm-6" *ngFor="let camera of cameras" [style.background-image]="'url(' + camera.source + ')'"
+
+    <div class="grid-view" *ngIf="!isSingleView">
+      <div class="camera"
+           *ngFor="let camera of cameras"
+           [style.background-image]="'url(' + camera.source + ')'"
            (click)="selectCamera(camera)">
-        <span>{{ camera.title }}</span>
+        <span class="camera-name">{{ camera.title }}</span>
       </div>
     </div>
-  </nb-card-body>
+
+  </div>
+
   <nb-card-footer>
-    <nb-actions size="medium" fullWidth>
+    <nb-actions [size]="actionSize" fullWidth>
       <nb-action>
-        <i class="nb-pause-outline"></i><span>Pause</span>
+        <nb-icon icon="pause-circle-outline" pack="eva"></nb-icon>
+        Pause
       </nb-action>
       <nb-action>
-        <i class="nb-list"></i><span>Logs</span>
+        <nb-icon icon="list-outline" pack="eva"></nb-icon>
+        Logs
       </nb-action>
       <nb-action>
-        <i class="nb-search"></i><span>Search</span>
+        <nb-icon icon="search-outline" pack="eva"></nb-icon>
+        Search
       </nb-action>
       <nb-action>
-        <i class="nb-gear"></i><span>Setup</span>
+        <nb-icon icon="settings-2-outline" pack="eva"></nb-icon>
+        Setup
       </nb-action>
     </nb-actions>
   </nb-card-footer>
diff --git a/src/app/pages/dashboard/security-cameras/security-cameras.component.scss b/src/app/pages/dashboard/security-cameras/security-cameras.component.scss
index a0da3cf47f..567b323abb 100644
--- a/src/app/pages/dashboard/security-cameras/security-cameras.component.scss
+++ b/src/app/pages/dashboard/security-cameras/security-cameras.component.scss
@@ -3,96 +3,74 @@
 @import '~bootstrap/scss/mixins/breakpoints';
 
 @include nb-install-component() {
-  nb-card-header {
-    padding: 0;
-    border: none;
-  }
 
-  nb-card-body {
-    padding: 0;
-    position: relative;
-  }
-
-  nb-card-footer {
-    padding: 1rem 0;
-    border: none;
+  nb-card-header {
+    display: flex;
+    align-items: center;
+    padding-top: 0.625rem;
+    padding-bottom: 0.625rem;
   }
 
-  .cameras-card-header {
-    display: flex;
+  .single-view-button {
+    .nb-square {
+      font-size: 1.25rem;
+    }
 
-    .cameras-card-title {
-      flex: 1;
-      padding: 1.25rem;
+    @include nb-ltr {
+      margin-left: auto;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+    @include nb-rtl {
+      margin-right: auto;
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
     }
   }
 
-  .cameras-filter {
-    display: flex;
-
-    a {
-      font-size: 2.5rem;
-      padding: 0 0.75rem;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      color: nb-theme(color-fg);
+  .grid-view-button {
+    ::ng-deep svg {
+      vertical-align: top;
     }
 
-    a:first-child {
-      @include nb-ltr(border-left, 1px solid nb-theme(separator));
-      @include nb-rtl(border-right, 1px solid nb-theme(separator));
+    @include nb-ltr {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
     }
-
-    a:last-child {
-      @include nb-ltr(border-top-right-radius, nb-theme(card-border-radius));
-      @include nb-rtl(border-top-left-radius, nb-theme(card-border-radius));
+    @include nb-rtl {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
     }
+  }
 
-    a.active {
-      background-color: nb-theme(color-bg-active);
-      color: nb-theme(color-fg-heading);
-      border: none;
-    }
+  .grid-container {
+    height: 100%;
+    display: flex;
   }
 
-  .cameras {
-    position: absolute;
+  .single-view,
+  .grid-view {
+    flex: 1 0 100%;
+  }
+
+  .grid-view {
     display: flex;
     flex-wrap: wrap;
-    width: 100%;
-    height: 100%;
-  }
 
-  .cameras.single-view {
     .camera {
-      height: 100%;
-      width: 100%;
-
-      &::before {
-        height: 100%;
-      }
+      flex: 1 0 50%;
     }
   }
 
+  .single-view .camera {
+    width: 100%;
+    height: 100%;
+  }
+
   .camera {
-    position: relative;
     background-position: center;
     background-size: cover;
-    height: 50%;
-    padding: 0;
-
-    span {
-      position: absolute;
-      bottom: 0;
-      width: 100%;
-      color: white;
-      background: rgba(0, 0, 0, 0.4);
-      font-family: nb-theme(font-secondary);
-      font-weight: nb-theme(font-weight-bolder);
-      font-size: 1.25rem;
-      padding: 0.5rem 1rem;
-    }
+    position: relative;
 
     &::before {
       background-color: rgba(255, 255, 255, 0.1);
@@ -108,69 +86,29 @@
     }
   }
 
-  nb-action {
-    padding: 0 0.5rem 0 0;
-
-    i {
-      color: nb-theme(color-fg);
-      font-size: 3rem;
-      margin-right: 0.5rem;
-
-      @include nb-for-theme(corporate) {
-        color: nb-theme(actions-fg);
-      }
-    }
-
-    span {
-      font-family: nb-theme(font-secondary);
-      font-weight: nb-theme(font-weight-bold);
-      color: nb-theme(color-fg-heading);
-      text-transform: uppercase;
-    }
+  .camera-name {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    color: white;
+    background: nb-theme(overlay-backdrop-background-color);
+    padding: 0.5rem 1rem;
   }
 
-  @include nb-for-theme(cosmic) {
-    .cameras-filter a.active {
-      color: nb-theme(color-fg-highlight);
-    }
-
-    .camera {
-      span {
-        background: rgba(88, 73, 184, 0.5);
-      }
-
-      &::before {
-        background-color: rgba(0, 0, 0, 0.2);
-      }
-    }
-
-    nb-action span {
-      font-weight: nb-theme(font-weight-bolder);
+  nb-action {
+    nb-icon {
+      @include nb-ltr(margin-right, 0.5rem);
+      @include nb-rtl(margin-left, 0.5rem);
     }
-  }
-
-  @include nb-for-theme(corporate) {
-    .cameras-filter a {
-      &.active {
-        color: nb-theme(color-primary);
-      }
 
-      &:first-child {
-        @include nb-ltr(border-left, 1px solid nb-theme(border-color));
-        @include nb-rtl(border-right, 1px solid nb-theme(border-color));
-      }
+    ::ng-deep svg {
+      vertical-align: top;
     }
   }
 
-  @include media-breakpoint-down(lg) {
+  @include media-breakpoint-down(xl) {
     nb-action {
       padding: 0;
-      i {
-        margin: 0;
-      }
-      span {
-        display: none;
-      }
     }
   }
 }
diff --git a/src/app/pages/dashboard/security-cameras/security-cameras.component.ts b/src/app/pages/dashboard/security-cameras/security-cameras.component.ts
index 13e3a4decc..3daf0327c1 100644
--- a/src/app/pages/dashboard/security-cameras/security-cameras.component.ts
+++ b/src/app/pages/dashboard/security-cameras/security-cameras.component.ts
@@ -1,35 +1,53 @@
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { map, takeUntil } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NbComponentSize, NbMediaBreakpointsService, NbThemeService } from '@nebular/theme';
+
 import { Camera, SecurityCamerasData } from '../../../@core/data/security-cameras';
-import { takeWhile } from 'rxjs/operators';
 
 @Component({
   selector: 'ngx-security-cameras',
   styleUrls: ['./security-cameras.component.scss'],
   templateUrl: './security-cameras.component.html',
 })
-export class SecurityCamerasComponent implements OnDestroy {
+export class SecurityCamerasComponent implements OnInit, OnDestroy {
 
-  private alive = true;
+  private destroy$ = new Subject<void>();
 
   cameras: Camera[];
   selectedCamera: Camera;
   isSingleView = false;
+  actionSize: NbComponentSize = 'medium';
+
+  constructor(
+    private themeService: NbThemeService,
+    private breakpointService: NbMediaBreakpointsService,
+    private securityCamerasService: SecurityCamerasData,
+  ) {}
 
-  constructor(private securityCamerasService: SecurityCamerasData) {
+  ngOnInit() {
     this.securityCamerasService.getCamerasData()
-      .pipe(takeWhile(() => this.alive))
+      .pipe(takeUntil(this.destroy$))
       .subscribe((cameras: Camera[]) => {
         this.cameras = cameras;
         this.selectedCamera = this.cameras[0];
       });
+
+    const breakpoints = this.breakpointService.getBreakpointsMap();
+    this.themeService.onMediaQueryChange()
+      .pipe(map(([, breakpoint]) => breakpoint.width))
+      .subscribe((width: number) => {
+        this.actionSize = width > breakpoints.md ? 'medium' : 'small';
+      });
+  }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 
   selectCamera(camera: any) {
     this.selectedCamera = camera;
     this.isSingleView = true;
   }
-
-  ngOnDestroy() {
-    this.alive = false;
-  }
 }
diff --git a/src/app/pages/dashboard/solar/solar.component.scss b/src/app/pages/dashboard/solar/solar.component.scss
index dbffaf0044..6b64c825ff 100644
--- a/src/app/pages/dashboard/solar/solar.component.scss
+++ b/src/app/pages/dashboard/solar/solar.component.scss
@@ -4,62 +4,31 @@
 
 @include nb-install-component() {
 
-  $padding: 1rem;
-
   nb-card-body {
     overflow: hidden;
-    padding: $padding;
   }
 
   .echart {
     position: absolute;
     left: 1em;
-    height: calc(100% - 2 * #{$padding});
+    height: calc(100% - 2 * 1rem);
     width: 40%;
   }
 
   .info {
     margin-left: 45%;
-    padding-top: 1.5rem;
-    color: nb-theme(color-fg);
+    padding-top: 1rem;
   }
 
   .value {
-    font-family: nb-theme(font-secondary);
-    font-size: 2rem;
-    font-weight: nb-theme(font-weight-bold);
-    color: nb-theme(color-fg-heading);
+    margin: 0;
   }
 
   .details {
-    font-size: 1.25rem;
-    font-weight: nb-theme(font-weight-bolder);
-    line-height: 1;
-    span {
-      font-size: 1rem;
-      font-weight: nb-theme(font-weight-light);
-    }
-  }
-
-  .text-hint {
-    font-size: 1rem;
-  }
-
-  @include nb-for-theme(cosmic) {
-    color: nb-theme(color-fg-heading);
-
-    .value {
-      color: nb-theme(color-fg-highlight);
-    }
-
-    .details span {
-      color: nb-theme(color-fg);
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-    .value {
-      font-size: 1.75rem;
-    }
+    color: nb-theme(text-hint-color);
+    font-family: nb-theme(text-subtitle-2-font-family);
+    font-size: nb-theme(text-subtitle-2-font-size);
+    font-weight: nb-theme(text-subtitle-2-font-weight);
+    line-height: nb-theme(text-subtitle-2-line-height);
   }
 }
diff --git a/src/app/pages/dashboard/solar/solar.component.ts b/src/app/pages/dashboard/solar/solar.component.ts
index fcae7c2f6b..a60e3ebd69 100644
--- a/src/app/pages/dashboard/solar/solar.component.ts
+++ b/src/app/pages/dashboard/solar/solar.component.ts
@@ -8,13 +8,13 @@ declare const echarts: any;
   selector: 'ngx-solar',
   styleUrls: ['./solar.component.scss'],
   template: `
-    <nb-card size="xsmall" class="solar-card">
+    <nb-card size="tiny" class="solar-card">
       <nb-card-header>Solar Energy Consumption</nb-card-header>
       <nb-card-body>
         <div echarts [options]="option" class="echart">
         </div>
         <div class="info">
-          <div class="value">6. 421 kWh</div>
+          <div class="h4 value">6.421 kWh</div>
           <div class="details"><span>out of</span> 8.421 kWh</div>
         </div>
       </nb-card-body>
@@ -112,7 +112,7 @@ export class SolarComponent implements AfterViewInit, OnDestroy {
                 },
                 itemStyle: {
                   normal: {
-                    color: config.variables.layoutBg,
+                    color: solarTheme.secondSeriesFill,
                   },
                 },
               },
diff --git a/src/app/pages/dashboard/status-card/status-card.component.scss b/src/app/pages/dashboard/status-card/status-card.component.scss
index d17829c016..4e524ee3ee 100644
--- a/src/app/pages/dashboard/status-card/status-card.component.scss
+++ b/src/app/pages/dashboard/status-card/status-card.component.scss
@@ -1,5 +1,4 @@
 @import '../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/hero-buttons';
 
 @include nb-install-component() {
   nb-card {
@@ -8,10 +7,6 @@
     height: 6rem;
     overflow: visible;
 
-    $bevel: btn-hero-bevel(nb-theme(card-bg));
-    $shadow: nb-theme(btn-hero-shadow);
-    box-shadow: $bevel, $shadow;
-
     .icon-container {
       height: 100%;
       padding: 0.625rem;
@@ -29,89 +24,36 @@
       transform: translate3d(0, 0, 0);
       -webkit-transform-style: preserve-3d;
       -webkit-backface-visibility: hidden;
-      color: nb-theme(color-white);
-
-      &.primary {
-        @include btn-hero-primary-gradient();
-        @include btn-hero-primary-bevel-glow-shadow();
-      }
-      &.success {
-        @include btn-hero-success-gradient();
-        @include btn-hero-success-bevel-glow-shadow();
-      }
-      &.info {
-        @include btn-hero-info-gradient();
-        @include btn-hero-info-bevel-glow-shadow();
-      }
-      &.warning {
-        @include btn-hero-warning-gradient();
-        @include btn-hero-warning-bevel-glow-shadow();
-      }
-      &.danger {
-        @include btn-hero-danger-gradient();
-        @include btn-hero-danger-bevel-glow-shadow();
-      }
-      &.secondary {
-        @include btn-hero-secondary-bg();
-        @include btn-hero-secondary-bevel-glow-shadow();
-        color: nb-theme(card-fg);
-      }
-
-      @include nb-for-theme(corporate) {
-        &.primary,
-        &.success,
-        &.info,
-        &.warning,
-        &.danger,
-        &.secondary {
-          box-shadow: none;
-        }
-      }
-    }
-
-    &:hover {
-      background: lighten(nb-theme(card-bg), 5%);
-
-      .icon {
-        &.primary {
-          background-image: btn-hero-primary-light-gradient();
-        }
-        &.success {
-          background-image: btn-hero-success-light-gradient();
-        }
-        &.info {
-          background-image: btn-hero-info-light-gradient();
-        }
-        &.warning {
-          background-image: btn-hero-warning-light-gradient();
-        }
-        &.danger {
-          background-image: btn-hero-danger-light-gradient();
-        }
-        &.secondary {
-          background-image: btn-hero-secondary-light-gradient();
+      color: nb-theme(text-control-color);
+
+      @each $status in nb-get-statuses() {
+        &.status-#{$status} {
+          $left-color: nb-theme(button-hero-#{$status}-left-background-color);
+          $right-color: nb-theme(button-hero-#{$status}-right-background-color);
+          background-image: linear-gradient(to right, $left-color, $right-color);
+
+          &:hover {
+            $left-hover-color: nb-theme(button-hero-#{$status}-hover-left-background-color);
+            $right-hover-color: nb-theme(button-hero-#{$status}-hover-right-background-color);
+            background-image: linear-gradient(to right, $left-hover-color, $right-hover-color);
+          }
         }
       }
     }
 
     &.off {
-      color: nb-theme(card-fg);
+      color: nb-theme(text-hint-color);
 
+      .title,
       .icon {
-        color: nb-theme(card-fg);
+        color: nb-theme(text-hint-color);
+      }
 
-        &.primary, &.success, &.info, &.warning, &.danger {
+      @each $status in nb-get-statuses() {
+        .icon.status-#{$status} {
           box-shadow: none;
           background-image: linear-gradient(to right, transparent, transparent);
         }
-
-        &.secondary {
-          background: transparent;
-        }
-      }
-
-      .title {
-        color: nb-theme(card-fg);
       }
     }
 
@@ -126,59 +68,15 @@
     }
 
     .title {
-      font-family: nb-theme(font-secondary);
-      font-size: 1.25rem;
-      font-weight: nb-theme(font-weight-bold);
-      color: nb-theme(card-fg-heading);
+      margin: 0;
     }
 
     .status {
-      font-size: 1rem;
-      font-weight: nb-theme(font-weight-light);
       text-transform: uppercase;
-      color: nb-theme(card-fg);
-    }
-  }
-
-  @include nb-for-theme(cosmic) {
-    nb-card {
-      &.off .icon-container {
-        @include nb-ltr(border-right, 1px solid nb-theme(separator));
-        @include nb-rtl(border-left, 1px solid nb-theme(separator));
-      }
-
-      .icon-container {
-        padding: 0;
-      }
-
-      .details {
-        @include nb-ltr(padding-left, 1.25rem);
-        @include nb-rtl(padding-right, 1.25rem);
-      }
-
-      .icon {
-        width: 7rem;
-        height: 100%;
-        font-size: 4.5rem;
-        @include nb-ltr(border-radius, nb-theme(card-border-radius) 0 0 nb-theme(card-border-radius));
-        @include nb-rtl(border-radius, 0 nb-theme(card-border-radius) nb-theme(card-border-radius) 0);
-      }
-
-      .title {
-        font-weight: nb-theme(font-weight-bolder);
-      }
-
-      .status {
-        font-weight: nb-theme(font-weight-light);
-      }
-    }
-  }
-
-  @include nb-for-theme(corporate) {
-    nb-card {
-      .icon-container {
-        height: auto;
-      }
+      font-family: nb-theme(text-paragraph-2-font-family);
+      font-size: nb-theme(text-paragraph-2-font-size);
+      font-weight: nb-theme(text-paragraph-2-font-weight);
+      line-height: nb-theme(text-paragraph-2-line-height);
     }
   }
 }
diff --git a/src/app/pages/dashboard/status-card/status-card.component.ts b/src/app/pages/dashboard/status-card/status-card.component.ts
index 6260803052..cabec2f049 100644
--- a/src/app/pages/dashboard/status-card/status-card.component.ts
+++ b/src/app/pages/dashboard/status-card/status-card.component.ts
@@ -6,13 +6,13 @@ import { Component, Input } from '@angular/core';
   template: `
     <nb-card (click)="on = !on" [ngClass]="{'off': !on}">
       <div class="icon-container">
-        <div class="icon {{ type }}">
+        <div class="icon status-{{ type }}">
           <ng-content></ng-content>
         </div>
       </div>
 
       <div class="details">
-        <div class="title">{{ title }}</div>
+        <div class="title h5">{{ title }}</div>
         <div class="status">{{ on ? 'ON' : 'OFF' }}</div>
       </div>
     </nb-card>
diff --git a/src/app/pages/dashboard/team/team.component.html b/src/app/pages/dashboard/team/team.component.html
deleted file mode 100644
index 72bd210a1a..0000000000
--- a/src/app/pages/dashboard/team/team.component.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<nb-card size="medium">
-  <div class="team-photo">
-    <a href="mailto:contact@akveo.com">
-      <button type="button" class="btn btn-success btn-icon team-link">
-        <i class="ion-paper-airplane"></i>
-      </button>
-    </a>
-  </div>
-
-  <div class="team-info">
-    <div class="team-title">
-      <h2>Akveo Team</h2>
-    </div>
-    <div class="team-subtitle">Design & Development</div>
-    <div class="team-bio">
-      We're small team of fullstack software experts. We're crazy about creation of modern and secure software. We help to make
-      your product amazing.
-    </div>
-  </div>
-
-  <div class="links">
-    <a href="https://www.akveo.com" target="_blank">
-      <i class="ion-ios-world-outline"></i>
-    </a>
-    <a href="https://www.facebook.com/akveo" target="_blank">
-      <i class="ion-social-facebook"></i>
-    </a>
-    <a href="https://twitter.com/akveo_inc" target="_blank">
-      <i class="ion-social-twitter"></i>
-    </a>
-    <a href="https://github.com/akveo" target="_blank">
-      <i class="ion-social-github"></i>
-    </a>
-  </div>
-</nb-card>
diff --git a/src/app/pages/dashboard/team/team.component.scss b/src/app/pages/dashboard/team/team.component.scss
deleted file mode 100644
index 1335d1d396..0000000000
--- a/src/app/pages/dashboard/team/team.component.scss
+++ /dev/null
@@ -1,66 +0,0 @@
-@import '../../../@theme/styles/themes';
-
-@include nb-install-component() {
-
-  .team-photo {
-    background-image: url('/assets/images/team.png');
-    background-position: center;
-    background-size: cover;
-    position: relative;
-    border-top-left-radius: nb-theme(card-border-radius);
-    border-top-right-radius: nb-theme(card-border-radius);
-
-    flex: 1;
-    max-height: 50%;
-
-    .team-link {
-      position: absolute;
-      height: 4rem;
-      width: 4rem;
-      bottom: -2rem;
-      right: 1rem;
-      border-radius: 50%;
-      box-shadow: 0 4px 10px 0 rgba(nb-theme(layout-bg), 0.4), 0 0 12px 0 rgba(nb-theme(color-fg-highlight), 0.2);
-    }
-  }
-
-  .team-info {
-    padding: 1.5rem 1.5rem 0;
-
-    .team-title {
-      color: nb-theme(color-fg-heading);
-      font-family: nb-theme(font-secondary);
-
-      h2 {
-        margin: 0;
-      }
-    }
-
-    .team-subtitle {
-      margin-bottom: 1rem;
-      color: nb-theme(color-fg);
-      font-weight: nb-theme(font-weight-light);
-    }
-
-    .team-bio {
-      text-align: justify;
-      color: nb-theme(color-fg-text);
-      font-weight: nb-theme(font-weight-light);
-    }
-  }
-
-  .links {
-    display: flex;
-    justify-content: space-around;
-    padding: 1rem 0;
-
-    a {
-      text-decoration: none;
-      color: nb-theme(color-fg);
-
-      i {
-        font-size: 1.75rem;
-      }
-    }
-  }
-}
diff --git a/src/app/pages/dashboard/team/team.component.ts b/src/app/pages/dashboard/team/team.component.ts
deleted file mode 100644
index 5b718d5c65..0000000000
--- a/src/app/pages/dashboard/team/team.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-team',
-  styleUrls: ['./team.component.scss'],
-  templateUrl: './team.component.html',
-})
-export class TeamComponent {
-}
diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html
index 88ee6659a6..7f46e3322e 100644
--- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html
+++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html
@@ -19,16 +19,21 @@
     </defs>
     <g [attr.transform]="styles.arcTranslateStr">
 
-      <g class="toClip" [attr.clip-path]="'url(#sliderClip' + svgControlId +')'">
-        <g class="toFilter" [attr.filter]="'url(#blurFilter' + svgControlId +')'">
-          <path [attr.d]="arc.d" [attr.fill]="arc.color" *ngFor="let arc of styles.gradArcs"></path>
+      <g class="toClip" [attr.clip-path]="getUrlPath('#sliderClip')">
+        <g class="toFilter" [attr.filter]="getUrlPath('#blurFilter')">
+          <path [attr.d]="arc.d" [attr.fill]="off ? styles.nonSelectedArc.color : arc.color" *ngFor="let arc of styles.gradArcs"></path>
         </g>
         <!-- ngFor is a quirk fix for webkit rendering issues -->
         <path [attr.d]="styles.nonSelectedArc.d" [attr.fill]="styles.nonSelectedArc.color" *ngFor="let number of [0,1,2,3,4,5]"></path>
       </g>
 
-      <circle [attr.cx]="styles.thumbPosition.x" [attr.cy]="styles.thumbPosition.y" [attr.r]="pinRadius"
-              [attr.stroke-width]="thumbBorder / scaleFactor" class="circle"></circle>
+      <circle [attr.cx]="styles.thumbPosition.x"
+              [attr.cy]="styles.thumbPosition.y"
+              [attr.r]="pinRadius"
+              [attr.stroke-width]="thumbBorder / scaleFactor"
+              [attr.fill]="off ? 'none' : thumbBg"
+              [attr.stroke]="off ? 'none' : thumbBorderColor">
+      </circle>
     </g>
   </svg>
 </div>
@@ -37,6 +42,6 @@
   <ng-content></ng-content>
 </div>
 
-<div class="power-bg" [ngClass]="{'off': off}" (click)="switchPower()">
-  <i class="nb-power-circled"></i>
-</div>
+<button nbButton appearance="ghost" class="power-bg" [class.on]="!off" (click)="switchPower()">
+  <nb-icon class="power-icon" icon="power-outline" pack="eva"></nb-icon>
+</button>
diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss
index 575ed10ff4..0fa12c1ae6 100644
--- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss
+++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.scss
@@ -1,5 +1,4 @@
 @import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/hero-buttons';
 
 @include nb-install-component() {
   position: relative;
@@ -19,11 +18,6 @@
     z-index: 2;
   }
 
-  .circle {
-    fill: nb-theme(color-bg);
-    stroke: nb-theme(color-success);
-  }
-
   .temperature-bg {
     position: absolute;
     width: 88%;
@@ -38,18 +32,14 @@
     align-items: center;
     justify-content: center;
 
-    border: 2px solid nb-theme(separator);
-    @include nb-for-theme(cosmic) {
-      background-color: lighten(nb-theme(layout-bg), 2%);
-      border: none;
-    }
+    border: nb-theme(divider-width) nb-theme(divider-style) nb-theme(divider-color);
   }
 
   .power-bg {
     position: absolute;
     width: 5.25rem;
     height: 5.25rem;
-    background-color: nb-theme(card-bg);
+    background-color: nb-theme(card-background-color);
     border-radius: 50%;
     bottom: 2%;
     left: 50%;
@@ -60,45 +50,14 @@
     align-items: center;
     justify-content: center;
     cursor: pointer;
-    font-size: 3rem;
-    color: nb-theme(color-fg-heading);
-    border: 2px solid nb-theme(separator);
+    border: nb-theme(divider-width) nb-theme(divider-style) nb-theme(divider-color);
 
-    &:hover {
-      background-color: lighten(nb-theme(card-bg), 5%);
-    }
-
-    &:active {
-      background-color: darken(nb-theme(card-bg), 5%);
-      box-shadow: none;
-    }
-
-    &.off {
-      color: nb-theme(color-fg);
-      text-shadow: none;
+    &.on {
+      color: nb-theme(text-hint-color);
     }
   }
 
-  @include nb-for-theme(cosmic) {
-    .circle {
-      fill: nb-theme(color-fg-heading);
-      stroke: nb-theme(color-fg-heading);
-    }
-
-    .power-bg {
-      border: none;
-      box-shadow: nb-theme(card-shadow);
-      text-shadow: 0 0 6px rgba(255, 255, 255, 0.5);
-    }
-  }
-
-  @include nb-for-theme(corporate) {
-    .circle {
-      stroke: nb-theme(color-warning);
-    }
-
-    .power-bg {
-      color: nb-theme(separator);
-    }
+  .power-icon {
+    font-size: 3rem;
   }
 }
diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts
index 8c3d05b4a9..a820ad303b 100644
--- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts
+++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts
@@ -1,7 +1,17 @@
 import {
-  Component, HostListener, ViewChild, ElementRef, Input, Output, EventEmitter, AfterViewInit, OnChanges,
+  Component,
+  HostListener,
+  ViewChild,
+  ElementRef,
+  Input,
+  Output,
+  EventEmitter,
+  AfterViewInit,
+  OnChanges,
 } from '@angular/core';
+import { Location, LocationStrategy } from '@angular/common';
 
+let uniqueId = 0;
 const VIEW_BOX_SIZE = 300;
 
 @Component({
@@ -11,14 +21,16 @@ const VIEW_BOX_SIZE = 300;
 })
 export class TemperatureDraggerComponent implements AfterViewInit, OnChanges {
 
-  @ViewChild('svgRoot') svgRoot: ElementRef;
+  @ViewChild('svgRoot', { static: true }) svgRoot: ElementRef;
 
-  @Input() fillColors: string|string[] = '#2ec6ff';
-  @Input() disableArcColor = '#999999';
+  @Input() fillColors: string|string[];
+  @Input() disableArcColor;
   @Input() bottomAngle = 90;
   @Input() arcThickness = 18; // CSS pixels
   @Input() thumbRadius = 16; // CSS pixels
   @Input() thumbBorder = 3;
+  @Input() thumbBg;
+  @Input() thumbBorderColor;
   @Input() maxLeap = 0.4;
 
   value = 50;
@@ -52,7 +64,7 @@ export class TemperatureDraggerComponent implements AfterViewInit, OnChanges {
   off = false;
   oldValue: number;
 
-  svgControlId = new Date().getTime();
+  svgControlId = uniqueId++;
   scaleFactor = 1;
   bottomAngleRad = 0;
   radius = 100;
@@ -75,7 +87,10 @@ export class TemperatureDraggerComponent implements AfterViewInit, OnChanges {
   private isMouseDown = false;
   private init = false;
 
-  constructor() {
+  constructor(
+    private location: Location,
+    private locationStrategy: LocationStrategy,
+  ) {
     this.oldValue = this.value;
   }
 
@@ -114,6 +129,16 @@ export class TemperatureDraggerComponent implements AfterViewInit, OnChanges {
     this.invalidatePinPosition();
   }
 
+  getUrlPath(id: string) {
+    let baseHref = this.locationStrategy.getBaseHref();
+    if (baseHref.endsWith('')) {
+      baseHref = baseHref.slice(0, -1);
+    }
+    const path = this.location.path();
+
+    return `url(${baseHref}${path}${id}${this.svgControlId})`;
+  }
+
   private invalidate(): void {
     this.bottomAngleRad = TemperatureDraggerComponent.toRad(this.bottomAngle);
     this.calculateVars();
diff --git a/src/app/pages/dashboard/temperature/temperature.component.html b/src/app/pages/dashboard/temperature/temperature.component.html
index fe34b7528f..8f6c0e4b79 100644
--- a/src/app/pages/dashboard/temperature/temperature.component.html
+++ b/src/app/pages/dashboard/temperature/temperature.component.html
@@ -5,11 +5,11 @@
 
       <div class="slider-container">
         <ngx-temperature-dragger [(value)]="temperature" (power)="temperatureOff = !$event"
-                                 [min]="temperatureData.min" [max]="temperatureData.max" [disableArcColor]="colors.layoutBg"
-                                 [fillColors]="colors.temperature">
+                                 [min]="temperatureData.min" [max]="temperatureData.max" [disableArcColor]="theme.arcEmpty"
+                                 [fillColors]="theme.arcFill" [thumbBg]="theme.thumbBg" [thumbBorderColor]="theme.thumbBorder">
 
           <div class="slider-value-container"  [ngClass]="{ 'off': temperatureOff }">
-            <div class="value temperature">
+            <div class="value temperature h1">
               {{ temperatureOff ? '--' : (temperature | ngxRound) }}
             </div>
             <div class="desc">
@@ -19,53 +19,51 @@
         </ngx-temperature-dragger>
       </div>
 
-      <div [(ngModel)]="temperatureMode" ngbRadioGroup data-toggle="buttons"
-           class="btn-group btn-group-toggle btn-divided-group btn-outline-divided-group btn-group-full-width">
-        <label ngbButtonLabel class="btn btn-icon">
-          <input ngbButton type="radio" value="cool"/><i class="nb-snowy-circled"></i>
-        </label>
-        <label ngbButtonLabel class="btn btn-icon">
-          <input ngbButton type="radio" value="warm"/><i class="nb-sunny-circled"></i>
-        </label>
-        <label ngbButtonLabel class="btn btn-icon">
-          <input ngbButton type="radio" value="heat"/><i class="nb-flame-circled"></i>
-        </label>
-        <label ngbButtonLabel class="btn btn-icon">
-          <input ngbButton type="radio" value="fan"/><i class="nb-loop-circled"></i>
-        </label>
-      </div>
+      <nb-radio-group [(ngModel)]="temperatureMode" name="temperature-mode">
+        <nb-radio value="cool">
+          <i class="nb-snowy-circled"></i>
+        </nb-radio>
+        <nb-radio value="warm">
+          <i class="nb-sunny-circled"></i>
+        </nb-radio>
+        <nb-radio value="heat">
+          <i class="nb-flame-circled"></i>
+        </nb-radio>
+        <nb-radio value="fan">
+          <i class="nb-loop-circled"></i>
+        </nb-radio>
+      </nb-radio-group>
     </nb-tab>
 
     <nb-tab tabTitle="Humidity">
 
       <div class="slider-container">
         <ngx-temperature-dragger [(value)]="humidity" (power)="humidityOff = !$event"
-                                 [min]="humidityData.min" [max]="humidityData.max" [disableArcColor]="colors.layoutBg"
-                                 [fillColors]="colors.temperature">
+                                 [min]="humidityData.min" [max]="humidityData.max" [disableArcColor]="theme.arcEmpty"
+                                 [fillColors]="theme.arcFill" [thumbBg]="theme.thumbBg" [thumbBorderColor]="theme.thumbBorder">
 
           <div class="slider-value-container"  [ngClass]="{ 'off': humidityOff }">
-            <div class="value humidity">
+            <div class="value humidity h1">
               {{ humidityOff ? '--' : (humidity | ngxRound) }}
             </div>
           </div>
         </ngx-temperature-dragger>
       </div>
 
-      <div [(ngModel)]="humidityMode" ngbRadioGroup data-toggle="buttons"
-           class="btn-group btn-group-toggle btn-divided-group btn-outline-divided-group btn-group-full-width">
-        <label ngbButtonLabel class="btn btn-icon">
-          <input ngbButton type="radio" value="cool"/><i class="nb-snowy-circled"></i>
-        </label>
-        <label ngbButtonLabel class="btn btn-icon">
-          <input ngbButton type="radio" value="warm"/><i class="nb-sunny-circled"></i>
-        </label>
-        <label ngbButtonLabel class="btn btn-icon">
-          <input ngbButton type="radio" value="heat"/><i class="nb-flame-circled"></i>
-        </label>
-        <label ngbButtonLabel class="btn btn-icon">
-          <input ngbButton type="radio" value="fan"/><i class="nb-loop-circled"></i>
-        </label>
-      </div>
+      <nb-radio-group [(ngModel)]="humidityMode" name="humidity-mode">
+        <nb-radio value="cool">
+          <i class="nb-snowy-circled"></i>
+        </nb-radio>
+        <nb-radio value="warm">
+          <i class="nb-sunny-circled"></i>
+        </nb-radio>
+        <nb-radio value="heat">
+          <i class="nb-flame-circled"></i>
+        </nb-radio>
+        <nb-radio value="fan">
+          <i class="nb-loop-circled"></i>
+        </nb-radio>
+      </nb-radio-group>
     </nb-tab>
   </nb-tabset>
 </nb-card>
diff --git a/src/app/pages/dashboard/temperature/temperature.component.scss b/src/app/pages/dashboard/temperature/temperature.component.scss
index 0ab66b3c81..cb447c1197 100644
--- a/src/app/pages/dashboard/temperature/temperature.component.scss
+++ b/src/app/pages/dashboard/temperature/temperature.component.scss
@@ -9,8 +9,13 @@
     flex-direction: column;
     height: 100%;
 
-    /deep/ ul {
-      border: none;
+    ::ng-deep ul {
+      // make same size as card header
+      border-color: transparent;
+      padding-bottom: 1px;
+      .tab-link {
+        padding: 1.25rem 2rem;
+      }
     }
   }
 
@@ -32,7 +37,7 @@
 
   ngx-temperature-dragger {
     margin-top: -1.5rem;
-    width: 80%;
+    width: 100%;
     max-width: 300px;
   }
 
@@ -43,37 +48,27 @@
 
     .value {
       position: relative;
-      color: nb-theme(color-fg-heading);
-      font-family: nb-theme(font-secondary);
-      font-size: 4rem;
-      font-weight: nb-theme(font-weight-bolder);
+      margin: 0;
 
       &.temperature::before {
         position: absolute;
         content: '°';
         top: 0;
-        right: -1.25rem;
+        right: -0.85rem;
       }
 
       &.humidity::before {
         position: absolute;
         content: '%';
-        bottom: 0.5rem;
-        right: -2.5rem;
-        color: nb-theme(color-fg);
-        font-size: 2.5rem;
-        font-weight: nb-theme(font-weight-light);
+        top: 3px;
+        right: -1.6rem;
+        font-size: 0.7em;
       }
     }
 
-    .desc {
-      color: nb-theme(color-fg);
-      font-weight: nb-theme(font-weight-light);
-    }
-
     &.off {
       .value {
-        color: nb-theme(color-fg);
+        color: nb-theme(text-hint-color);
         letter-spacing: 0.25rem;
         padding-left: 0.5rem;
 
@@ -88,82 +83,38 @@
     }
   }
 
-  .btn-group {
-    padding: 1.25rem;
-    justify-content: center;
-  }
-
-  .btn-icon {
+  nb-radio-group {
     display: flex;
-    align-items: center;
-    justify-content: center;
-
-    width: 4.5rem;
-    height: 4.5rem;
-    padding: 0;
-    margin-bottom: 0;
-    color: nb-theme(color-fg);
-
-    &.active {
-      border-color: nb-theme(color-fg-highlight);
-      color: nb-theme(color-fg-highlight);
-    }
-
-    i {
-      font-size: 2.25rem;
-      line-height: 1;
-    }
-  }
-
-  @include nb-for-theme(cosmic) {
-    .btn-icon.active {
-      color: nb-theme(color-fg-heading);
-      border-color: nb-theme(color-fg-highlight);
-      box-shadow: 0 2px 12px 0 rgba(nb-theme(color-fg-highlight), 0.25);
-      background-color: rgba(nb-theme(color-fg-highlight), 0.25);
-    }
-  }
-
-  @include nb-for-theme(corporate) {
-    .btn-icon.active {
-      color: nb-theme(color-primary);
-      border: none;
-      background-color: nb-theme(layout-bg);
-    }
+    justify-content: space-between;
   }
 
-  @include media-breakpoint-down(is) {
-    ngx-temperature-dragger {
-      max-width: 250px;
+  nb-radio {
+    flex: 0 0 auto;
+    width: calc(3.5rem + 2px);
+    height: calc(3.5rem + 2px);
 
-      /deep/ .power-bg {
-        width: 4rem;
-        height: 4rem;
-        font-size: 3rem;
+    ::ng-deep {
+      .outer-circle,
+      .inner-circle {
+        display: none;
       }
-    }
 
-    .slider-value-container .value {
-      font-size: 3rem;
-      &.humidity::before {
-        right: -2rem;
-        font-size: 2rem;
+      label {
+        padding: 0;
       }
-    }
-  }
-  @include media-breakpoint-down(xs) {
-    .btn-icon {
-      width: 3.25rem;
-      height: 3.25rem;
-      i {
-        font-size: 1.75rem;
+
+      .text {
+        border: 1px solid transparent;
+        font-size: 2.5rem;
+        padding: 0.5rem;
+        margin: 0;
+        color: nb-theme(text-hint-color);
       }
-    }
 
-    nb-tabset /deep/ ul {
-      padding: 0 0.5rem;
-      a {
-        padding: 1.25rem 1rem;
+      input:checked ~ .text {
+        border-color: nb-theme(color-primary-default);
+        border-radius: nb-theme(card-border-radius);
+        color: nb-theme(text-primary-color);
       }
     }
   }
diff --git a/src/app/pages/dashboard/temperature/temperature.component.ts b/src/app/pages/dashboard/temperature/temperature.component.ts
index 9f29b8fdd6..4706f5fcb0 100644
--- a/src/app/pages/dashboard/temperature/temperature.component.ts
+++ b/src/app/pages/dashboard/temperature/temperature.component.ts
@@ -23,15 +23,15 @@ export class TemperatureComponent implements OnDestroy {
   humidityOff = false;
   humidityMode = 'heat';
 
-  colors: any;
+  theme: any;
   themeSubscription: any;
 
-  constructor(private theme: NbThemeService,
+  constructor(private themeService: NbThemeService,
               private temperatureHumidityService: TemperatureHumidityData) {
-    this.theme.getJsTheme()
+    this.themeService.getJsTheme()
       .pipe(takeWhile(() => this.alive))
       .subscribe(config => {
-      this.colors = config.variables;
+      this.theme = config.variables.temperature;
     });
 
     forkJoin(
diff --git a/src/app/pages/dashboard/traffic/traffic-chart.component.ts b/src/app/pages/dashboard/traffic/traffic-chart.component.ts
index e158057890..1a76f56005 100644
--- a/src/app/pages/dashboard/traffic/traffic-chart.component.ts
+++ b/src/app/pages/dashboard/traffic/traffic-chart.component.ts
@@ -5,7 +5,6 @@ import { LayoutService } from '../../../@core/utils';
 
 @Component({
   selector: 'ngx-traffic-chart',
-  styleUrls: ['./traffic.component.scss'],
   template: `
     <div echarts
          [options]="option"
@@ -69,8 +68,7 @@ export class TrafficChartComponent implements AfterViewInit, OnDestroy {
             splitLine: {
               show: true,
               lineStyle: {
-                color: trafficTheme.colorBlack,
-                opacity: 0.06,
+                color: trafficTheme.yAxisSplitLine,
                 width: '1',
               },
             },
@@ -87,7 +85,7 @@ export class TrafficChartComponent implements AfterViewInit, OnDestroy {
             position: 'top',
             backgroundColor: trafficTheme.tooltipBg,
             borderColor: trafficTheme.tooltipBorderColor,
-            borderWidth: 3,
+            borderWidth: 1,
             formatter: '{c0} MB',
             extraCssText: trafficTheme.tooltipExtraCss,
           },
diff --git a/src/app/pages/dashboard/traffic/traffic.component.scss b/src/app/pages/dashboard/traffic/traffic.component.scss
index 1dc9a319d4..abe930ee6c 100644
--- a/src/app/pages/dashboard/traffic/traffic.component.scss
+++ b/src/app/pages/dashboard/traffic/traffic.component.scss
@@ -2,30 +2,34 @@
 
 @include nb-install-component() {
 
+  nb-card {
+    position: relative;
+    overflow: hidden;
+  }
+
   nb-card-header {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 0.675rem 0.5rem 0.5rem 1.25rem;
+    padding-top: nb-theme(card-header-with-select-padding-top);
+    padding-bottom: nb-theme(card-header-with-select-padding-bottom);
+    margin-bottom: -1px;
   }
 
-  nb-card-body {
-    overflow: hidden;
-    position: relative;
-  }
-
-  /deep/ canvas {
-    border-bottom-left-radius: nb-theme(card-border-radius);
-    border-bottom-right-radius: nb-theme(card-border-radius);
+  ngx-traffic-chart {
+    flex: 1;
   }
 
-  .echart {
-    position: absolute;
-    height: 100%;
-    width: 100%;
-  }
+  ::ng-deep {
+    .echart {
+      display: block;
+      height: 100%;
+      width: 100%;
+    }
 
-  .dropdown {
-    min-width: 120px;
+    canvas {
+      border-bottom-left-radius: nb-theme(card-border-radius);
+      border-bottom-right-radius: nb-theme(card-border-radius);
+    }
   }
 }
diff --git a/src/app/pages/dashboard/traffic/traffic.component.ts b/src/app/pages/dashboard/traffic/traffic.component.ts
index bf8c5e23ac..3ddd6e2c7c 100644
--- a/src/app/pages/dashboard/traffic/traffic.component.ts
+++ b/src/app/pages/dashboard/traffic/traffic.component.ts
@@ -1,28 +1,23 @@
 import { Component, OnDestroy } from '@angular/core';
 import { NbThemeService } from '@nebular/theme';
 import { takeWhile } from 'rxjs/operators';
+
 import { TrafficChartData } from '../../../@core/data/traffic-chart';
 
 @Component({
   selector: 'ngx-traffic',
   styleUrls: ['./traffic.component.scss'],
   template: `
-    <nb-card size="xsmall">
+    <nb-card size="tiny">
       <nb-card-header>
         <span>Traffic Consumption</span>
-        <div class="dropdown ghost-dropdown" ngbDropdown>
-          <button type="button" class="btn btn-sm" ngbDropdownToggle
-                  [ngClass]="{ 'btn-success': currentTheme == 'default', 'btn-primary': currentTheme != 'default'}">
-            {{ type }}
-          </button>
-          <ul ngbDropdownMenu class="dropdown-menu">
-            <li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
-          </ul>
-        </div>
+
+        <nb-select [(selected)]="type">
+          <nb-option *ngFor="let t of types" [value]="t">{{ t }}</nb-option>
+        </nb-select>
       </nb-card-header>
-      <nb-card-body class="p-0">
-        <ngx-traffic-chart [points]="trafficChartPoints"></ngx-traffic-chart>
-      </nb-card-body>
+
+      <ngx-traffic-chart [points]="trafficChartPoints"></ngx-traffic-chart>
     </nb-card>
   `,
 })
diff --git a/src/app/pages/dashboard/weather/weather.component.html b/src/app/pages/dashboard/weather/weather.component.html
index eba1991463..5df699d484 100644
--- a/src/app/pages/dashboard/weather/weather.component.html
+++ b/src/app/pages/dashboard/weather/weather.component.html
@@ -1,58 +1,51 @@
 <nb-card size="medium">
   <nb-card-body>
-    <div class="location">
-      <span>New York</span>
+    <span class="h3 location">New York</span>
+    <span class="date">Mon 29 May</span>
+
+    <div class="today">
+      <span class="today-temperature h1">20&deg;</span>
+      <nb-icon icon="sun-outline" pack="eva" class="today-icon"></nb-icon>
     </div>
-    <div class="date">
-      <span>Mon 29 May</span>
-    </div>
-    <div class="daily-forecast">
-      <div class="info">
-        <div class="temperature">
-          <span>20&deg;</span>
-        </div>
-        <div class="icon">
-          <i class="ion-ios-sunny-outline"></i>
-        </div>
-      </div>
-      <div class="details">
-        <div class="parameter">
-          <span class="parameter-name">max</span>
-          <span class="parameter-value">23&deg;</span>
-        </div>
-        <div class="parameter">
-          <span class="parameter-name">min</span>
-          <span class="parameter-value">19&deg;</span>
-        </div>
-        <div class="parameter">
-          <span class="parameter-name">wind</span>
-          <span class="parameter-value">4 km/h</span>
-        </div>
-        <div class="parameter">
-          <span class="parameter-name">hum</span>
-          <span class="parameter-value">87%</span>
-        </div>
+
+    <div class="today-details">
+      <div class="parameter">
+        <span class="caption parameter-name">max</span>
+        <span class="parameter-value">23&deg;</span>
+      </div>
+      <div class="parameter">
+        <span class="caption parameter-name">min</span>
+        <span class="parameter-value">19&deg;</span>
+      </div>
+      <div class="parameter">
+        <span class="caption parameter-name">wind</span>
+        <span class="parameter-value">4 km/h</span>
+      </div>
+      <div class="parameter">
+        <span class="caption parameter-name">hum</span>
+        <span class="parameter-value">87%</span>
       </div>
     </div>
+
     <div class="weekly-forecast">
       <div class="day">
         <span class="caption">Sun</span>
-        <i class="ion-ios-cloudy-outline"></i>
+        <i class="weather-icon ion-ios-cloudy-outline"></i>
         <span class="temperature">17&deg;</span>
       </div>
       <div class="day">
         <span class="caption">Mon</span>
-        <i class="ion-ios-sunny-outline"></i>
+        <i class="weather-icon ion-ios-sunny-outline"></i>
         <span class="temperature">19&deg;</span>
       </div>
       <div class="day">
         <span class="caption">Tue</span>
-        <i class="ion-ios-rainy-outline"></i>
+        <i class="weather-icon ion-ios-rainy-outline"></i>
         <span class="temperature">22&deg;</span>
       </div>
       <div class="day">
         <span class="caption">Wed</span>
-        <i class="ion-ios-partlysunny-outline"></i>
+        <i class="weather-icon ion-ios-partlysunny-outline"></i>
         <span class="temperature">21&deg;</span>
       </div>
     </div>
diff --git a/src/app/pages/dashboard/weather/weather.component.scss b/src/app/pages/dashboard/weather/weather.component.scss
index 9173ceddd6..2ac7e09720 100644
--- a/src/app/pages/dashboard/weather/weather.component.scss
+++ b/src/app/pages/dashboard/weather/weather.component.scss
@@ -1,132 +1,76 @@
 @import '../../../@theme/styles/themes';
-@import '~@nebular/theme/styles/global/breakpoints';
-@import '~bootstrap/scss/mixins/breakpoints';
 
 @include nb-install-component() {
 
-  nb-card {
-    background-image: nb-theme(radial-gradient);
+  nb-card-body {
+    display: flex;
+    flex-direction: column;
   }
 
-  nb-card-body {
-    height: 100%;
-    padding: 2rem;
-    color: nb-theme(color-fg);
+  .location,
+  .date {
+    display: block;
   }
 
   .location {
-    font-family: nb-theme(font-secondary);
-    font-size: 2.5rem;
-    font-weight: nb-theme(font-weight-normal);
-    color: nb-theme(color-fg-heading);
+    margin-bottom: 0.1rem;
   }
 
-  .date {
-    font-family: nb-theme(font-main);
-    font-size: 1.25rem;
-    line-height: 1.25rem;
-    font-weight: nb-theme(font-weight-light);
+  .today {
+    display: flex;
+    justify-content: space-around;
   }
 
-  .daily-forecast {
+  .today-temperature {
     display: flex;
     flex-direction: column;
-    margin-top: -1.5rem;
-
-    .info {
-      display: flex;
-      justify-content: space-around;
-
-      .temperature {
-        font-size: 5rem;
-        font-weight: nb-theme(font-weight-bolder);
-        font-family: nb-theme(font-secondary);
-        color: nb-theme(color-fg-heading);
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        margin-top: 2rem;
-      }
-
-      .icon {
-        font-size: 10rem;
-        line-height: 10rem;
-        color: nb-theme(color-success);
-
-        @include nb-for-theme(cosmic) {
-          color: nb-theme(color-fg);
-          text-shadow: 0 3px 0 #665ebd,
-          0 4px 10px rgba(33, 7, 77, 0.5),
-          0 2px 10px #928dff;
-        }
+    justify-content: center;
+    margin: 2rem 1.5rem;
+  }
 
-        @include nb-for-theme(corporate) {
-          color: nb-theme(color-warning);
-        }
-      }
-    }
+  .today-icon {
+    color: nb-theme(color-primary-default);
+    font-size: 10rem;
+    line-height: 1;
+    margin-top: -4rem;
+    margin-left: auto;
+    margin-right: 0.4rem;
+  }
 
-    .details {
-      display: flex;
-      justify-content: space-around;
+  .today-details {
+    display: flex;
+    justify-content: space-around;
+    margin-top: 2rem;
+  }
 
-      .parameter {
-        display: flex;
-        flex-direction: column;
-        text-align: center;
+  .parameter {
+    flex: 1 1 auto;
+    text-align: center;
+  }
 
-        .parameter-name {
-          font-family: nb-theme(font-main);
-          font-size: 1.25rem;
-          font-weight: nb-theme(font-weight-light);
-          line-height: 2rem;
-        }
+  .parameter-name,
+  .parameter-value {
+    display: block;
+  }
 
-        .parameter-value {
-          font-family: nb-theme(font-secondary);
-          color: nb-theme(color-fg-heading);
-          font-weight: nb-theme(font-weight-bolder);
-        }
-      }
-    }
+  .caption {
+    text-transform: uppercase;
   }
 
   .weekly-forecast {
     display: flex;
     justify-content: space-around;
-    margin-top: 2rem;
-
-    .day {
-      display: flex;
-      flex-direction: column;
-      text-align: center;
-
-      .caption {
-        text-transform: uppercase;
-        font-family: nb-theme(font-secondary);
-        color: nb-theme(color-fg-heading);
-        font-weight: nb-theme(font-weight-bold);
-        font-size: 1.25rem;
-      }
-
-      i {
-        font-size: 2.5rem;
-        line-height: 2.5rem;
-      }
+    margin: auto 0;
+  }
 
-      .temperature {
-        color: nb-theme(color-fg-heading);
-        font-family: nb-theme(font-secondary);
-        font-weight: nb-theme(font-weight-bold);
-        font-size: 1.25rem;
-      }
-    }
+  .day {
+    display: flex;
+    flex-direction: column;
+    text-align: center;
   }
 
-  @include media-breakpoint-down(xs) {
-    nb-card-body {
-      padding-left: 1rem;
-      padding-right: 1rem;
-    }
+  .weather-icon {
+    font-size: 2.5rem;
+    line-height: 2.5rem;
   }
 }
diff --git a/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html b/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html
index d0811f8494..30bf039a73 100644
--- a/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html
+++ b/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html
@@ -1,20 +1,7 @@
-<div class="chart-header">
-  <ngx-legend-chart [legendItems]="chartLegend"></ngx-legend-chart>
+<ngx-legend-chart [legendItems]="chartLegend"></ngx-legend-chart>
 
-  <div class="dropdown"
-       [ngClass]="{ 'ghost-dropdown': currentTheme === 'corporate' }"
-       ngbDropdown>
-    <button type="button" ngbDropdownToggle class="btn"
-            [ngClass]="{
-              'btn-outline-success': currentTheme === 'default',
-              'btn-primary': currentTheme !== 'default',
-              'btn-sm': breakpoint.width <= breakpoints.is}">
-      {{ type }}
-    </button>
-    <ul class="dropdown-menu" ngbDropdownMenu>
-      <li class="dropdown-item" *ngFor="let period of types" (click)="changePeriod(period)">
-        {{ period }}
-      </li>
-    </ul>
-  </div>
-</div>
+<nb-select class="period-select" [selected]="type" (selectedChange)="changePeriod($event)">
+  <nb-option *ngFor="let period of types" [value]="period">
+    {{ period }}
+  </nb-option>
+</nb-select>
diff --git a/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss b/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
index 273fdfa12e..52cb2cab98 100644
--- a/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
+++ b/src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
@@ -3,39 +3,23 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-  .chart-header {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 2.125rem;
-    align-items: center;
-  }
+  padding: 1.5rem 4.5rem;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  margin: -1rem;
 
-  .dropdown {
-    min-width: 8.125rem;
+  ngx-legend-chart,
+  .period-select {
+    padding-top: 1rem;
+    @include nb-ltr(padding-left, 0.5rem);
+    @include nb-rtl(padding-right, 0.5rem);
   }
 
-  @include media-breakpoint-down(is) {
-    .chart-header {
-      flex-direction: column-reverse;
-    }
-
-    ngx-legend-chart {
-      align-self: flex-start;
-
-      /deep/ .legends {
-        padding-left: 0;
-        font-size: nb-theme(font-size-sm);
-      }
-
-      /deep/ .legend {
-        margin-left: 1rem;
-      }
-    }
-
-    .dropdown {
-      margin-top: 1.5rem;
-      margin-bottom: 1.5rem;
-      align-self: flex-end;
+  @include media-breakpoint-up(md) {
+    .period-select {
+      @include nb-ltr(margin-left, auto);
+      @include nb-rtl(margin-right, auto);
     }
   }
 }
diff --git a/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss b/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
index 433b7e9d24..dd8509a1ef 100644
--- a/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
+++ b/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.scss
@@ -1,51 +1,15 @@
 @import '../../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
   .summary-container {
     display: flex;
+    flex-wrap: wrap;
     flex: 1;
-    background-color: nb-theme(chart-panel-summary-background-color);
-    box-shadow: nb-theme(chart-panel-summary-box-shadow);
+    background-color: nb-theme(background-basic-color-2);
     justify-content: space-between;
     padding: 1.5rem 4rem 1rem;
-    margin-bottom: 1rem;
-    border:
-      nb-theme(chart-panel-summary-border-width)
-      solid
-      nb-theme(chart-panel-summary-border-color);
+    border: 1px solid nb-theme(border-basic-color-3);
     border-left: none;
     border-right: none;
   }
-
-  .value {
-    font-size: 2rem;
-    color: nb-theme(color-fg-heading);
-  }
-
-  @include media-breakpoint-down(sm) {
-    .value, .title {
-      font-weight: nb-theme(font-weight-bold);
-    }
-
-    .title {
-      font-size: nb-theme(font-size-sm);
-    }
-
-    .value {
-      font-size: nb-theme(font-size-xlg);
-    }
-  }
-
-  @include media-breakpoint-down(is) {
-    .summary-container {
-      padding-left: nb-theme(padding);
-      padding-right: nb-theme(padding);
-    }
-
-    .value {
-      margin-top: 0.5rem;
-    }
-  }
 }
diff --git a/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.ts b/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.ts
index f53a297305..bb1c2f7197 100644
--- a/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.ts
+++ b/src/app/pages/e-commerce/charts-panel/chart-panel-summary/chart-panel-summary.component.ts
@@ -5,9 +5,9 @@ import { Component, Input } from '@angular/core';
   styleUrls: ['./chart-panel-summary.component.scss'],
   template: `
     <div class="summary-container">
-      <div class="summory" *ngFor="let item of summary">
-        <div class="title">{{ item.title }}</div>
-        <div class="value">{{ item.value }}</div>
+      <div *ngFor="let item of summary">
+        <div>{{ item.title }}</div>
+        <div class="h6">{{ item.value }}</div>
       </div>
     </div>
   `,
diff --git a/src/app/pages/e-commerce/charts-panel/charts-panel.component.scss b/src/app/pages/e-commerce/charts-panel/charts-panel.component.scss
index cce1459fba..acf1a9025e 100644
--- a/src/app/pages/e-commerce/charts-panel/charts-panel.component.scss
+++ b/src/app/pages/e-commerce/charts-panel/charts-panel.component.scss
@@ -6,19 +6,24 @@ $legend-canceled-color: #3f4fda;
 
 @include nb-install-component() {
 
-  /deep/ nb-tabset {
+  nb-tabset {
     display: flex;
     flex-direction: column;
     flex: 1;
 
-    ul {
-      border-bottom: none;
+    ::ng-deep ul {
+      // make same size as card header
+      border-color: transparent;
+      padding-bottom: 1px;
+      .tab-link {
+        padding: 1.25rem 2rem;
+      }
     }
   }
 
   nb-tab {
     flex: 1;
-    padding-bottom: 1.25rem;
+    padding: 0 0 1.25rem;
   }
 
   .chart-container {
@@ -29,7 +34,8 @@ $legend-canceled-color: #3f4fda;
     overflow: hidden;
   }
 
-  ngx-chart-panel-header, ngx-profit-chart, ngx-orders-chart {
+  ngx-profit-chart,
+  ngx-orders-chart {
     padding: 0 1.25rem;
   }
 }
diff --git a/src/app/pages/e-commerce/charts-panel/charts-panel.component.ts b/src/app/pages/e-commerce/charts-panel/charts-panel.component.ts
index b2bb283f04..3e95930417 100644
--- a/src/app/pages/e-commerce/charts-panel/charts-panel.component.ts
+++ b/src/app/pages/e-commerce/charts-panel/charts-panel.component.ts
@@ -21,8 +21,8 @@ export class ECommerceChartsPanelComponent implements OnDestroy {
   ordersChartData: OrdersChart;
   profitChartData: ProfitChart;
 
-  @ViewChild('ordersChart') ordersChart: OrdersChartComponent;
-  @ViewChild('profitChart') profitChart: ProfitChartComponent;
+  @ViewChild('ordersChart', { static: true }) ordersChart: OrdersChartComponent;
+  @ViewChild('profitChart', { static: true }) profitChart: ProfitChartComponent;
 
   constructor(private ordersProfitChartService: OrdersProfitChartData) {
     this.ordersProfitChartService.getOrderProfitChartSummary()
diff --git a/src/app/pages/e-commerce/charts-panel/charts/charts-common.component.scss b/src/app/pages/e-commerce/charts-panel/charts/charts-common.component.scss
index bea72d8ff1..744a2377a7 100644
--- a/src/app/pages/e-commerce/charts-panel/charts/charts-common.component.scss
+++ b/src/app/pages/e-commerce/charts-panel/charts/charts-common.component.scss
@@ -1,9 +1,7 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  display: block;
-  height: 100%;
-  width: 100%;
+  flex: 1;
 
   .echart {
     display: block;
diff --git a/src/app/pages/e-commerce/charts-panel/charts/orders-chart.component.ts b/src/app/pages/e-commerce/charts-panel/charts/orders-chart.component.ts
index 10932a4494..45a591550c 100644
--- a/src/app/pages/e-commerce/charts-panel/charts/orders-chart.component.ts
+++ b/src/app/pages/e-commerce/charts-panel/charts/orders-chart.component.ts
@@ -80,7 +80,7 @@ export class OrdersChartComponent implements AfterViewInit, OnDestroy, OnChanges
         position: 'top',
         backgroundColor: eTheme.tooltipBg,
         borderColor: eTheme.tooltipBorderColor,
-        borderWidth: 3,
+        borderWidth: 1,
         formatter: (params) => {
           return Math.round(parseInt(params.value, 10));
         },
diff --git a/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss b/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss
index 9cb1b3bb5a..f323ef3483 100644
--- a/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss
+++ b/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss
@@ -8,33 +8,16 @@
   height: 100%;
   flex: 1;
   padding: nb-theme(card-padding);
-  border-left:
-    nb-theme(card-header-border-width)
-    nb-theme(card-header-border-type)
-    nb-theme(card-header-border-color);
 
   .header {
     margin-left: 1rem;
   }
 
-  .title {
-    font-family: nb-theme(card-header-font-family);
-    color: nb-theme(color-fg);
-  }
-
   .echart {
-    height: 85%;
+    height: 75%;
   }
 
   @include media-breakpoint-down(sm) {
     height: 50%;
-    border-top:
-      nb-theme(card-border-width)
-      nb-theme(card-header-border-type)
-      nb-theme(card-header-border-color);
-
-    .echart {
-      height: 75%;
-    }
   }
 }
diff --git a/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts b/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts
index 53c00251ae..c55a73905f 100644
--- a/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts
+++ b/src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts
@@ -9,8 +9,8 @@ import { LayoutService } from '../../../../@core/utils/layout.service';
   styleUrls: ['./country-orders-chart.component.scss'],
   template: `
     <div class="header">
-      <span class="title">Selected Country/Region</span>
-      <h2>{{countryName}}</h2>
+      <span class="caption">Selected Country/Region</span>
+      <h2 class="h4">{{ countryName }}</h2>
     </div>
     <div echarts
          [options]="option"
diff --git a/src/app/pages/e-commerce/country-orders/country-orders.component.ts b/src/app/pages/e-commerce/country-orders/country-orders.component.ts
index a61a31388b..21a1f39db5 100644
--- a/src/app/pages/e-commerce/country-orders/country-orders.component.ts
+++ b/src/app/pages/e-commerce/country-orders/country-orders.component.ts
@@ -7,7 +7,7 @@ import { CountryOrderData } from '../../../@core/data/country-order';
   selector: 'ngx-country-orders',
   styleUrls: ['./country-orders.component.scss'],
   template: `
-    <nb-card [size]="breakpoint.width >= breakpoints.md ? 'medium' : 'xxlarge'">
+    <nb-card [size]="breakpoint.width >= breakpoints.md ? 'medium' : 'giant'">
       <nb-card-header>Country Orders Statistics</nb-card-header>
       <nb-card-body>
         <ngx-country-orders-map (select)="selectCountryById($event)"
diff --git a/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss b/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss
index 0361b33f63..4971ddec0f 100644
--- a/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss
+++ b/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss
@@ -10,61 +10,44 @@
 
   .leaflet-container {
     height: 100%;
-    background-color: nb-theme(layout-bg);
-
-    @include nb-for-theme(default) {
-      background-color: nb-theme(color-white);
-    }
-
-    @include nb-for-theme(corporate) {
-      background-color: nb-theme(color-white);
-    }
+    background-color: nb-theme(background-basic-color-2);
   }
 
-  /deep/ .leaflet-top, /deep/ .leaflet-bottom {
+  ::ng-deep .leaflet-top, ::ng-deep .leaflet-bottom {
     z-index: 997;
   }
 
-  /deep/ .leaflet-bar {
+  ::ng-deep .leaflet-bar {
     box-shadow: none;
   }
 
-  /deep/ .leaflet-control-zoom {
+  ::ng-deep .leaflet-control-zoom {
     border: none;
 
     a {
-      background-color: nb-theme(color-success);
-      color: nb-theme(color-white);
+      background-color: nb-theme(color-primary-default);
+      color: nb-theme(text-alternate-color);
       border-bottom: none;
-      height: 2.5rem;
-
-      @include nb-for-theme(cosmic) {
-        background-color: nb-theme(color-primary);
-      }
+    }
 
-      @include nb-for-theme(corporate) {
-        background-color: nb-theme(color-primary);
-      }
+    .leaflet-disabled {
+      background-color: nb-theme(color-primary-disabled);
     }
 
     .leaflet-control-zoom-in {
-      border-top-left-radius: nb-theme(btn-border-radius);
-      border-top-right-radius: nb-theme(btn-border-radius);
+      border-top-left-radius: nb-theme(button-rectangle-border-radius);
+      border-top-right-radius: nb-theme(button-rectangle-border-radius);
     }
 
     .leaflet-control-zoom-out {
       margin-top: 1px;
-      border-bottom-left-radius: nb-theme(btn-border-radius);
-      border-bottom-right-radius: nb-theme(btn-border-radius);
+      border-bottom-left-radius: nb-theme(button-rectangle-border-radius);
+      border-bottom-right-radius: nb-theme(button-rectangle-border-radius);
     }
   }
 
-  /deep/ .leaflet-control-attribution {
+  ::ng-deep .leaflet-control-attribution {
     background: transparent;
-
-    a {
-      color: nb-theme(color-fg);
-    }
   }
 
   @include media-breakpoint-down(sm) {
diff --git a/src/app/pages/e-commerce/country-orders/map/country-orders-map.service.ts b/src/app/pages/e-commerce/country-orders/map/country-orders-map.service.ts
index 2dcdf525b8..9bb3fc54b4 100644
--- a/src/app/pages/e-commerce/country-orders/map/country-orders-map.service.ts
+++ b/src/app/pages/e-commerce/country-orders/map/country-orders-map.service.ts
@@ -9,7 +9,7 @@ export class CountryOrdersMapService {
   constructor(private http: HttpClient) {}
 
   getCords(): Observable<any> {
-    return this.http.get('./assets/leaflet-countries/countries.geo.json');
+    return this.http.get('assets/leaflet-countries/countries.geo.json');
   }
 
 }
diff --git a/src/app/pages/e-commerce/e-commerce.module.ts b/src/app/pages/e-commerce/e-commerce.module.ts
index 04001f3137..c3f8ef2a1b 100644
--- a/src/app/pages/e-commerce/e-commerce.module.ts
+++ b/src/app/pages/e-commerce/e-commerce.module.ts
@@ -1,4 +1,14 @@
 import { NgModule } from '@angular/core';
+import {
+  NbButtonModule,
+  NbCardModule,
+  NbProgressBarModule,
+  NbTabsetModule,
+  NbUserModule,
+  NbIconModule,
+  NbSelectModule,
+  NbListModule,
+} from '@nebular/theme';
 import { NgxEchartsModule } from 'ngx-echarts';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
@@ -49,7 +59,15 @@ import { EarningLiveUpdateChartComponent } from './earning-card/front-side/earni
 @NgModule({
   imports: [
     ThemeModule,
+    NbCardModule,
+    NbUserModule,
+    NbButtonModule,
+    NbIconModule,
+    NbTabsetModule,
+    NbSelectModule,
+    NbListModule,
     ChartModule,
+    NbProgressBarModule,
     NgxEchartsModule,
     NgxChartsModule,
     LeafletModule,
diff --git a/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.html b/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.html
index c9479fcf9c..182dcc368c 100644
--- a/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.html
+++ b/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.html
@@ -3,9 +3,9 @@
 </nb-card-header>
 <nb-card-body>
   <div class="chart-info">
-    <div class="title" [style.color]="color">{{ name }}</div>
-    <div class="time-period">Last week</div>
-    <div class="value">{{ value }}%</div>
+    <div [style.color]="color">{{ name }}</div>
+    <div class="time-period caption">Last week:</div>
+    <div class="h6">{{ value }}%</div>
   </div>
   <ngx-earning-pie-chart [values]="earningPieChartData"
                          (selectPie)="changeChartInfo($event)"
diff --git a/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss b/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss
index d835e2099a..231576c843 100644
--- a/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss
+++ b/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss
@@ -3,11 +3,8 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-  nb-card-header {
-    flex-direction: row;
-  }
-
-  ngx-earning-pie-chart, .chart-info {
+  ngx-earning-pie-chart,
+  .chart-info {
     flex: 1;
   }
 
@@ -15,26 +12,18 @@
     padding-top: 0.7rem;
   }
 
-  .title {
-    font-size: nb-theme(font-size-xlg);
-  }
-
   .time-period {
     margin-top: 1.5rem;
-    color: nb-theme(color-fg);
   }
 
   .value {
     margin-top: 0.2rem;
-    font-size: 1.5rem;
-    font-weight: nb-theme(font-weight-bold);
-    color: nb-theme(color-fg-heading);
   }
 
   .echart {
     position: absolute;
-    width: calc(50% - #{nb-theme(card-padding)});
-    height: calc(100% - 2 * #{nb-theme(card-padding)});
+    width: calc(50% - 1.25rem);
+    height: calc(100% - 2rem);
   }
 
   @include media-breakpoint-between(xl, xl) {
diff --git a/src/app/pages/e-commerce/earning-card/earning-card.component.html b/src/app/pages/e-commerce/earning-card/earning-card.component.html
index d3ff8337ad..af143d4d43 100644
--- a/src/app/pages/e-commerce/earning-card/earning-card.component.html
+++ b/src/app/pages/e-commerce/earning-card/earning-card.component.html
@@ -1,14 +1,14 @@
 <nb-flip-card [showToggleButton]="false" [flipped]="flipped">
   <nb-card-front>
-    <nb-card size="xsmall">
+    <nb-card size="tiny">
       <ngx-earning-card-front></ngx-earning-card-front>
-      <i class="nb-arrow-right" (click)="toggleFlipView()"></i>
+      <nb-icon icon="chevron-right-outline" pack="eva" class="flip-icon" (click)="toggleView()"></nb-icon>
     </nb-card>
   </nb-card-front>
   <nb-card-back>
-    <nb-card size="xsmall">
+    <nb-card size="tiny">
       <ngx-earning-card-back></ngx-earning-card-back>
-      <i class="nb-arrow-right" (click)="toggleFlipView()"></i>
+      <nb-icon icon="chevron-right-outline" pack="eva" class="flip-icon" (click)="toggleView()"></nb-icon>
     </nb-card>
   </nb-card-back>
 </nb-flip-card>
diff --git a/src/app/pages/e-commerce/earning-card/earning-card.component.scss b/src/app/pages/e-commerce/earning-card/earning-card.component.scss
index 3b37d85418..293d2717ec 100644
--- a/src/app/pages/e-commerce/earning-card/earning-card.component.scss
+++ b/src/app/pages/e-commerce/earning-card/earning-card.component.scss
@@ -5,44 +5,37 @@
     position: relative;
   }
 
-  .nb-arrow-right {
+  .flip-icon {
     position: absolute;
-    top: 0;
-    right: 0;
+    right: 0.625rem;
+    top: 1rem;
     @include nb-rtl(right, auto);
-    @include nb-rtl(left, 0);
-    padding: 1.5rem;
+    @include nb-rtl(left, 0.625rem);
     cursor: pointer;
   }
 
-  /deep/ .flipped {
+  ::ng-deep .flipped {
     .back-container {
-      .nb-arrow-right {
+      .flip-icon {
         transform: scaleX(-1);
       }
     }
 
     .front-container {
-      .nb-arrow-right {
+      .flip-icon {
         display: none;
       }
     }
   }
 
-  ngx-earning-card-back, ngx-earning-card-front {
+  ngx-earning-card-back,
+  ngx-earning-card-front {
     display: flex;
     flex-direction: column;
     flex: 1;
   }
 
-  /deep/ nb-card-header {
-    display: flex;
-    justify-content: space-between;
-    @include nb-rtl(flex-direction, row-reverse);
-    padding-left: 1rem;
-  }
-
-  /deep/ nb-card-body {
+  ::ng-deep nb-card-body {
     overflow: hidden;
     display: flex;
   }
diff --git a/src/app/pages/e-commerce/earning-card/earning-card.component.ts b/src/app/pages/e-commerce/earning-card/earning-card.component.ts
index fbe4f52fb6..ec1c8b8508 100644
--- a/src/app/pages/e-commerce/earning-card/earning-card.component.ts
+++ b/src/app/pages/e-commerce/earning-card/earning-card.component.ts
@@ -9,7 +9,7 @@ export class EarningCardComponent {
 
   flipped = false;
 
-  toggleFlipView() {
+  toggleView() {
     this.flipped = !this.flipped;
   }
 }
diff --git a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html
index ea1db0d50a..0f93231837 100644
--- a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html
+++ b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html
@@ -1,23 +1,19 @@
 <nb-card-header>
-  <div class="dropdown ghost-dropdown" ngbDropdown>
-    <button type="button" ngbDropdownToggle class="btn"
-            [ngClass]="{
-              'btn-success': currentTheme === 'default',
-              'btn-primary': currentTheme !== 'default'}">
-      {{ selectedCurrency }}
-    </button>
-    <ul class="dropdown-menu" ngbDropdownMenu>
-      <li class="dropdown-item" *ngFor="let currency of currencies" (click)="changeCurrency(currency)">{{ currency }}</li>
-    </ul>
-  </div>
+  <nb-select [selected]="selectedCurrency" (selectedChange)="changeCurrency($event)">
+    <nb-option *ngFor="let currency of currencies" [value]="currency">{{ currency }}</nb-option>
+  </nb-select>
 </nb-card-header>
 <nb-card-body>
   <div class="chart-info">
-    <div class="title">Daily Income</div>
-    <div class="value">{{ earningLiveUpdateCardData.dailyIncome | ngxNumberWithCommas }}</div>
+    <div>Daily Income</div>
+    <div class="h6">{{ earningLiveUpdateCardData.dailyIncome | ngxNumberWithCommas }}</div>
     <div class="delta"
          [class.up]="earningLiveUpdateCardData.delta.up"
          [class.down]="!earningLiveUpdateCardData.delta.up">
+      <nb-icon [icon]="earningLiveUpdateCardData.delta.up ? 'arrow-up' : 'arrow-down'"
+               pack="eva"
+               class="direction">
+      </nb-icon>
       {{ earningLiveUpdateCardData.delta.value }}%
     </div>
   </div>
diff --git a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss
index 77acaf1e11..f825da3dac 100644
--- a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss
+++ b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss
@@ -8,12 +8,8 @@
 
   nb-card-header {
     flex-direction: row;
-    padding-top: 0.45rem;
-    padding-bottom: 0.45rem;
-  }
-
-  .dropdown {
-    min-width: 8.125rem;
+    padding-top: nb-theme(card-header-with-select-padding-top);
+    padding-bottom: nb-theme(card-header-with-select-padding-bottom);
   }
 
   nb-card-body {
@@ -29,87 +25,37 @@
     margin: 0 nb-theme(card-padding);
   }
 
-  .title {
-    color: nb-theme(color-fg-heading);
-  }
-
-  .value {
-    color: nb-theme(color-success);
-    font-size: 1.5rem;
-
-    @include nb-for-theme(corporate) {
-      color: nb-theme(color-primary);
+  .delta {
+    &.up .direction {
+      color: nb-theme(color-success-default);
+    }
+    &.down .direction {
+      color: nb-theme(color-danger-default);
     }
   }
 
   .delta {
     position: absolute;
     display: inline-block;
-    color: nb-theme(color-fg-heading);
-    padding-left: 0.5rem;
-    font-size: 1rem;
     top: 0;
     right: 0;
-    @include nb-rtl(left, 1.25rem);
-    @include nb-rtl(right, inherit);
-
-    &::before {
-      position: absolute;
-      content: '';
-      right: 100%;
-      border-left: 6px solid transparent;
-      border-right: 6px solid transparent;
-    }
-
-    &.down {
-      &::before {
-        bottom: 4px;
-        border-top: 7px solid text-danger();
-      }
-    }
-
-    &.up {
-      &::before {
-        top: 4px;
-        border-bottom: 7px solid text-success();
-      }
-    }
+    @include nb-rtl(left, 0);
+    @include nb-rtl(right, auto);
   }
 
   ngx-earning-live-update-chart {
     flex: 1;
     position: relative;
-  }
-
-  /deep/ canvas {
-    border-bottom-left-radius: nb-theme(card-border-radius);
-    border-bottom-right-radius: nb-theme(card-border-radius);
-  }
 
-  .echart {
-    position: absolute;
-    height: 100%;
-    width: 100%;
-  }
-
-  @include nb-for-theme(corporate) {
-    .delta {
-      &.down {
-        color: text-danger();
-
-        &::before {
-          bottom: 4px;
-          border-top: 7px solid text-danger();
-        }
+    ::ng-deep {
+      canvas {
+        border-bottom-left-radius: nb-theme(card-border-radius);
+        border-bottom-right-radius: nb-theme(card-border-radius);
       }
-
-      &.up {
-        color: text-primary();
-
-        &::before {
-          top: 4px;
-          border-bottom: 7px solid text-primary();
-        }
+      .echart {
+        position: absolute;
+        height: 100%;
+        width: 100%;
       }
     }
   }
diff --git a/src/app/pages/e-commerce/legend-chart/legend-chart.component.html b/src/app/pages/e-commerce/legend-chart/legend-chart.component.html
index 7edacd5383..a581ce5650 100644
--- a/src/app/pages/e-commerce/legend-chart/legend-chart.component.html
+++ b/src/app/pages/e-commerce/legend-chart/legend-chart.component.html
@@ -1,7 +1,5 @@
-<div class="legends">
-  <div *ngFor="let legend of legendItems" class="legend">
-    <div class="legend-item-color"
-         [style.background]="legend.iconColor"></div>
-    <div class="legend-title">{{ legend.title }}</div>
-  </div>
+<div *ngFor="let legend of legendItems" class="legend">
+  <div class="legend-item-color"
+       [style.background]="legend.iconColor"></div>
+  <div class="legend-title">{{ legend.title }}</div>
 </div>
diff --git a/src/app/pages/e-commerce/legend-chart/legend-chart.component.scss b/src/app/pages/e-commerce/legend-chart/legend-chart.component.scss
index e28a1409f8..c8a6dfe644 100644
--- a/src/app/pages/e-commerce/legend-chart/legend-chart.component.scss
+++ b/src/app/pages/e-commerce/legend-chart/legend-chart.component.scss
@@ -3,21 +3,17 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-  .legends {
-    display: flex;
-    @include nb-rtl(flex-direction, row-reverse);
-    color: nb-theme(color-fg);
-    padding: 0 0 0 2.85rem;
-  }
+  display: flex;
+  flex-wrap: wrap;
 
   .legend {
     display: flex;
     justify-content: space-between;
-    align-items: baseline;
-    margin-left: 4rem;
+    align-items: center;
 
-    &:first-child {
-      margin-left: 0;
+    &:not(:last-child) {
+      @include nb-ltr(margin-right, 1rem);
+      @include nb-rtl(margin-left, 1rem);
     }
   }
 
@@ -28,13 +24,8 @@
   }
 
   .legend-title {
-    padding: 0 0.75rem;
+    @include nb-ltr(padding-left, 0.75rem);
+    @include nb-rtl(padding-right, 0.75rem);
     white-space: nowrap;
   }
-
-  @include media-breakpoint-down(md) {
-    .legend {
-      margin-left: 1.5rem;
-    }
-  }
 }
diff --git a/src/app/pages/e-commerce/profit-card/back-side/stats-area-chart.component.ts b/src/app/pages/e-commerce/profit-card/back-side/stats-area-chart.component.ts
index e5c202aadf..0c30ed47c3 100644
--- a/src/app/pages/e-commerce/profit-card/back-side/stats-area-chart.component.ts
+++ b/src/app/pages/e-commerce/profit-card/back-side/stats-area-chart.component.ts
@@ -66,8 +66,7 @@ export class StatsAreaChartComponent implements AfterViewInit, OnDestroy {
             splitLine: {
               show: true,
               lineStyle: {
-                color: trafficTheme.colorBlack,
-                opacity: 0.06,
+                color: trafficTheme.yAxisSplitLine,
                 width: '1',
               },
             },
@@ -84,7 +83,7 @@ export class StatsAreaChartComponent implements AfterViewInit, OnDestroy {
             position: 'top',
             backgroundColor: trafficTheme.tooltipBg,
             borderColor: trafficTheme.tooltipBorderColor,
-            borderWidth: 3,
+            borderWidth: 1,
             formatter: '$ {c0}',
             extraCssText: trafficTheme.tooltipExtraCss,
           },
diff --git a/src/app/pages/e-commerce/profit-card/back-side/stats-card-back.component.html b/src/app/pages/e-commerce/profit-card/back-side/stats-card-back.component.html
index 295d9862ef..821f6b0870 100644
--- a/src/app/pages/e-commerce/profit-card/back-side/stats-card-back.component.html
+++ b/src/app/pages/e-commerce/profit-card/back-side/stats-card-back.component.html
@@ -1,25 +1,19 @@
 <nb-card-header>
-  <div class="header-container">
-    <div class="icon">
-      <i class="ion-social-usd"></i>
-    </div>
-    <span class="title">Profit</span>
-  </div>
+  <i class="ion-social-usd"></i>
+  <span class="title">Profit</span>
 </nb-card-header>
-<nb-card-body class="p-0">
+<nb-card-body>
   <div class="info">
     <div class="period">
-      <span class="time-interval">Jun 1 - Jun 30</span>
-      <div class="value">
-        <span class="currency">$</span>
-        300
+      <div class="caption">Jun 1 - Jun 30</div>
+      <div class="label">
+        <span class="currency">$</span>300
       </div>
     </div>
     <div class="period latest">
-      <span class="time-interval">Jul 1 - Jul 31</span>
-      <div class="value">
-        <span class="currency">$</span>
-        860
+      <div class="caption">Jul 1 - Jul 31</div>
+      <div class="label">
+        <span class="currency">$</span>860
       </div>
     </div>
   </div>
diff --git a/src/app/pages/e-commerce/profit-card/back-side/stats-card-back.component.scss b/src/app/pages/e-commerce/profit-card/back-side/stats-card-back.component.scss
index dbd1684141..23f37b27ef 100644
--- a/src/app/pages/e-commerce/profit-card/back-side/stats-card-back.component.scss
+++ b/src/app/pages/e-commerce/profit-card/back-side/stats-card-back.component.scss
@@ -5,80 +5,47 @@
   flex-direction: column;
   flex: 1;
 
-  /deep/ nb-card-header {
-    display: flex;
-    justify-content: space-between;
-
-    .header-container {
-      display: flex;
-      @include nb-rtl(flex-direction, row-reverse);
-    }
-
-    .title {
-      padding-left: 1rem;
-    }
+  .title {
+    padding-left: 0.5rem;
   }
 
-  /deep/ nb-card-body {
-    overflow: hidden;
-
+  nb-card-body {
     display: flex;
     flex-direction: column;
+    padding: 0;
+    overflow: hidden;
+  }
 
-    .info {
-      padding: 0.75rem;
-      padding-bottom: 0.5rem;
-      display: flex;
-      @include nb-rtl(flex-direction, row-reverse);
-    }
-
-    .period {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-
-      &.latest {
-        padding-left: 0.75rem;
-      }
-    }
-
-    .time-interval {
-      color: nb-theme(color-fg);
-    }
-
-    .value {
-      font-family: nb-theme(font-secondary), serif;
-      font-size: 1.25rem;
-      font-weight: nb-theme(font-weight-bold);
-      color: nb-theme(card-fg-heading);
-
-      @include nb-for-theme(default) {
-        color: nb-theme(color-success);
-      }
+  .info {
+    display: flex;
+    @include nb-rtl(flex-direction, row-reverse);
+    justify-content: space-between;
+    padding: 0.75rem 0.75rem 0.5rem;
+  }
 
-      .currency {
-        color: nb-theme(color-success);
+  .period {
+    width: 49%;
+  }
 
-        @include nb-for-theme(corporate) {
-          color: nb-theme(color-primary);
-        }
-      }
-    }
+  .currency {
+    padding-right: 0.25rem;
   }
 
   ngx-stats-ares-chart {
     flex: 1;
     position: relative;
-  }
 
-  /deep/ canvas {
-    border-bottom-left-radius: nb-theme(card-border-radius);
-    border-bottom-right-radius: nb-theme(card-border-radius);
-  }
+    ::ng-deep {
+      .echart {
+        position: absolute;
+        height: 100%;
+        width: 100%;
+      }
 
-  .echart {
-    position: absolute;
-    height: 100%;
-    width: 100%;
+      canvas {
+        border-bottom-left-radius: nb-theme(card-border-radius);
+        border-bottom-right-radius: nb-theme(card-border-radius);
+      }
+    }
   }
 }
diff --git a/src/app/pages/e-commerce/profit-card/front-side/stats-card-front.component.html b/src/app/pages/e-commerce/profit-card/front-side/stats-card-front.component.html
index 8b9ba14341..246dfeac92 100644
--- a/src/app/pages/e-commerce/profit-card/front-side/stats-card-front.component.html
+++ b/src/app/pages/e-commerce/profit-card/front-side/stats-card-front.component.html
@@ -1,10 +1,6 @@
 <nb-card-header>
-  <div class="header-container">
-    <div class="icon">
-      <i class="ion-social-usd"></i>
-    </div>
-    <span class="title">Profit</span>
-  </div>
+  <i class="ion-social-usd"></i>
+  <span class="title">Profit</span>
 </nb-card-header>
 <nb-card-body>
   <ngx-stats-bar-animation-chart [linesData]="linesData"></ngx-stats-bar-animation-chart>
diff --git a/src/app/pages/e-commerce/profit-card/front-side/stats-card-front.component.scss b/src/app/pages/e-commerce/profit-card/front-side/stats-card-front.component.scss
index 6cb93398a0..03c74d6643 100644
--- a/src/app/pages/e-commerce/profit-card/front-side/stats-card-front.component.scss
+++ b/src/app/pages/e-commerce/profit-card/front-side/stats-card-front.component.scss
@@ -5,74 +5,26 @@
   flex-direction: column;
   flex: 1;
 
-  /deep/ nb-card-header {
-    display: flex;
-    justify-content: space-between;
-
-    .header-container {
-      display: flex;
-      @include nb-rtl(flex-direction, row-reverse);
-    }
+  .title {
+    padding-left: 0.5rem;
+  }
 
-    .title {
-      padding-left: 1rem;
-    }
+  nb-card-header {
+    margin-bottom: -1px;
   }
 
-  /deep/ nb-card-body {
-    display: flex;
+  nb-card-body {
     position: relative;
-    flex: 1;
     padding: 0;
     overflow: hidden;
+  }
 
-    .period {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      justify-content: flex-end;
-    }
-
-    .time-interval {
-      font-size: nb-theme(font-size-sm);
-      color: nb-theme(color-fg);
-      white-space: nowrap;
-    }
-
-    .value {
-      font-family: nb-theme(font-secondary), serif;
-      font-weight: nb-theme(font-weight-bold);
-      color: nb-theme(card-fg-heading);
-
-      .currency {
-        color: nb-theme(color-success);
-
-        @include nb-for-theme(corporate) {
-          color: nb-theme(color-primary);
-        }
-      }
-    }
-
-    .start-period {
-      .time-interval, .value {
-        text-align: right;
-      }
-    }
-
-    .end-period {
-      .time-interval, .value {
-        text-align: left;
-      }
-    }
-
-    ngx-stats-bar-animation-chart {
-      flex: 1;
-      position: relative;
+  ngx-stats-bar-animation-chart {
+    position: relative;
 
-      .echart {
-        height: 100%;
-        width: 100%;
-      }
+    ::ng-deep .echart {
+      height: 100%;
+      width: 100%;
     }
   }
 }
diff --git a/src/app/pages/e-commerce/profit-card/profit-card.component.html b/src/app/pages/e-commerce/profit-card/profit-card.component.html
index 50e9a1779c..31d0feec19 100644
--- a/src/app/pages/e-commerce/profit-card/profit-card.component.html
+++ b/src/app/pages/e-commerce/profit-card/profit-card.component.html
@@ -1,14 +1,14 @@
 <nb-flip-card [showToggleButton]="false" [flipped]="flipped">
   <nb-card-front>
-    <nb-card size="xsmall">
+    <nb-card size="tiny">
       <ngx-stats-card-front></ngx-stats-card-front>
-      <i class="nb-arrow-right" (click)="toggleView()"></i>
+      <nb-icon icon="chevron-right-outline" pack="eva" class="flip-icon" (click)="toggleView()"></nb-icon>
     </nb-card>
   </nb-card-front>
   <nb-card-back>
-    <nb-card size="xsmall">
+    <nb-card size="tiny">
       <ngx-stats-card-back></ngx-stats-card-back>
-      <i class="nb-arrow-right" (click)="toggleView()"></i>
+      <nb-icon icon="chevron-right-outline" pack="eva" class="flip-icon" (click)="toggleView()"></nb-icon>
     </nb-card>
   </nb-card-back>
 </nb-flip-card>
diff --git a/src/app/pages/e-commerce/profit-card/profit-card.component.scss b/src/app/pages/e-commerce/profit-card/profit-card.component.scss
index 3e6d07ed30..ed0bf32cdb 100644
--- a/src/app/pages/e-commerce/profit-card/profit-card.component.scss
+++ b/src/app/pages/e-commerce/profit-card/profit-card.component.scss
@@ -1,25 +1,24 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  .nb-arrow-right {
+  .flip-icon {
     position: absolute;
-    right: 0;
-    top: 0;
+    right: 0.625rem;
+    top: 1rem;
     @include nb-rtl(right, auto);
-    @include nb-rtl(left, 0);
-    padding: 1.5rem;
+    @include nb-rtl(left, 0.625rem);
     cursor: pointer;
   }
 
   ::ng-deep .flipped {
     .back-container {
-      .nb-arrow-right {
+      .flip-icon {
         transform: scaleX(-1);
       }
     }
 
     .front-container {
-      .nb-arrow-right {
+      .flip-icon {
         display: none;
       }
     }
diff --git a/src/app/pages/e-commerce/progress-section/progress-section.component.html b/src/app/pages/e-commerce/progress-section/progress-section.component.html
index 66f6c06c09..137ef06caa 100644
--- a/src/app/pages/e-commerce/progress-section/progress-section.component.html
+++ b/src/app/pages/e-commerce/progress-section/progress-section.component.html
@@ -2,9 +2,9 @@
   <nb-card-body>
     <div class="progress-info" *ngFor="let item of progressInfoData">
       <div class="title">{{ item.title }}</div>
-      <div class="value">{{ item.value | ngxNumberWithCommas }}</div>
+      <div class="h3">{{ item.value | ngxNumberWithCommas }}</div>
       <nb-progress-bar [value]="item.activeProgress"></nb-progress-bar>
-      <div class="description">
+      <div class="caption description">
         <bdi>{{ item.description }}</bdi>
       </div>
     </div>
diff --git a/src/app/pages/e-commerce/progress-section/progress-section.component.scss b/src/app/pages/e-commerce/progress-section/progress-section.component.scss
index f399c58900..5ea320bee8 100644
--- a/src/app/pages/e-commerce/progress-section/progress-section.component.scss
+++ b/src/app/pages/e-commerce/progress-section/progress-section.component.scss
@@ -4,8 +4,10 @@ $shadow-green: #00977e;
 
 @include nb-install-component() {
   .progress-info {
-    color: nb-theme(color-fg-heading);
-    margin-top: 2.5rem;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-top: 2rem;
 
     &:first-child {
       margin-top: 0;
@@ -13,41 +15,13 @@ $shadow-green: #00977e;
   }
 
   .title {
-    font-family: nb-theme(font-secondary);
-    font-size: nb-theme(font-size-lg);
-    font-weight: nb-theme(font-weight-bold);
-  }
-
-  .value {
-    font-size: 3rem;
-    font-weight: nb-theme(font-weight-light);
-    margin-top: 0.5rem;
+    font-family: nb-theme(text-subtitle-font-family);
+    font-size: nb-theme(text-subtitle-font-size);
+    font-weight: nb-theme(text-subtitle-font-weight);
+    line-height: nb-theme(text-subtitle-line-height);
   }
 
   .description {
-    color: nb-theme(color-fg);
     margin-top: 0.5rem;
   }
-
-  /deep/ nb-progress-bar {
-    margin-top: 0.2rem;
-
-    .progress-container {
-      height: 0.8rem;
-      border-radius: 0;
-    }
-
-    .progress-value {
-      height: 0.6rem;
-      background: nb-theme(progress-bar-background);
-
-      @include nb-for-theme(cosmic) {
-        box-shadow: 0 0.2rem $shadow-green;
-      }
-
-      @include nb-for-theme(corporate) {
-        height: 100%;
-      }
-    }
-  }
 }
diff --git a/src/app/pages/e-commerce/slide-out/slide-out.component.html b/src/app/pages/e-commerce/slide-out/slide-out.component.html
index ecc76f37d4..67848f7a71 100644
--- a/src/app/pages/e-commerce/slide-out/slide-out.component.html
+++ b/src/app/pages/e-commerce/slide-out/slide-out.component.html
@@ -1,7 +1,8 @@
-<i class="show-hide-toggle"
-   [class.nb-arrow-thin-left]="!showVisitorsStatistics"
-   [class.nb-arrow-thin-right]="showVisitorsStatistics"
-   (click)="toggleStatistics()"></i>
+<nb-icon [icon]="showVisitorsStatistics ? 'arrow-forward-outline' : 'arrow-back-outline'"
+         pack="eva"
+         class="show-hide-toggle"
+         (click)="toggleStatistics()">
+</nb-icon>
 <div class="slide-out-container"
      [class.expanded]="showVisitorsStatistics"
      [class.collapsed]="!showVisitorsStatistics">
diff --git a/src/app/pages/e-commerce/slide-out/slide-out.component.scss b/src/app/pages/e-commerce/slide-out/slide-out.component.scss
index 973b692f3d..4b2326744f 100644
--- a/src/app/pages/e-commerce/slide-out/slide-out.component.scss
+++ b/src/app/pages/e-commerce/slide-out/slide-out.component.scss
@@ -3,26 +3,28 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-  $slide-out-container-width: nb-theme(slide-out-container-width);
+  $slide-out-container-width: 40%;
 
-  // toggle button
   .show-hide-toggle {
-    position: absolute;
     display: block;
-    font-size: 2rem;
-    font-weight: nb-theme(font-weight-bold);
+    position: absolute;
     top: 1.5rem;
-    right: 1.5rem;
+    @include nb-ltr(right, 1.5rem);
+    @include nb-rtl(left, 1.5rem);
     cursor: pointer;
-    color: nb-theme(color-fg);
     background-color: transparent;
     z-index: 2;
-    @include nb-rtl(right, auto);
-    @include nb-rtl(left, 1.5rem);
   }
-  // toggle button
 
   .slide-out-container {
+    @include nb-ltr {
+      border-top-right-radius: nb-theme(card-border-radius);
+      border-bottom-right-radius: nb-theme(card-border-radius);
+    }
+    @include nb-rtl {
+      border-top-left-radius: nb-theme(card-border-radius);
+      border-bottom-left-radius: nb-theme(card-border-radius);
+    }
     position: absolute;
     padding: 1.5rem;
     width: $slide-out-container-width;
@@ -34,32 +36,29 @@
     height: 100%;
     top: 0;
     overflow: hidden;
-    transition: all 0.5s ease-out;
+    transition: all 0.2s ease-out;
   }
 
   .slide-out-container::before {
     content: '';
-    right: 0;
-    @include nb-rtl(right, auto);
+    @include nb-ltr(right, 0);
     @include nb-rtl(left, 0);
     width: 100%;
     position: absolute;
     background: nb-theme(slide-out-background);
     box-shadow: nb-theme(slide-out-shadow-color);
     @include nb-rtl(box-shadow, nb-theme(slide-out-shadow-color-rtl));
-    filter: blur(3px);
     opacity: 0.9;
     z-index: 1;
   }
 
   .slide-out-container.collapsed {
-    left: calc(100% - 6rem);
-    @include nb-rtl(left, auto);
+    @include nb-ltr(left, calc(100% - 6rem));
     @include nb-rtl(right, calc(100% - 6rem));
   }
 
   .slide-out-container.expanded {
-    left: calc(100% - #{$slide-out-container-width});
+    left: calc(100% + 1px - #{$slide-out-container-width});
     @include nb-rtl(left, auto);
     @include nb-rtl(right, calc(100% - #{$slide-out-container-width}));
   }
@@ -69,7 +68,7 @@
     position: relative;
     width: 100%;
     margin: 0 6rem;
-    transition: all 0.5s ease-out;
+    transition: all 0.2s ease-out;
   }
 
   .expanded .content-wrapper {
@@ -84,8 +83,8 @@
     }
 
     .slide-out-container.expanded {
-      left: calc(100% - #{$slide-out-container-width});
-      @include nb-rtl(right, calc(100% - #{$slide-out-container-width}));
+      left: calc(100% + 1px - #{$slide-out-container-width});
+      @include nb-rtl(right, calc(100% + 1px - #{$slide-out-container-width}));
     }
   }
 
@@ -101,12 +100,12 @@
     }
 
     .slide-out-container.collapsed {
-      left: calc(100% - 3rem);
+      left: calc(100% + 1px - 3rem);
       @include nb-rtl(right, calc(100% - 3rem));
     }
 
     .slide-out-container.expanded {
-      left: calc(100% - #{$slide-out-container-width});
+      left: calc(100% + 1px - #{$slide-out-container-width});
       @include nb-rtl(right, calc(100% - #{$slide-out-container-width}));
     }
   }
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss
index 6a95b2247f..00e2406edb 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss
@@ -15,15 +15,17 @@
   ngx-traffic-bar-chart {
     flex: 1;
     position: relative;
-  }
 
-  /deep/ canvas {
-    border-bottom-left-radius: nb-theme(card-border-radius);
-    border-bottom-right-radius: nb-theme(card-border-radius);
-  }
+    ::ng-deep {
+      canvas {
+        border-bottom-left-radius: nb-theme(card-border-radius);
+        border-bottom-right-radius: nb-theme(card-border-radius);
+      }
 
-  .echart {
-    height: 100%;
-    width: 100%;
+      .echart {
+        height: 100%;
+        width: 100%;
+      }
+    }
   }
 }
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-bar-chart.component.ts b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-bar-chart.component.ts
index 343055d580..a1e1ddc5c3 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-bar-chart.component.ts
+++ b/src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-bar-chart.component.ts
@@ -7,7 +7,6 @@ declare const echarts: any;
 
 @Component({
   selector: 'ngx-traffic-bar-chart',
-  styleUrls: ['traffic-back-card.component.scss'],
   template: `
     <div echarts
          [options]="option"
@@ -115,7 +114,7 @@ export class TrafficBarChartComponent implements AfterViewInit, OnDestroy, OnCha
             position: 'top',
             backgroundColor: trafficTheme.tooltipBg,
             borderColor: trafficTheme.tooltipBorderColor,
-            borderWidth: 3,
+            borderWidth: 1,
             formatter: this.formatter,
             extraCssText: trafficTheme.tooltipExtraCss,
           },
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.html b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.html
index 8f76cb290c..774a04a727 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.html
+++ b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.html
@@ -1,16 +1,9 @@
-<div class="traffic-bar">
-  <div class="period-from">{{ barData.prevDate }}</div>
-  <div class="vertical-progress-bar">
-    <div class="progress-line"
-         [style.height.%]="barData.prevValue">
-    </div>
-  </div>
-  <div class="vertical-progress-bar">
-    <div class="progress-line"
-         [style.height.%]="barData.nextValue"
-         [class.success]="successDelta"
-         [class.failure]="!successDelta">
-    </div>
+<span class="value-prev caption">{{ barData.prevDate }}</span>
+<div class="progress-line-container" [style.height.%]="barData.prevValue">
+  <div class="progress-line-prev"></div>
+</div>
+<div class="progress-line-container" [style.height.%]="barData.nextValue">
+  <div class="progress-line-now" [class.success]="successDelta" [class.failure]="!successDelta">
   </div>
-  <div class="period-to">{{ barData.nextDate }}</div>
 </div>
+<span class="value-now caption">{{ barData.nextDate }}</span>
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss
index d4aeb55fbf..424bbb4069 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar/traffic-bar.component.scss
@@ -1,72 +1,54 @@
 @import '../../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/hero-buttons';
-@import '~@nebular/theme/styles/global/typography/typography';
-
-$traffic-bar-background-color: #d0d8e3;
 
 @include nb-install-component() {
-  height: 100%;
-
-  .traffic-bar {
-    display: flex;
-    align-self: stretch;
-    position: relative;
-    height: 100%;
-
-    > * {
-      margin-left: 0.5rem;
-    }
+  display: flex;
+  align-items: flex-end;
+  height: nb-theme(list-item-line-height);
+  max-width: 7rem;
+
+  .value-prev,
+  .value-now {
+    flex: 1;
   }
 
-  .period-from, .period-to {
-    align-self: flex-end;
-    font-size: 1rem;
-    line-height: 0.8;
+  .progress-line-container {
+    flex: 1;
+    margin-bottom: 0.1875rem;
   }
 
-  .period-from {
-    position: absolute;
-    right: 100%;
-    @include nb-rtl(right, inherit);
-    @include nb-rtl(left, 100%);
-    bottom: 0;
-    white-space: nowrap;
-  }
-
-  .vertical-progress-bar {
+  .progress-line-prev,
+  .progress-line-now {
     height: 100%;
     width: 0.7rem;
-    transform: rotate(180deg);
-
-    .progress-line {
-      width: 100%;
-      background-color: $traffic-bar-background-color;
-
-      &.success {
-        background-color: text-success();
-
-        @include nb-for-theme(corporate) {
-          background-color: text-primary();
-        }
-      }
+  }
 
-      &.failure {
-        background-color: text-danger();
-      }
+  .progress-line-prev {
+    background-color: nb-theme(border-basic-color-3);
+    @include nb-ltr {
+      margin-left: auto;
+      margin-right: 0.25rem;
     }
+    @include nb-rtl {
+      margin-left: 0.25rem;
+      margin-right: auto;
+    }
+  }
 
-    @include nb-for-theme(cosmic) {
-      .progress-line {
-        background: linear-gradient(180deg, #a054fe 0%, #7a58ff 100%);
-
-        &.success {
-          background: linear-gradient(0deg, #00caba 0%, #00d77f 100%);
-        }
+  .progress-line-now {
+    @include nb-ltr {
+      margin-left: 0.25rem;
+      margin-right: auto;
+    }
+    @include nb-rtl {
+      margin-left: auto;
+      margin-right: 0.25rem;
+    }
 
-        &.failure {
-          background: linear-gradient(180deg, #ff38ab 0%, #ff386c 100%);
-        }
-      }
+    &.success {
+      background-color: nb-theme(color-success-default);
+    }
+    &.failure {
+      background-color: nb-theme(color-danger-default);
     }
   }
 }
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.html b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.html
index 6dc41e07f6..84cc38da02 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.html
+++ b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.html
@@ -1,16 +1,12 @@
-<nb-card-body>
-  <ul class="traffic-list">
-    <li *ngFor="let item of frontCardData; trackBy: trackByDate">
-      <div class="date">{{ item.date }}</div>
-      <div class="value">{{ item.value }}</div>
-      <div class="delta"
-           [class.up]="item.delta.up"
-           [class.down]="!item.delta.up">
-        {{ item.delta.value }}%
-      </div>
-      <ngx-traffic-bar [barData]="item.comparison"
-                       [successDelta]="item.delta.up">
-      </ngx-traffic-bar>
-    </li>
-  </ul>
-</nb-card-body>
+<nb-list>
+  <nb-list-item class="item" *ngFor="let item of frontCardData; trackBy: trackByDate">
+    <span>{{ item.date }}</span>
+    <span clsas="value">{{ item.value }}</span>
+    <span class="delta" [class.up]="item.delta.up" [class.down]="!item.delta.up">
+      <nb-icon [icon]="item.delta.up ? 'arrow-up' : 'arrow-down'" pack="eva"></nb-icon>
+      {{ item.delta.value }}%
+    </span>
+    <ngx-traffic-bar [barData]="item.comparison" [successDelta]="item.delta.up">
+    </ngx-traffic-bar>
+  </nb-list-item>
+</nb-list>
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
index 1bf70c359b..9fa09c82bf 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
@@ -1,152 +1,39 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/components/card/card.component.theme';
-@import '~@nebular/theme/styles/global/typography/typography';
 @import '~bootstrap/scss/mixins/breakpoints';
 @import '~@nebular/theme/styles/global/breakpoints';
+@import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
   overflow: auto;
 
-  nb-card-body {
-    padding: 0;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .traffic-list {
-    padding: 0;
-    margin: 0;
-  }
-
-  li {
-    list-style: none;
+  .item {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    height: 4.5rem;
-    font-size: 1.25rem;
-    position: relative;
-    color: nb-theme(color-fg);
-    padding: 1rem nb-theme(card-padding);
-    border-bottom:
-      nb-theme(list-item-border-width)
-      nb-theme(card-header-border-type)
-      nb-theme(separator);
-
-    &:hover {
-      background-color: nb-theme(layout-bg);
-
-      &::before {
-        position: absolute;
-        content: '';
-        height: 100%;
-        width: 6px;
-        left: 0;
-        top: 0;
-        background-color: nb-theme(color-success);
-        border-radius: nb-theme(radius);
-      }
-    }
 
     > * {
-      flex: 2;
-    }
-
-    ngx-traffic-bar {
       flex: 1;
     }
-  }
 
-  .date {
-    @include nb-for-theme(corporate) {
-      color: nb-theme(color-fg-heading);
+    &:first-child {
+      border-top: none;
     }
   }
 
-  .value {
-    color: nb-theme(color-fg-heading);
+  .value,
+  .delta {
+    text-align: center;
   }
 
   .delta {
     display: flex;
-    padding-left: 0.5rem;
-    font-size: 1rem;
     align-items: center;
 
-    &::before {
-      content: '';
-      right: 100%;
-      margin-right: 0.7rem;
-      @include nb-rtl(margin-left, 0.7rem);
-      @include nb-rtl(margin-right, 0);
-      border-left: 5px solid transparent;
-      border-right: 5px solid transparent;
-    }
-
     &.down {
-      color: text-danger();
-
-      &::before {
-        bottom: 5px;
-        border-top: 6px solid text-danger();
-      }
+      color: nb-theme(color-danger-default);
     }
 
     &.up {
-      color: text-success();
-
-      &::before {
-        top: 5px;
-        border-bottom: 6px solid text-success();
-      }
-    }
-  }
-
-  @include nb-for-theme(cosmic) {
-    .traffic-list li {
-      &:hover {
-        &::before {
-          $color-top: nb-theme(btn-success-bg);
-          $color-bottom: btn-hero-success-left-color();
-
-          background-image: linear-gradient(to top, $color-top, $color-bottom);
-          box-shadow: 0 0 16px -2px btn-hero-success-middle-color();
-        }
-      }
-    }
-  }
-
-  @include nb-for-theme(corporate) {
-    .traffic-list li {
-      border-color: nb-theme(tabs-separator);
-
-      &:first-child {
-        border-top:
-          nb-theme(list-item-border-width)
-          nb-theme(card-header-border-type)
-          nb-theme(separator);
-      }
-
-      &:hover {
-        &::before {
-          background-color: nb-theme(color-primary);
-        }
-      }
-    }
-
-    .date {
-      color: nb-theme(color-fg-heading);
-    }
-
-    .delta {
-      &.up {
-        color: text-primary();
-
-        &::before {
-          border-bottom-color: text-primary();
-        }
-      }
+      color: nb-theme(color-success-default);
     }
   }
 
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html b/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html
index afca029306..4e22530534 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html
@@ -1,16 +1,6 @@
 <nb-card-header>
   <span>Traffic</span>
-  <div class="dropdown ghost-dropdown" ngbDropdown>
-    <button type="button" class="btn btn-sm" ngbDropdownToggle
-            [ngClass]="{
-              'btn-success': currentTheme === 'default',
-              'btn-primary': currentTheme !== 'default'}">
-      {{ type }}
-    </button>
-    <ul ngbDropdownMenu class="dropdown-menu">
-      <li class="dropdown-item" *ngFor="let period of types" (click)="changePeriod(period)">
-        {{ period }}
-      </li>
-    </ul>
-  </div>
+  <nb-select [selected]="type" (selectedChange)="changePeriod($event)">
+    <nb-option *ngFor="let period of types" [value]="period">{{ period }}</nb-option>
+  </nb-select>
 </nb-card-header>
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss
index 59efc12319..b92c1db3fe 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss
@@ -5,12 +5,10 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 0.675rem 4rem 0.5rem 1.25rem;
-    @include nb-rtl(padding-right, 1.25rem);
-    @include nb-rtl(padding-left, 4rem);
-  }
+    padding-top: nb-theme(card-header-with-select-padding-top);
+    padding-bottom: nb-theme(card-header-with-select-padding-bottom);
 
-  .dropdown {
-    min-width: 120px;
+    @include nb-ltr(padding-right, 4rem);
+    @include nb-rtl(padding-left, 4rem);
   }
 }
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html
index 0bdf41e8af..1b11ab714c 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html
@@ -3,14 +3,14 @@
     <nb-card size="small">
       <ngx-traffic-cards-header [type]="period" (periodChange)="setPeriodAngGetData($event)"></ngx-traffic-cards-header>
       <ngx-traffic-front-card [frontCardData]="trafficListData"></ngx-traffic-front-card>
-      <i class="nb-arrow-up" (click)="toggleView()"></i>
+      <nb-icon class="toggle-icon" icon="chevron-up-outline" pack="eva" (click)="toggleView()"></nb-icon>
     </nb-card>
   </nb-card-front>
   <nb-card-back>
     <nb-card size="small">
       <ngx-traffic-cards-header [type]="period" (periodChange)="setPeriodAngGetData($event)"></ngx-traffic-cards-header>
       <ngx-traffic-back-card [trafficBarData]="trafficBarData"></ngx-traffic-back-card>
-      <i class="nb-arrow-down" (click)="toggleView()"></i>
+      <nb-icon class="toggle-icon" icon="chevron-down-outline" pack="eva" (click)="toggleView()"></nb-icon>
     </nb-card>
   </nb-card-back>
 </nb-reveal-card>
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss
index 463e638a49..42f557468b 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss
@@ -1,19 +1,12 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  .nb-arrow-up, .nb-arrow-down {
+  .toggle-icon {
     position: absolute;
-    top: 0;
-    right: 0;
+    top: 1rem;
+    right: 1.25rem;
     @include nb-rtl(right, auto);
-    @include nb-rtl(left, 0);
-    padding: 1.5rem;
+    @include nb-rtl(left, 1.25rem);
     cursor: pointer;
   }
-
-  nb-card-back {
-    /deep/ nb-card-header {
-      border: none;
-    }
-  }
 }
diff --git a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.ts b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.ts
index 431f0c11b5..3e2b85a7b8 100644
--- a/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.ts
+++ b/src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.ts
@@ -44,7 +44,7 @@ export class TrafficRevealCardComponent implements OnDestroy {
 
   getTrafficFrontCardData(period: string) {
     this.trafficListService.getTrafficListData(period)
-      .pipe(takeWhile(() => this.alive ))
+      .pipe(takeWhile(() => this.alive))
       .subscribe(trafficListData => {
         this.trafficListData = trafficListData;
       });
diff --git a/src/app/pages/e-commerce/user-activity/user-activity.component.html b/src/app/pages/e-commerce/user-activity/user-activity.component.html
new file mode 100644
index 0000000000..445f18f97c
--- /dev/null
+++ b/src/app/pages/e-commerce/user-activity/user-activity.component.html
@@ -0,0 +1,33 @@
+<nb-card size="medium">
+
+  <nb-card-header>
+    <span>User Activity</span>
+    <nb-select [selected]="type" (selectedChange)="getUserActivity($event); type = $event">
+      <nb-option *ngFor="let t of types" [value]="t">{{ t }}</nb-option>
+    </nb-select>
+  </nb-card-header>
+
+  <nb-list class="user-activity-list">
+    <nb-list-item *ngFor="let item of userActivity">
+
+      <div class="visited-date">
+        {{ item.date }}
+      </div>
+
+      <div class="visited-pages-count">
+        <div class="caption">Pages Visit</div>
+        <div class="value">{{ item.pagesVisitCount }}</div>
+      </div>
+
+      <div class="visited-percentages">
+        <div class="caption">New visits, %</div>
+        <div class="delta value" [class.up]="item.deltaUp" [class.down]="!item.deltaUp">
+          <nb-icon [icon]="item.deltaUp ? 'arrow-up' : 'arrow-down'" pack="eva"></nb-icon>
+          {{ item.newVisits }}%
+        </div>
+      </div>
+
+    </nb-list-item>
+  </nb-list>
+
+</nb-card>
diff --git a/src/app/pages/e-commerce/user-activity/user-activity.component.scss b/src/app/pages/e-commerce/user-activity/user-activity.component.scss
index 8e65c42915..52c59a087b 100644
--- a/src/app/pages/e-commerce/user-activity/user-activity.component.scss
+++ b/src/app/pages/e-commerce/user-activity/user-activity.component.scss
@@ -1,5 +1,4 @@
 @import '../../../@theme/styles/themes';
-@import '~@nebular/theme/styles/global/typography/typography';
 
 @include nb-install-component() {
   nb-card-header {
@@ -7,78 +6,31 @@
     align-items: center;
     justify-content: space-between;
     border: none;
+    padding-top: nb-theme(card-header-with-select-padding-top);
+    padding-bottom: nb-theme(card-header-with-select-padding-bottom);
   }
 
-  nb-card-body {
-    padding: 0;
+  nb-list {
+    overflow-x: hidden;
   }
 
-  .dropdown {
-    min-width: 120px;
-  }
-
-  .user-activity-list {
-    padding: 0;
-    margin: 0;
-  }
-
-  .user-activity-list li {
-    list-style: none;
+  nb-list-item {
     display: flex;
-    justify-content: space-between;
     align-items: flex-end;
-    position: relative;
-    color: nb-theme(color-fg);
-    padding: nb-theme(card-padding);
-    border-bottom:
-      nb-theme(list-item-border-width)
-      nb-theme(card-header-border-type)
-      nb-theme(separator);
-
-    &:first-child {
-      border-top:
-        nb-theme(list-item-border-width)
-        nb-theme(card-header-border-type)
-        nb-theme(separator);
-    }
-
-    &:hover {
-      background-color: nb-theme(layout-bg);
-
-      &::before {
-        position: absolute;
-        content: '';
-        height: 100%;
-        width: 6px;
-        left: 0;
-        top: 0;
-        background-color: nb-theme(color-success);
-        border-radius: nb-theme(radius);
-      }
-    }
+    justify-content: space-between;
+    margin: 0 -0.25rem;
   }
 
   .visited-date,
-  .value,
-  .title {
-    font-size: 1.25rem;
-  }
-
-  .visited-date {
-    color: nb-theme(color-fg-heading);
-
-    @include nb-for-theme(cosmic) {
-      color: nb-theme(color-fg);
-    }
-  }
-
-  .title {
-    font-size: 1rem;
+  .visited-pages-count,
+  .visited-percentages {
+    flex: 1 0 auto;
+    margin: 0 0.25rem;
   }
 
   .value {
-    margin-top: 0.5rem;
-    color: nb-theme(color-success);
+    margin-top: 0.25rem;
+    color: nb-theme(color-success-default);
   }
 
   .delta {
@@ -86,82 +38,16 @@
     align-items: center;
     position: relative;
 
-    &::before {
-      content: '';
-      right: 100%;
-      margin-right: 0.7rem;
-      @include nb-rtl(margin-right, 0);
-      @include nb-rtl(margin-left, 0.7rem);
-      border-left: 6px solid transparent;
-      border-right: 6px solid transparent;
-    }
-
     &.down {
-      color: text-danger();
-
-      &::before {
-        border-top: 6px solid text-danger();
-      }
+      color: nb-theme(color-danger-default);
     }
 
     &.up {
-      color: text-success();
-
-      &::before {
-        border-bottom: 6px solid text-success();
-      }
-    }
-  }
-
-  @include nb-for-theme(cosmic) {
-    .user-activity-list li {
-      &:hover {
-        &::before {
-          $color-top: nb-theme(btn-success-bg);
-          $color-bottom: btn-hero-success-left-color();
-
-          background-image: linear-gradient(to top, $color-top, $color-bottom);
-          box-shadow: 0 0 16px -2px btn-hero-success-middle-color();
-        }
-      }
-    }
-
-    .delta {
-      &.down, &.up {
-        color: nb-theme(color-fg-heading);
-      }
+      color: nb-theme(color-success-default);
     }
-  }
-
-  @include nb-for-theme(corporate) {
-    .user-activity-list li {
-      border-color: nb-theme(tabs-separator);
-
-      &:first-child {
-        border-color: nb-theme(tabs-separator);
-      }
-
-      &:hover {
-        &::before {
-          background-color: nb-theme(color-primary);
-        }
-      }
-    }
-
-    .visited-pages-count {
-      .value {
-        color: nb-theme(color-fg-heading);
-      }
-    }
-
-    .delta {
-      &.up {
-        color: text-primary();
 
-        &::before {
-          border-bottom-color: text-primary();
-        }
-      }
+    nb-icon ::ng-deep svg {
+      vertical-align: top;
     }
   }
 }
diff --git a/src/app/pages/e-commerce/user-activity/user-activity.component.ts b/src/app/pages/e-commerce/user-activity/user-activity.component.ts
index d184090ca6..620af6f2b8 100644
--- a/src/app/pages/e-commerce/user-activity/user-activity.component.ts
+++ b/src/app/pages/e-commerce/user-activity/user-activity.component.ts
@@ -7,47 +7,7 @@ import { UserActivityData, UserActive } from '../../../@core/data/user-activity'
 @Component({
   selector: 'ngx-user-activity',
   styleUrls: ['./user-activity.component.scss'],
-  template: `
-    <nb-card size="medium">
-      <nb-card-header>
-        <span>User Activity</span>
-        <div class="dropdown ghost-dropdown" ngbDropdown>
-          <button type="button" class="btn btn-sm" ngbDropdownToggle
-                  [ngClass]="{ 'btn-success': currentTheme == 'default', 'btn-primary': currentTheme != 'default'}">
-            {{ type }}
-          </button>
-          <ul ngbDropdownMenu class="dropdown-menu">
-            <li class="dropdown-item"
-                *ngFor="let t of types"
-                (click)="getUserActivity(t); type = t">
-              {{ t }}
-            </li>
-          </ul>
-        </div>
-      </nb-card-header>
-      <nb-card-body>
-        <ul class="user-activity-list">
-          <li *ngFor="let item of userActivity">
-            <div class="visited-date">
-              {{ item.date }}
-            </div>
-            <div class="visited-pages-count">
-              <div class="title">Pages Visit</div>
-              <div class="value">{{ item.pagesVisitCount }}</div>
-            </div>
-            <div class="visited-percentages">
-              <div class="title">New visits, %</div>
-              <div class="delta value"
-                   [class.up]="item.deltaUp"
-                   [class.down]="!item.deltaUp">
-                {{ item.newVisits }}%
-              </div>
-            </div>
-          </li>
-        </ul>
-      </nb-card-body>
-    </nb-card>
-  `,
+  templateUrl: './user-activity.component.html',
 })
 export class ECommerceUserActivityComponent implements OnDestroy {
 
diff --git a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics-chart/visitors-analytics-chart.component.scss b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics-chart/visitors-analytics-chart.component.scss
index bcbf0109bf..677d9baf94 100644
--- a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics-chart/visitors-analytics-chart.component.scss
+++ b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics-chart/visitors-analytics-chart.component.scss
@@ -2,7 +2,7 @@
 
 @include nb-install-component() {
   display: block;
-  height: 290px;
+  height: 17.5rem;
   width: 100%;
 
   .echart {
diff --git a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics-chart/visitors-analytics-chart.component.ts b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics-chart/visitors-analytics-chart.component.ts
index 7784d5944f..0baf5e62c7 100644
--- a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics-chart/visitors-analytics-chart.component.ts
+++ b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics-chart/visitors-analytics-chart.component.ts
@@ -75,7 +75,7 @@ export class ECommerceVisitorsAnalyticsChartComponent implements AfterViewInit,
         position: 'top',
         backgroundColor: eTheme.tooltipBg,
         borderColor: eTheme.tooltipBorderColor,
-        borderWidth: 3,
+        borderWidth: 1,
         formatter: (params) => {
           return Math.round(parseInt(params[0].value, 10));
         },
diff --git a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.html b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.html
index 7abd9956f7..509220fa34 100644
--- a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.html
+++ b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.html
@@ -1,6 +1,6 @@
 <nb-card size="medium">
   <nb-card-header>
-    <div class="title">Visitors Analytics</div>
+    <h3>Visitors Analytics</h3>
     <div class="sub-title">Consumption</div>
   </nb-card-header>
   <nb-card-body>
diff --git a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
index deaef01423..db3e54ba99 100644
--- a/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
+++ b/src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
@@ -13,15 +13,14 @@
 
   nb-card-header {
     border-bottom: none;
+  }
 
-    .title {
-      font-size: 1.5rem;
-      font-weight: nb-theme(font-weight-bold);
-    }
-
-    .sub-title {
-      color: nb-theme(color-fg);
-    }
+  .sub-title {
+    color: nb-theme(text-hint-color);
+    font-family: nb-theme(text-subtitle-font-family);
+    font-size: nb-theme(text-subtitle-font-size);
+    font-weight: nb-theme(text-subtitle-font-weight);
+    line-height: nb-theme(text-subtitle-line-height);
   }
 
   .container {
@@ -46,9 +45,8 @@
 
   @include media-breakpoint-down(is) {
     ngx-legend-chart {
-      /deep/ .legends {
+      ::ng-deep .legends {
         padding-left: 0;
-        font-size: nb-theme(font-size-sm);
       }
     }
   }
diff --git a/src/app/pages/e-commerce/visitors-analytics/visitors-statistics/visitors-statistics.component.html b/src/app/pages/e-commerce/visitors-analytics/visitors-statistics/visitors-statistics.component.html
index d148c09964..29e9ad8ed7 100644
--- a/src/app/pages/e-commerce/visitors-analytics/visitors-statistics/visitors-statistics.component.html
+++ b/src/app/pages/e-commerce/visitors-analytics/visitors-statistics/visitors-statistics.component.html
@@ -1,18 +1,15 @@
 <div class="visitors-statistics">
-  <div class="statistics-header">
-    <div class="visitors-value">1,100</div>
-    <div class="visitors-title">New Visitors</div>
-  </div>
+  <h4 class="h1">1,100</h4>
+  <div class="visitors-title">New Visitors</div>
   <div class="statistics-chart">
     <div echarts
          [options]="option"
          class="echart"
-         (chartInit)="onChartInit($event)"
-    >
+         (chartInit)="onChartInit($event)">
     </div>
   </div>
   <div class="statistics-footer">
-    <div class="chart-values">
+    <div class="chart-values h5">
       <span class="chart-value">25%</span>
       <span class="chart-value">75%</span>
     </div>
diff --git a/src/app/pages/e-commerce/visitors-analytics/visitors-statistics/visitors-statistics.component.scss b/src/app/pages/e-commerce/visitors-analytics/visitors-statistics/visitors-statistics.component.scss
index 2bc715d6dc..1d1c70dbf9 100644
--- a/src/app/pages/e-commerce/visitors-analytics/visitors-statistics/visitors-statistics.component.scss
+++ b/src/app/pages/e-commerce/visitors-analytics/visitors-statistics/visitors-statistics.component.scss
@@ -2,31 +2,21 @@
 
 @include nb-install-component() {
 
-  .visitors-value {
-    font-size: 3rem;
-    font-weight: nb-theme(font-weight-light);
-    color: nb-theme(color-fg-heading);
-    line-height: 0.8;
+  .visitors-statistics {
+    width: 100%;
   }
 
   .visitors-title {
     margin-top: 1rem;
-    font-size: 1.25rem;
-    color: nb-theme(color-fg);
-  }
-
-  .visitors-statistics {
-    width: 100%;
   }
 
   .statistics-chart {
-    margin-top: 3.5rem;
-    margin-bottom: 1.5rem;
+    margin: 1.5rem 0;
     width: 100%;
 
     .echart {
       display: block;
-      height: 190px;
+      height: 13.75rem;
       width: 100%;
     }
   }
@@ -36,25 +26,19 @@
   }
 
   .chart-value {
-    color: nb-theme(color-fg-heading);
-    font-size: 2rem;
-    font-weight: nb-theme(font-weight-bold);
-    margin-bottom: 1rem;
     flex: 1;
   }
 
-  // legend start
-  .visitors-statistics-legend {
-    /deep/ .legends {
+  .visitors-statistics-legend ::ng-deep {
+    .legends {
       padding: 0;
       margin-left: 0;
     }
 
-    /deep/ .legend {
+    .legend {
       flex: 1;
       margin-left: 0;
       justify-content: flex-start;
     }
   }
-  // legend end
 }
diff --git a/src/app/pages/editors/editors.module.ts b/src/app/pages/editors/editors.module.ts
index 2fe4c43326..a05493eca7 100644
--- a/src/app/pages/editors/editors.module.ts
+++ b/src/app/pages/editors/editors.module.ts
@@ -1,4 +1,5 @@
 import { NgModule } from '@angular/core';
+import { NbCardModule } from '@nebular/theme';
 import { CKEditorModule } from 'ng2-ckeditor';
 
 import { ThemeModule } from '../../@theme/theme.module';
@@ -7,6 +8,7 @@ import { EditorsRoutingModule, routedComponents } from './editors-routing.module
 
 @NgModule({
   imports: [
+    NbCardModule,
     ThemeModule,
     EditorsRoutingModule,
     CKEditorModule,
diff --git a/src/app/pages/extra-components/accordion/accordion.component.scss b/src/app/pages/extra-components/accordion/accordion.component.scss
deleted file mode 100644
index 9edaf6d101..0000000000
--- a/src/app/pages/extra-components/accordion/accordion.component.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@import '../../../@theme/styles/themes';
-
-@include nb-install-component() {
-  .accordion-container {
-    nb-card {
-      margin-bottom: 1rem;
-    }
-  }
-
-  @include media-breakpoint-down(md) {
-    .accordion-container {
-      margin-bottom: 3rem;
-    }
-  }
-}
diff --git a/src/app/pages/extra-components/alert/alert.component.html b/src/app/pages/extra-components/alert/alert.component.html
index 83e6c80f10..8818b532f9 100644
--- a/src/app/pages/extra-components/alert/alert.component.html
+++ b/src/app/pages/extra-components/alert/alert.component.html
@@ -3,13 +3,11 @@
     <nb-card>
       <nb-card-header>Colored Alert</nb-card-header>
       <nb-card-body>
-        <nb-alert status="success">You have been successfully authenticated!</nb-alert>
-        <nb-alert status="danger">You have been successfully authenticated!</nb-alert>
         <nb-alert status="primary">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="success">You have been successfully authenticated!</nb-alert>
         <nb-alert status="info">You have been successfully authenticated!</nb-alert>
         <nb-alert status="warning">You have been successfully authenticated!</nb-alert>
-        <nb-alert status="active">You have been successfully authenticated!</nb-alert>
-        <nb-alert status="disabled">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="danger">You have been successfully authenticated!</nb-alert>
       </nb-card-body>
     </nb-card>
   </div>
@@ -18,13 +16,11 @@
     <nb-card>
       <nb-card-header>Outline Alert</nb-card-header>
       <nb-card-body>
-        <nb-alert outline="success">You have been successfully authenticated!</nb-alert>
-        <nb-alert outline="danger">You have been successfully authenticated!</nb-alert>
         <nb-alert outline="primary">You have been successfully authenticated!</nb-alert>
+        <nb-alert outline="success">You have been successfully authenticated!</nb-alert>
         <nb-alert outline="info">You have been successfully authenticated!</nb-alert>
         <nb-alert outline="warning">You have been successfully authenticated!</nb-alert>
-        <nb-alert outline="active">You have been successfully authenticated!</nb-alert>
-        <nb-alert outline="disabled">You have been successfully authenticated!</nb-alert>
+        <nb-alert outline="danger">You have been successfully authenticated!</nb-alert>
       </nb-card-body>
     </nb-card>
   </div>
@@ -33,13 +29,11 @@
     <nb-card>
       <nb-card-header>Accent Alert</nb-card-header>
       <nb-card-body>
-        <nb-alert status="success" accent="danger">You have been successfully authenticated!</nb-alert>
-        <nb-alert status="danger" accent="primary">You have been successfully authenticated!</nb-alert>
         <nb-alert status="primary" accent="info">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="success" accent="danger">You have been successfully authenticated!</nb-alert>
         <nb-alert status="info" accent="warning">You have been successfully authenticated!</nb-alert>
         <nb-alert status="warning" accent="danger">You have been successfully authenticated!</nb-alert>
-        <nb-alert status="active" accent="disabled">You have been successfully authenticated!</nb-alert>
-        <nb-alert status="disabled" accent="success">You have been successfully authenticated!</nb-alert>
+        <nb-alert status="danger" accent="primary">You have been successfully authenticated!</nb-alert>
       </nb-card-body>
     </nb-card>
   </div>
diff --git a/src/app/pages/extra-components/calendar/calendar.component.html b/src/app/pages/extra-components/calendar/calendar.component.html
index 28ded2bb7d..f69f05b549 100644
--- a/src/app/pages/extra-components/calendar/calendar.component.html
+++ b/src/app/pages/extra-components/calendar/calendar.component.html
@@ -1,20 +1,20 @@
-<div class="row">
-  <div class="nebular-calendar col-md-12 col-lg-6 col-xxxl-4">
-    <h2>
+<div class="calendars">
+  <div class="calendar-container">
+    <span class="subtitle">
       Selected date: {{ date | date }}
-    </h2>
+    </span>
     <nb-calendar [(date)]="date" [boundingMonth]="true"></nb-calendar>
   </div>
-  <div class="nebular-calendar col-md-12 col-lg-6 col-xxxl-4">
-    <h2>
+  <div class="calendar-container">
+    <span class="subtitle">
       Selected range: {{ range.start | date }} - {{ range.end | date }}
-    </h2>
+    </span>
     <nb-calendar-range [(range)]="range"></nb-calendar-range>
   </div>
-  <div class="nebular-calendar col-md-12 col-lg-6 col-xxxl-4">
-    <h2>
+  <div class="calendar-container">
+    <span class="subtitle">
       Selected date: {{ date2 | date }}
-    </h2>
+    </span>
     <nb-calendar
       [(date)]="date2"
       [dayCellComponent]="dayCellComponent"
diff --git a/src/app/pages/extra-components/calendar/calendar.component.scss b/src/app/pages/extra-components/calendar/calendar.component.scss
index 9b4a04ea88..2e3e1e5627 100644
--- a/src/app/pages/extra-components/calendar/calendar.component.scss
+++ b/src/app/pages/extra-components/calendar/calendar.component.scss
@@ -1,19 +1,46 @@
+@import '~bootstrap/scss/mixins/breakpoints';
+@import '~@nebular/theme/styles/global/breakpoints';
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  .calendars-container {
-    margin-top: 2rem;
+  .calendars {
+    display: flex;
+    flex-wrap: wrap;
+    margin: -1rem -0.5rem;
+    justify-content: center;
   }
 
-  h2 {
-    font-size: nb-theme(font-size-xlg);
-    text-align: center;
+  .calendar-container {
+    margin: 1rem 0.5rem;
   }
 
-  .nebular-calendar {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin-bottom: 3rem;
+  .subtitle {
+    display: block;
+    font-family: nb-theme(text-subtitle-font-family);
+    font-size: nb-theme(text-subtitle-font-size);
+    font-weight: nb-theme(text-subtitle-font-weight);
+    line-height: nb-theme(text-subtitle-line-height);
+    margin-bottom: 0.5rem;
+  }
+
+  @include media-breakpoint-up(md) {
+    .calendars {
+      justify-content: flex-start;
+    }
+  }
+
+  @include media-breakpoint-up(lg) {
+    .calendars {
+      margin: -1.1rem;
+    }
+    .calendar-container {
+      margin: 1rem;
+    }
+  }
+
+  @include media-breakpoint-up(xxxl) {
+    .calendars {
+      margin: -1rem;
+    }
   }
 }
diff --git a/src/app/pages/extra-components/calendar/day-cell/day-cell.component.html b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.html
index 8bd3809c39..1bd22ab2bc 100644
--- a/src/app/pages/extra-components/calendar/day-cell/day-cell.component.html
+++ b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.html
@@ -1,4 +1,2 @@
-<div>
-  <div>{{ day }}</div>
-  <span>{{ (day + 100) * day }}$</span>
-</div>
+<div>{{ day }}</div>
+<span class="caption">{{ (day + 100) * day }}$</span>
diff --git a/src/app/pages/extra-components/calendar/day-cell/day-cell.component.scss b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.scss
index 61449068ea..4054a84791 100644
--- a/src/app/pages/extra-components/calendar/day-cell/day-cell.component.scss
+++ b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.scss
@@ -2,9 +2,18 @@
 
 @include nb-install-component() {
   text-align: center;
+  flex-direction: column;
 
-  span {
-    font-size: 75%;
-    opacity: 0.75;
+  .caption {
+    display: block;
+  }
+
+  &.selected .caption,
+  &:hover .caption {
+    color: nb-theme(text-control-color);
+  }
+
+  &.bounding-month .caption {
+    color: inherit;
   }
 }
diff --git a/src/app/pages/extra-components/chat/chat.component.html b/src/app/pages/extra-components/chat/chat.component.html
index a6baa5e915..67c732e785 100644
--- a/src/app/pages/extra-components/chat/chat.component.html
+++ b/src/app/pages/extra-components/chat/chat.component.html
@@ -6,7 +6,7 @@
   <nb-card-body>
     <div class="row">
       <div class="chat-container col-md-12 col-lg-6 col-xxxl-6">
-        <nb-chat title="Nebular Conversational UI" size="large" status="success">
+        <nb-chat title="Nebular Conversational UI" size="large" status="primary">
           <nb-chat-message *ngFor="let msg of messages"
                            [type]="msg.type"
                            [message]="msg.text"
diff --git a/src/app/pages/extra-components/chat/chat.component.scss b/src/app/pages/extra-components/chat/chat.component.scss
index fff346858c..eaf111dade 100644
--- a/src/app/pages/extra-components/chat/chat.component.scss
+++ b/src/app/pages/extra-components/chat/chat.component.scss
@@ -4,7 +4,7 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  /deep/ nb-layout-column {
+  ::ng-deep nb-layout-column {
     justify-content: center;
     display: flex;
   }
@@ -17,7 +17,6 @@
 
   .chat-container {
     margin-bottom: 2rem;
-    font-size: nb-theme(font-size-xlg);
 
     li {
       padding-top: 1rem;
@@ -25,7 +24,6 @@
   }
 
   .chart-description {
-    font-size: nb-theme(font-size-xlg);
     text-align: center;
     margin: 0 auto;
     width: 52%;
diff --git a/src/app/pages/extra-components/chat/messages.ts b/src/app/pages/extra-components/chat/messages.ts
index 14f9cd0888..b37d6dc81a 100644
--- a/src/app/pages/extra-components/chat/messages.ts
+++ b/src/app/pages/extra-components/chat/messages.ts
@@ -62,7 +62,7 @@ export const messages = [
     files: [
       {
         url: 'https://i.gifer.com/no.gif',
-        icon: 'nb-compose',
+        icon: 'file-text-outline',
       },
     ],
     user: {
diff --git a/src/app/pages/extra-components/extra-components-routing.module.ts b/src/app/pages/extra-components/extra-components-routing.module.ts
index afefc4f6eb..eb7251a40f 100644
--- a/src/app/pages/extra-components/extra-components-routing.module.ts
+++ b/src/app/pages/extra-components/extra-components-routing.module.ts
@@ -2,18 +2,11 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 import { ExtraComponentsComponent } from './extra-components.component';
-import { TreeComponent } from './tree/tree.component';
 import { AlertComponent } from './alert/alert.component';
 import { ProgressBarComponent } from './progress-bar/progress-bar.component';
 import { SpinnerComponent } from './spinner/spinner.component';
 import { CalendarComponent } from './calendar/calendar.component';
 import { ChatComponent } from './chat/chat.component';
-import { Tab1Component, Tab2Component, TabsComponent } from './tabs/tabs.component';
-import { AccordionComponent } from './accordion/accordion.component';
-import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
-import { InfiniteListComponent } from './infinite-list/infinite-list.component';
-import { ListComponent } from './list/list.component';
-import { StepperComponent } from './stepper/stepper.component';
 import { CalendarKitFullCalendarShowcaseComponent } from './calendar-kit/calendar-kit.component';
 
 const routes: Routes = [{
@@ -24,26 +17,6 @@ const routes: Routes = [{
       path: 'calendar',
       component: CalendarComponent,
     },
-    {
-      path: 'stepper',
-      component: StepperComponent,
-    },
-    {
-      path: 'list',
-      component: ListComponent,
-    },
-    {
-      path: 'infinite-list',
-      component: InfiniteListComponent,
-    },
-    {
-      path: 'form-inputs',
-      component: NebularFormInputsComponent,
-    },
-    {
-      path: 'accordion',
-      component: AccordionComponent,
-    },
     {
       path: 'progress-bar',
       component: ProgressBarComponent,
@@ -56,29 +29,6 @@ const routes: Routes = [{
       path: 'alert',
       component: AlertComponent,
     },
-    {
-      path: 'tree',
-      component: TreeComponent,
-    },
-    {
-      path: 'tabs',
-      component: TabsComponent,
-      children: [
-        {
-          path: '',
-          redirectTo: 'tab1',
-          pathMatch: 'full',
-        },
-        {
-          path: 'tab1',
-          component: Tab1Component,
-        },
-        {
-          path: 'tab2',
-          component: Tab2Component,
-        },
-      ],
-    },
     {
       path: 'calendar-kit',
       component: CalendarKitFullCalendarShowcaseComponent,
diff --git a/src/app/pages/extra-components/extra-components.module.ts b/src/app/pages/extra-components/extra-components.module.ts
index dc1b10d5be..31161874fc 100644
--- a/src/app/pages/extra-components/extra-components.module.ts
+++ b/src/app/pages/extra-components/extra-components.module.ts
@@ -1,14 +1,25 @@
 import { NgModule } from '@angular/core';
-
-import { TreeModule } from 'angular-tree-component';
-import { ToasterModule } from 'angular2-toaster';
+import {
+  NbActionsModule,
+  NbAlertModule,
+  NbButtonModule,
+  NbCalendarKitModule,
+  NbCalendarModule,
+  NbCalendarRangeModule,
+  NbCardModule,
+  NbChatModule,
+  NbIconModule,
+  NbProgressBarModule,
+  NbSelectModule,
+  NbSpinnerModule,
+  NbTabsetModule,
+} from '@nebular/theme';
 
 import { ThemeModule } from '../../@theme/theme.module';
 import { ExtraComponentsRoutingModule } from './extra-components-routing.module';
 
 // components
 import { ExtraComponentsComponent } from './extra-components.component';
-import { TreeComponent } from './tree/tree.component';
 import { SpinnerInTabsComponent } from './spinner/spinner-in-tabs/spinner-in-tabs.component';
 import { SpinnerInButtonsComponent } from './spinner/spinner-in-buttons/spinner-in-buttons.component';
 import { SpinnerSizesComponent } from './spinner/spinner-sizes/spinner-sizes.component';
@@ -20,26 +31,15 @@ import {
 import { ProgressBarComponent } from './progress-bar/progress-bar.component';
 import { AlertComponent } from './alert/alert.component';
 import { ChatComponent } from './chat/chat.component';
-import { Tab1Component, Tab2Component, TabsComponent } from './tabs/tabs.component';
 import { CalendarComponent } from './calendar/calendar.component';
 import { DayCellComponent } from './calendar/day-cell/day-cell.component';
-import { StepperComponent } from './stepper/stepper.component';
-import { ListComponent } from './list/list.component';
-import { InfiniteListComponent } from './infinite-list/infinite-list.component';
-import { NewsPostComponent } from './infinite-list/news-post/news-post.component';
-import { NewsPostPlaceholderComponent } from './infinite-list/news-post-placeholder/news-post-placeholder.component';
-import { AccordionComponent } from './accordion/accordion.component';
 import { NebularFormInputsComponent } from './form-inputs/nebular-form-inputs.component';
 import { NebularSelectComponent } from './form-inputs/nebular-select/nebular-select.component';
 import { CalendarKitFullCalendarShowcaseComponent } from './calendar-kit/calendar-kit.component';
 import { CalendarKitMonthCellComponent } from './calendar-kit/month-cell/month-cell.component';
 
-// service
-import { NewsService } from './services/news.service';
-
 const COMPONENTS = [
   ExtraComponentsComponent,
-  TreeComponent,
   AlertComponent,
   ProgressBarComponent,
   InteractiveProgressBarComponent,
@@ -51,30 +51,28 @@ const COMPONENTS = [
   CalendarComponent,
   DayCellComponent,
   ChatComponent,
-  TabsComponent,
-  Tab1Component,
-  Tab2Component,
-  StepperComponent,
-  ListComponent,
-  InfiniteListComponent,
-  NewsPostComponent,
-  NewsPostPlaceholderComponent,
-  AccordionComponent,
   NebularFormInputsComponent,
   NebularSelectComponent,
   CalendarKitFullCalendarShowcaseComponent,
   CalendarKitMonthCellComponent,
 ];
 
-const SERVICES = [
-  NewsService,
-];
-
 const MODULES = [
+  NbAlertModule,
+  NbActionsModule,
+  NbButtonModule,
+  NbCalendarModule,
+  NbCalendarKitModule,
+  NbCalendarRangeModule,
+  NbCardModule,
+  NbChatModule,
+  NbIconModule,
+  NbProgressBarModule,
+  NbSelectModule,
+  NbSpinnerModule,
+  NbTabsetModule,
   ThemeModule,
   ExtraComponentsRoutingModule,
-  TreeModule,
-  ToasterModule.forRoot(),
 ];
 
 @NgModule({
@@ -84,8 +82,5 @@ const MODULES = [
   declarations: [
     ...COMPONENTS,
   ],
-  providers: [
-    ...SERVICES,
-  ],
 })
 export class ExtraComponentsModule { }
diff --git a/src/app/pages/extra-components/infinite-list/infinite-list.component.scss b/src/app/pages/extra-components/infinite-list/infinite-list.component.scss
deleted file mode 100644
index ebc87160d7..0000000000
--- a/src/app/pages/extra-components/infinite-list/infinite-list.component.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import '../../../@theme/styles/themes';
-
-@include nb-install-component() {
-  .infinite-cards {
-    nb-card {
-      &.own-scroll {
-        height: 50vh;
-      }
-    }
-  }
-}
diff --git a/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
index 11c26e512a..233ba30d99 100644
--- a/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
+++ b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.html
@@ -2,13 +2,13 @@
   <nb-card-header>Progress Bar Interactive</nb-card-header>
   <nb-card-body>
     <div class="container">
-      <nb-actions size="medium">
-        <nb-action icon="nb-arrow-down" (click)="setValue(value - 25)"></nb-action>
-      </nb-actions>
+      <button nbButton appearance="ghost" [disabled]="canDecrease ? null : ''" (click)="decreaseValue()">
+        <nb-icon icon="minus" pack="eva"></nb-icon>
+      </button>
       <nb-progress-bar [value]="value" [status]="status" [displayValue]="true"></nb-progress-bar>
-      <nb-actions size="medium">
-        <nb-action icon="nb-arrow-up" (click)="setValue(value + 25)"></nb-action>
-      </nb-actions>
+      <button nbButton appearance="ghost" [disabled]="canIncrease ? null : ''" (click)="increaseValue()">
+        <nb-icon icon="plus" pack="eva"></nb-icon>
+      </button>
     </div>
   </nb-card-body>
 </nb-card>
diff --git a/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
index 7d6cf13b63..c44ec134bb 100644
--- a/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
+++ b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.scss
@@ -8,5 +8,6 @@
 
   nb-progress-bar {
     flex: 1;
+    margin: 0 1rem;
   }
 }
diff --git a/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
index 11f6ac772f..e82687f90d 100644
--- a/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
+++ b/src/app/pages/extra-components/progress-bar/interactive-progress-bar/interactive-progress-bar.component.ts
@@ -9,10 +9,6 @@ export class InteractiveProgressBarComponent {
 
   value = 25;
 
-  setValue(newValue) {
-    this.value = Math.min(Math.max(newValue, 0), 100);
-  }
-
   get status() {
     if (this.value <= 25) {
       return 'danger';
@@ -24,4 +20,24 @@ export class InteractiveProgressBarComponent {
       return 'success';
     }
   }
+
+  get canIncrease(): boolean {
+    return this.value < 100;
+  }
+
+  get canDecrease(): boolean {
+    return this.value > 0;
+  }
+
+  decreaseValue() {
+    if (this.value > 0) {
+      this.value -= 25;
+    }
+  }
+
+  increaseValue() {
+    if (this.value < 100) {
+      this.value += 25;
+    }
+  }
 }
diff --git a/src/app/pages/extra-components/progress-bar/progress-bar.component.html b/src/app/pages/extra-components/progress-bar/progress-bar.component.html
index 2c06ec6631..0152cd3f95 100644
--- a/src/app/pages/extra-components/progress-bar/progress-bar.component.html
+++ b/src/app/pages/extra-components/progress-bar/progress-bar.component.html
@@ -1,35 +1,31 @@
-<div class="row">
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Progress Bar Status</nb-card-header>
-      <nb-card-body>
-        <nb-progress-bar [value]="20" status="primary">primary</nb-progress-bar>
-        <nb-progress-bar [value]="40" status="info">info</nb-progress-bar>
-        <nb-progress-bar [value]="60" status="success">success</nb-progress-bar>
-        <nb-progress-bar [value]="80" status="warning">warning</nb-progress-bar>
-        <nb-progress-bar [value]="100" status="danger">danger</nb-progress-bar>
-      </nb-card-body>
-    </nb-card>
-    <ngx-interactive-progress-bar></ngx-interactive-progress-bar>
-  </div>
-  <div class="col-md-12 col-lg-12 col-xxxl-6">
-    <nb-card>
-      <nb-card-header>Progress Bar Size</nb-card-header>
-      <nb-card-body>
-        <nb-progress-bar [value]="20" size="xs">xs</nb-progress-bar>
-        <nb-progress-bar [value]="40" size="sm">sm</nb-progress-bar>
-        <nb-progress-bar [value]="60">none</nb-progress-bar>
-        <nb-progress-bar [value]="80" size="lg">lg</nb-progress-bar>
-        <nb-progress-bar [value]="100" size="xlg">xlg</nb-progress-bar>
-      </nb-card-body>
-    </nb-card>
+<nb-card>
+  <nb-card-header>Progress Bar Status</nb-card-header>
+  <nb-card-body>
+    <nb-progress-bar [value]="20" status="primary">primary</nb-progress-bar>
+    <nb-progress-bar [value]="40" status="info">info</nb-progress-bar>
+    <nb-progress-bar [value]="60" status="success">success</nb-progress-bar>
+    <nb-progress-bar [value]="80" status="warning">warning</nb-progress-bar>
+    <nb-progress-bar [value]="100" status="danger">danger</nb-progress-bar>
+  </nb-card-body>
+</nb-card>
 
-    <nb-card>
-      <nb-card-header>Progress Bar Value</nb-card-header>
-      <nb-card-body>
-        <nb-progress-bar [value]="40" status="primary" [displayValue]="true"></nb-progress-bar>
-        <nb-progress-bar [value]="60" status="primary">Custom value</nb-progress-bar>
-      </nb-card-body>
-    </nb-card>
-  </div>
-</div>
+<ngx-interactive-progress-bar></ngx-interactive-progress-bar>
+
+<nb-card>
+  <nb-card-header>Progress Bar Size</nb-card-header>
+  <nb-card-body>
+    <nb-progress-bar [value]="20" size="tiny">tiny</nb-progress-bar>
+    <nb-progress-bar [value]="40" size="small">small</nb-progress-bar>
+    <nb-progress-bar [value]="60" size="medium">medium (default)</nb-progress-bar>
+    <nb-progress-bar [value]="80" size="large">large</nb-progress-bar>
+    <nb-progress-bar [value]="100" size="giant">giant</nb-progress-bar>
+  </nb-card-body>
+</nb-card>
+
+<nb-card>
+  <nb-card-header>Progress Bar Value</nb-card-header>
+  <nb-card-body>
+    <nb-progress-bar [value]="40" status="primary" [displayValue]="true"></nb-progress-bar>
+    <nb-progress-bar [value]="60" status="primary">Custom text</nb-progress-bar>
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html b/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html
index 0996f8408c..4c2447d729 100644
--- a/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html
@@ -1,40 +1,28 @@
-<nb-card [nbSpinner]="true" nbSpinnerStatus="active">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerStatus="disabled">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerStatus="warning">
+<nb-card [nbSpinner]="true" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerStatus="danger">
+<nb-card [nbSpinner]="true" nbSpinnerStatus="success">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerStatus="success">
+<nb-card [nbSpinner]="true" nbSpinnerStatus="info">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerStatus="info">
+<nb-card [nbSpinner]="true" nbSpinnerStatus="warning">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerStatus="primary">
+<nb-card [nbSpinner]="true" nbSpinnerStatus="danger">
   <nb-card-body>
     Some card content.
   </nb-card-body>
diff --git a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
index 58d137ced7..bc2ff55cd0 100644
--- a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
@@ -30,7 +30,7 @@
         </button>
 
         <button nbButton status="primary" size="medium" (click)="toggleLoadingMediumGroupAnimation()"
-                [nbSpinner]="loadingMediumGroup" nbSpinnerStatus="primary" nbSpinnerSize="xsmall" nbSpinnerMessage="">
+                [nbSpinner]="loadingMediumGroup" nbSpinnerStatus="primary" nbSpinnerSize="tiny" nbSpinnerMessage="">
           Download
         </button>
       </div>
diff --git a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
index f43d9b812a..a3c1c461b6 100644
--- a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
+++ b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
@@ -4,9 +4,9 @@
   button {
     margin: 1rem;
   }
-  
+
   .size-medium-group {
     margin-top: 2rem;
-    border-top: 1px solid nb-theme(separator);
+    border-top: 1px solid nb-theme(divider-color);
   }
 }
diff --git a/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html b/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html
index bb9a73c72e..6816e6ceee 100644
--- a/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html
@@ -1,14 +1,14 @@
 <nb-card size="xsmall">
   <nb-card-body>
     <nb-tabset fullWidth (changeTab)="toggleLoadingAnimation()">
-      <nb-tab tabTitle="Tab 1" [nbSpinner]="loading" nbSpinnerStatus="success" nbSpinnerSize="xxlarge">
+      <nb-tab tabTitle="Tab 1" [nbSpinner]="loading" nbSpinnerStatus="success" nbSpinnerSize="giant">
         <p>
           A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
           Originally, nebula was a name for any diffuse astronomical object.
         </p>
       </nb-tab>
 
-      <nb-tab tabTitle="Tab 2" [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="xxlarge">
+      <nb-tab tabTitle="Tab 2" [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="giant">
         <p>
           Nebular's primary goal is to assemble together and connect the most awesome features and libraries
           creating an efficient ecosystem to speed up and simplify the development.
diff --git a/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html b/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html
index ad2099fc97..2269b444c3 100644
--- a/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html
@@ -1,40 +1,28 @@
-<nb-card [nbSpinner]="true" nbSpinnerSize="xxsmall">
+<nb-card [nbSpinner]="true" nbSpinnerSize="tiny" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerSize="xsmall">
+<nb-card [nbSpinner]="true" nbSpinnerSize="small" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerSize="small">
+<nb-card [nbSpinner]="true" nbSpinnerSize="medium" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerSize="medium">
+<nb-card [nbSpinner]="true" nbSpinnerSize="large" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerSize="large">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerSize="xlarge">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerSize="xxlarge">
+<nb-card [nbSpinner]="true" nbSpinnerSize="giant" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
diff --git a/src/app/pages/extra-components/spinner/spinner.component.scss b/src/app/pages/extra-components/spinner/spinner.component.scss
index 0ffe71f956..a8b9883e74 100644
--- a/src/app/pages/extra-components/spinner/spinner.component.scss
+++ b/src/app/pages/extra-components/spinner/spinner.component.scss
@@ -5,7 +5,7 @@
     margin: 1rem;
   }
 
-  /deep/ nb-spinner {
+  ::ng-deep nb-spinner {
     z-index: 999;
   }
 }
diff --git a/src/app/pages/extra-components/stepper/stepper.component.scss b/src/app/pages/extra-components/stepper/stepper.component.scss
deleted file mode 100644
index e596439d5b..0000000000
--- a/src/app/pages/extra-components/stepper/stepper.component.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import '../../../@theme/styles/themes';
-
-@include nb-install-component() {
-  /deep/ nb-stepper .step-content {
-    text-align: center;
-
-    button {
-      cursor: pointer;
-      margin: 0.5rem;
-    }
-  }
-}
diff --git a/src/app/pages/extra-components/tabs/tabs.component.scss b/src/app/pages/extra-components/tabs/tabs.component.scss
deleted file mode 100644
index 5fcbccf64f..0000000000
--- a/src/app/pages/extra-components/tabs/tabs.component.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@import '../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-  nb-tabset {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-
-  nb-tab {
-    padding: nb-theme(padding);
-  }
-
-  /deep/ ngx-tab1, /deep/ ngx-tab2 {
-    display: block;
-    padding: nb-theme(padding);
-  }
-
-  @include media-breakpoint-down(xs) {
-    nb-tabset /deep/ul {
-      font-size: 1rem;
-      padding: 0 0.25rem;
-    }
-  }
-}
diff --git a/src/app/pages/extra-components/tree/tree.component.html b/src/app/pages/extra-components/tree/tree.component.html
deleted file mode 100644
index 0b2887df20..0000000000
--- a/src/app/pages/extra-components/tree/tree.component.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="row">
-  <div class="col-md-6">
-    <nb-card>
-      <nb-card-header>Tree</nb-card-header>
-      <nb-card-body>
-        <tree-root [nodes]="nodes"></tree-root>
-      </nb-card-body>
-    </nb-card>
-  </div>
-</div>
diff --git a/src/app/pages/extra-components/tree/tree.component.scss b/src/app/pages/extra-components/tree/tree.component.scss
deleted file mode 100644
index adc434924b..0000000000
--- a/src/app/pages/extra-components/tree/tree.component.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import '../../../@theme/styles/themes';
-
-@include nb-install-component() {
-
-  /deep/ .angular-tree-component {
-    cursor: default;
-
-    .node-wrapper {
-      .node-content-wrapper {
-        background: none;
-        box-shadow: none;
-        cursor: default;
-      }
-
-      .toggle-children-wrapper {
-        cursor: pointer;
-      }
-    }
-  }
-}
diff --git a/src/app/pages/extra-components/tree/tree.component.ts b/src/app/pages/extra-components/tree/tree.component.ts
deleted file mode 100644
index ec36220a41..0000000000
--- a/src/app/pages/extra-components/tree/tree.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-tree',
-  templateUrl: './tree.component.html',
-  styleUrls: ['./tree.component.scss'],
-})
-export class TreeComponent {
-
-  nodes = [{
-    name: 'Programming languages by programming paradigm',
-    children: [{
-      name: 'Object-oriented programming',
-      children: [{
-        name: 'Java',
-      }, {
-        name: 'C++',
-      }, {
-        name: 'C#',
-      }],
-    }, {
-      name: 'Prototype-based programming',
-      children: [{
-        name: 'JavaScript',
-      }, {
-        name: 'CoffeeScript',
-      }, {
-        name: 'Lua',
-      }],
-    }],
-  }];
-
-}
diff --git a/src/app/pages/forms/buttons/action-groups/action-groups.component.html b/src/app/pages/forms/buttons/action-groups/action-groups.component.html
deleted file mode 100644
index 0f3acab6d3..0000000000
--- a/src/app/pages/forms/buttons/action-groups/action-groups.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<nb-card>
-  <nb-card-body>
-    <div class="action-groups-header">
-      Action Groups
-    </div>
-    <nb-actions size="medium">
-      <nb-action icon="nb-menu"></nb-action>
-      <nb-action icon="nb-search"></nb-action>
-      <nb-action icon="nb-email"></nb-action>
-      <nb-action disabled icon="nb-notifications"></nb-action>
-      <nb-action>
-        <nb-user name="Han Solo"></nb-user>
-      </nb-action>
-      <nb-action icon="nb-gear"></nb-action>
-    </nb-actions>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/forms/buttons/action-groups/action-groups.component.scss b/src/app/pages/forms/buttons/action-groups/action-groups.component.scss
deleted file mode 100644
index 6f31367695..0000000000
--- a/src/app/pages/forms/buttons/action-groups/action-groups.component.scss
+++ /dev/null
@@ -1,77 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/theme/components/card/card.component.theme';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    display: flex;
-    align-items: center;
-  }
-
-  .action-groups-header {
-    flex-basis: 20%;
-
-    color: nb-theme(card-header-fg-heading);
-    font-family: nb-theme(card-header-font-family);
-    font-size: nb-theme(card-header-font-size);
-    font-weight: nb-theme(card-header-font-weight);
-  }
-
-  .nb-actions {
-    flex-basis: 80%;
-  }
-
-  @include media-breakpoint-down(sm) {
-    nb-card-body {
-      flex-direction: column;
-      align-items: flex-start;
-      padding: 0.75rem;
-
-      .action-groups-header {
-        @include nb-ltr(margin, 0 0 0.5rem 0.25rem);
-        @include nb-rtl(margin, 0 0.25rem 0.5rem 0);
-      }
-    }
-
-    nb-action {
-      padding: 0 0.5rem;
-      /deep/ .control-icon {
-        font-size: 1.75rem;
-      }
-    }
-    nb-user /deep/ {
-      .user-container {
-        font-size: 0.875rem;
-      }
-      .user-picture {
-        height: 1.75rem;
-        width: 1.75rem;
-      }
-    }
-  }
-
-  @include media-breakpoint-down(xs) {
-
-    nb-action {
-      padding: 0 0.375rem;
-      /deep/ .control-icon {
-        font-size: 1.5rem;
-      }
-    }
-    nb-user /deep/ {
-      .user-container {
-        font-size: 0.75rem;
-      }
-      .user-picture {
-        height: 1.5rem;
-        width: 1.5rem;
-      }
-    }
-    nb-card-body {
-      padding-left: 0;
-      padding-right: 0;
-    }
-  }
-}
diff --git a/src/app/pages/forms/buttons/action-groups/action-groups.component.ts b/src/app/pages/forms/buttons/action-groups/action-groups.component.ts
deleted file mode 100644
index b82e9cca8b..0000000000
--- a/src/app/pages/forms/buttons/action-groups/action-groups.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-action-groups',
-  styleUrls: ['./action-groups.component.scss'],
-  templateUrl: './action-groups.component.html',
-})
-export class ActionGroupsComponent {
-}
diff --git a/src/app/pages/forms/buttons/button-elements/button-elements.component.html b/src/app/pages/forms/buttons/button-elements/button-elements.component.html
deleted file mode 100644
index e8c50a73de..0000000000
--- a/src/app/pages/forms/buttons/button-elements/button-elements.component.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<nb-card>
-  <nb-card-header>Button Elements</nb-card-header>
-  <nb-card-body>
-    <div class="button-container">
-      <button (click)="onClick()" nbButton>Button</button>
-    </div>
-    <div class="button-container">
-      <input (click)="onClick()" nbButton type="submit" value="Input Submit"/>
-    </div>
-    <div class="button-container">
-      <input (click)="onClick()" nbButton type="button" value="Input Button"/>
-    </div>
-    <div class="button-container">
-      <a (click)="onClick()" href="#" nbButton>Link</a>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/forms/buttons/button-elements/button-elements.component.scss b/src/app/pages/forms/buttons/button-elements/button-elements.component.scss
deleted file mode 100644
index 4a83e35393..0000000000
--- a/src/app/pages/forms/buttons/button-elements/button-elements.component.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    padding: 0 1.25rem 1.25rem 0;
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  .button-container {
-    margin: 1.25rem 0 0 1.25rem;
-  }
-}
diff --git a/src/app/pages/forms/buttons/button-elements/button-elements.component.ts b/src/app/pages/forms/buttons/button-elements/button-elements.component.ts
deleted file mode 100644
index cb92b2e8cc..0000000000
--- a/src/app/pages/forms/buttons/button-elements/button-elements.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-button-elements',
-  styleUrls: ['./button-elements.component.scss'],
-  templateUrl: './button-elements.component.html',
-})
-export class ButtonElementsComponent {
-
-  onClick() {
-  }
-}
diff --git a/src/app/pages/forms/buttons/buttons.component.html b/src/app/pages/forms/buttons/buttons.component.html
index 881992904c..b9bbeb50c2 100644
--- a/src/app/pages/forms/buttons/buttons.component.html
+++ b/src/app/pages/forms/buttons/buttons.component.html
@@ -1,16 +1,123 @@
 <div class="row">
   <div class="col-lg-12">
-    <ngx-hero-buttons></ngx-hero-buttons>
-    <ngx-default-buttons></ngx-default-buttons>
-    <ngx-outline-buttons></ngx-outline-buttons>
+    <nb-card>
+      <nb-card-header>Hero Buttons</nb-card-header>
+      <nb-card-body>
+        <div class="buttons-row">
+          <button *ngFor="let status of statuses" nbButton [status]="status" hero>
+            {{ status }}
+          </button>
+          <button disabled nbButton hero>
+            disabled
+          </button>
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Default Buttons</nb-card-header>
+      <nb-card-body>
+        <div class="buttons-row">
+          <button *ngFor="let status of statuses" nbButton [status]="status">
+            {{ status }}
+          </button>
+          <button disabled nbButton>
+            disabled
+          </button>
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Outline Buttons</nb-card-header>
+      <nb-card-body>
+        <div class="buttons-row">
+          <button *ngFor="let status of statuses" nbButton [status]="status" outline>
+            {{ status }}
+          </button>
+          <button disabled nbButton outline>
+            disabled
+          </button>
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Ghost Buttons</nb-card-header>
+      <nb-card-body>
+        <div class="buttons-row">
+          <button *ngFor="let status of statuses" nbButton [status]="status" ghost>
+            {{ status }}
+          </button>
+          <button disabled nbButton outline>
+            disabled
+          </button>
+        </div>
+      </nb-card-body>
+    </nb-card>
   </div>
+
   <div class="col-md-12 col-lg-12 col-xxxl-6">
-    <ngx-shape-buttons></ngx-shape-buttons>
-    <ngx-action-groups></ngx-action-groups>
-    <ngx-labeled-actions-group></ngx-labeled-actions-group>
+    <nb-card>
+      <nb-card-header>Button shapes</nb-card-header>
+      <nb-card-body>
+        <div class="buttons-row">
+          <button *ngFor="let shape of shapes" nbButton [shape]="shape">
+            {{ shape }}
+          </button>
+        </div>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-header>Button sizes</nb-card-header>
+      <nb-card-body>
+        <div class="buttons-row">
+          <button *ngFor="let size of sizes" nbButton [size]="size">
+            {{ size }}
+          </button>
+        </div>
+      </nb-card-body>
+    </nb-card>
   </div>
+
   <div class="col-md-12 col-lg-12 col-xxxl-6">
-    <ngx-size-buttons></ngx-size-buttons>
-    <ngx-button-elements></ngx-button-elements>
+    <nb-card class="actions-card">
+      <nb-card-header>Action Groups</nb-card-header>
+      <nb-card-body>
+        <nb-actions size="medium">
+          <nb-action icon="menu-outline"></nb-action>
+          <nb-action icon="search-outline"></nb-action>
+          <nb-action icon="email-outline"></nb-action>
+          <nb-action disabled icon="bell-outline"></nb-action><nb-action>
+          <nb-user name="Han Solo"></nb-user>
+        </nb-action>
+          <nb-action icon="settings-2-outline"></nb-action>
+        </nb-actions>
+      </nb-card-body>
+    </nb-card>
+
+    <nb-card>
+      <nb-card-body>
+        <nb-actions size="medium" fullWidth>
+          <nb-action>
+            <nb-icon class="action-icon" icon="pause-circle-outline"></nb-icon>
+            <span>Pause</span>
+          </nb-action>
+          <nb-action>
+            <nb-icon class="action-icon" icon="list-outline"></nb-icon>
+            <span>Logs</span>
+          </nb-action>
+          <nb-action>
+            <nb-icon class="action-icon" icon="search-outline"></nb-icon>
+            <span>Search</span>
+          </nb-action>
+          <nb-action>
+            <nb-icon class="action-icon" icon="settings-2-outline"></nb-icon>
+            <span>Setup</span>
+          </nb-action>
+        </nb-actions>
+      </nb-card-body>
+    </nb-card>
   </div>
 </div>
diff --git a/src/app/pages/forms/buttons/buttons.component.scss b/src/app/pages/forms/buttons/buttons.component.scss
index c972d13f9a..71df895406 100644
--- a/src/app/pages/forms/buttons/buttons.component.scss
+++ b/src/app/pages/forms/buttons/buttons.component.scss
@@ -1,103 +1,20 @@
 @import '../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-  /deep/ {
-    $button-size: 50px;
-
-    .container-title {
-      color: nb-theme(color-fg);
-      font-family: nb-theme(font-secondary);
-      margin-bottom: 0.5rem;
-    }
-
-    .header {
-      color: nb-theme(color-fg-header);
-      font-size: 0.875rem;
-    }
-
-    .subheader {
-      font-size: 0.75rem;
-      font-weight: nb-theme(font-weight-light);
-      color: nb-theme(color-fg);
-    }
-
-    .btn-demo {
-      width: 180px;
-    }
-
-    .state-container {
-      display: flex;
-
-      &:not(:last-child) {
-        margin-bottom: 1rem;
-      }
-
-      .state-value {
-        width: $button-size;
-        height: $button-size;
-        border-radius: nb-theme(btn-border-radius);
-
-        @include nb-for-theme(corporate) {
-          border-radius: nb-theme(btn-semi-round-border-radius);
-        }
-      }
-
-      .state-details {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        margin-left: 1rem;
-        margin-right: 1rem;
-        height: $button-size;
-      }
-    }
-
-    .example-container {
-      @include nb-ltr(padding-right, 0);
-      @include nb-rtl(padding-left, 0);
-    }
-
-    .example-container .container-btn {
-      margin-bottom: 1.5rem;
-    }
-
-    .block-level-buttons .btn-group {
-      margin-bottom: 1rem;
-    }
+  .buttons-row {
+    margin: -0.5rem;
   }
 
-  @include media-breakpoint-down(is) {
-    ngx-default-buttons /deep/ nb-card-header {
-      flex-direction: column;
-      align-items: left;
-
-      span {
-        margin-bottom: 1rem;
-      }
-    }
+  button[nbButton] {
+    margin: 0.5rem;
   }
 
-  @include media-breakpoint-down(xs) {
-
-    /deep/.icon-buttons .icon-button-examples {
-      button {
-        @include nb-ltr(margin-right, 1rem);
-        @include nb-rtl(margin-left, 1rem);
-      }
-    }
-
-    ngx-default-buttons /deep/ nb-card-header {
-      flex-direction: column;
-      margin-bottom: 0.5rem;
-    }
+  .action-icon {
+    @include nb-ltr(margin-right, 0.5rem);
+    @include nb-rtl(margin-left, 0.5rem);
+  }
 
-    ngx-block-level-buttons /deep/ {
-      .btn-primary {
-        padding: 0.75rem 1rem;
-      }
-    }
+  .actions-card {
+    height: 8rem;
   }
 }
diff --git a/src/app/pages/forms/buttons/buttons.component.ts b/src/app/pages/forms/buttons/buttons.component.ts
index c632c86983..f839321e2b 100644
--- a/src/app/pages/forms/buttons/buttons.component.ts
+++ b/src/app/pages/forms/buttons/buttons.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { NbComponentShape, NbComponentSize, NbComponentStatus } from '@nebular/theme';
 
 @Component({
   selector: 'ngx-buttons',
@@ -6,4 +7,7 @@ import { Component } from '@angular/core';
   templateUrl: './buttons.component.html',
 })
 export class ButtonsComponent {
+  statuses: NbComponentStatus[] = [ 'primary', 'success', 'info', 'warning', 'danger' ];
+  shapes: NbComponentShape[] = [ 'rectangle', 'semi-round', 'round' ];
+  sizes: NbComponentSize[] = [ 'tiny', 'small', 'medium', 'large', 'giant' ];
 }
diff --git a/src/app/pages/forms/buttons/buttons.module.ts b/src/app/pages/forms/buttons/buttons.module.ts
deleted file mode 100644
index c1bc5488cc..0000000000
--- a/src/app/pages/forms/buttons/buttons.module.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { ThemeModule } from '../../../@theme/theme.module';
-import { DefaultButtonsComponent } from './default-buttons/default-buttons.component';
-import { HeroButtonComponent } from './hero-buttons/hero-buttons.component';
-import { ShapeButtonsComponent } from './shape-buttons/shape-buttons.component';
-import { SizeButtonsComponent } from './size-buttons/size-buttons.component';
-import { ButtonsComponent } from './buttons.component';
-import { ActionGroupsComponent } from './action-groups/action-groups.component';
-import { LabeledActionsGroupComponent } from './labeled-actions-group/labeled-actions-group.component';
-import { OutlineButtonsComponent } from './outline-buttons/outline-buttons.component';
-import { ButtonElementsComponent } from './button-elements/button-elements.component';
-
-const components = [
-  ButtonsComponent,
-  DefaultButtonsComponent,
-  OutlineButtonsComponent,
-  HeroButtonComponent,
-  ShapeButtonsComponent,
-  SizeButtonsComponent,
-  ActionGroupsComponent,
-  LabeledActionsGroupComponent,
-  ButtonElementsComponent,
-];
-
-@NgModule({
-  imports: [
-    ThemeModule,
-  ],
-  exports: [
-    ...components,
-  ],
-  declarations: [
-    ...components,
-  ],
-  providers: [],
-})
-export class ButtonsModule { }
diff --git a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
deleted file mode 100644
index 022e624ddc..0000000000
--- a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<nb-card>
-  <nb-card-header>
-    <span>Default Buttons</span>
-  </nb-card-header>
-  <nb-card-body>
-    <div class="row">
-      <div class="example-container col-md-4" *ngFor="let b of buttons">
-        <div class="container-title">
-          <span>{{ b.containerTitle }}</span>
-        </div>
-        <div class="container-btn">
-          <button nbButton
-                  status="{{ b.status }}"
-                  class="btn-demo">
-            {{ b.title }}
-          </button>
-        </div>
-        <div class="{{ b.container }}">
-          <div class="state-container">
-            <div class="state-value original"></div>
-            <div class="state-details">
-              <span class="header">Default</span>
-              <span class="subheader">{{ b.default }}</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value hover"></div>
-            <div class="state-details">
-              <span class="header">Hover</span>
-              <span class="subheader">14% white</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value active"></div>
-            <div class="state-details">
-              <span class="header">Active</span>
-              <span class="subheader">14% black</span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss
deleted file mode 100644
index 5ed3e93e32..0000000000
--- a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-
-  nb-card-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  nb-card-body {
-    padding-bottom: 0;
-  }
-
-  .example-container {
-    margin-bottom: 1.5rem;
-  }
-
-  .primary-container {
-    .original {
-      background-color: nb-theme(btn-primary-bg);
-    }
-    .hover {
-      @include btn-primary-hover();
-    }
-    .active {
-      @include btn-primary-active();
-    }
-  }
-
-  .primary-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-primary-bg);
-  }
-
-  .success-container {
-    .original {
-      background-color: nb-theme(btn-success-bg);
-    }
-    .hover {
-      @include btn-success-hover();
-    }
-    .active {
-      @include btn-success-active();
-    }
-  }
-
-  .success-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-success-bg);
-  }
-
-  .warning-container {
-    .original {
-      background-color: nb-theme(btn-warning-bg);
-    }
-    .hover {
-      @include btn-warning-hover();
-    }
-    .active {
-      @include btn-warning-active();
-    }
-  }
-
-  .warning-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-warning-bg);
-  }
-
-  .info-container {
-    .original {
-      background-color: nb-theme(btn-info-bg);
-    }
-    .hover {
-      @include btn-info-hover();
-    }
-    .active {
-      @include btn-info-active();
-    }
-  }
-
-  .info-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-info-bg);
-  }
-
-  .danger-container {
-    .original {
-      background-color: nb-theme(btn-danger-bg);
-    }
-    .hover {
-      @include btn-danger-hover();
-    }
-    .active {
-      @include btn-danger-active();
-    }
-  }
-
-  .danger-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-danger-bg);
-  }
-
-  .secondary-container {
-    .original {
-      border: 2px solid nb-theme(btn-secondary-border);
-    }
-    .hover {
-      @include btn-secondary-hover();
-    }
-    .active {
-      @include btn-secondary-active();
-    }
-  }
-
-  .secondary-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-secondary-border);
-  }
-
-  @include media-breakpoint-up(xxl) {
-    .example-container {
-      flex: 0 0 20%;
-      max-width: 20%;
-    }
-  }
-}
diff --git a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts b/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
deleted file mode 100644
index 3a20485bb7..0000000000
--- a/src/app/pages/forms/buttons/default-buttons/default-buttons.component.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-default-buttons',
-  styleUrls: ['./default-buttons.component.scss'],
-  templateUrl: './default-buttons.component.html',
-})
-export class DefaultButtonsComponent {
-
-  buttons = [
-    {
-      status: 'primary',
-      container: 'primary-container',
-      containerTitle: 'Primary Button',
-      title: 'Primary',
-      default: '#7659ff',
-    },
-    {
-      status: 'warning',
-      container: 'warning-container',
-      containerTitle: 'Warning Button',
-      title: 'Warning',
-      default: '#ffcb17',
-    },
-    {
-      status: 'success',
-      container: 'success-container',
-      containerTitle: 'Success Button',
-      title: 'Success',
-      default: '#00d977',
-    },
-    {
-      status: 'info',
-      container: 'info-container',
-      containerTitle: 'Info Button',
-      title: 'Info',
-      default: '#0088ff',
-    },
-    {
-      status: 'danger',
-      container: 'danger-container',
-      containerTitle: 'Danger Button',
-      title: 'Danger',
-      default: '#ff386a',
-    },
-  ];
-}
diff --git a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
deleted file mode 100644
index 6d38ba52b1..0000000000
--- a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<nb-card>
-  <nb-card-header>Hero Buttons</nb-card-header>
-  <nb-card-body>
-    <div class="row">
-      <div class="example-container col-sm-6 col-md-4 col-xl-3 col-xxxl-2" *ngFor="let hb of settings">
-        <div class="container-title">
-          <span>{{ hb.title }}</span>
-        </div>
-        <div class="container-btn">
-          <button class="btn-demo" nbButton hero status="{{ hb.status }}">{{ hb.buttonTitle }}</button>
-        </div>
-        <div class="{{ hb.container }}">
-          <div class="state-container" *ngIf="hb[themeName].border">
-            <div class="state-value border"></div>
-            <div class="state-details">
-              <span class="header">Border</span>
-              <span class="subheader">{{ hb[themeName].border }}</span>
-            </div>
-          </div>
-          <div class="state-container" *ngIf="hb[themeName].color">
-            <div class="state-value color"></div>
-            <div class="state-details">
-              <span class="header">Color</span>
-              <span class="subheader">{{ hb[themeName].color }}</span>
-            </div>
-          </div>
-          <div class="state-container" *ngIf="hb[themeName].gradientLeft">
-            <div class="state-value gradient"></div>
-            <div class="state-details">
-              <span class="header">Linear Gradient</span>
-              <span class="subheader">{{ hb[themeName].gradientLeft }}</span>
-              <span class="subheader">{{ hb[themeName].gradientRight }}</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value bevel" [ngClass]="{ 'none': !hb[themeName].bevel }"></div>
-            <div class="state-details" *ngIf="hb[themeName].bevel">
-              <span class="header">Bevel</span>
-              <span class="subheader">0 3px 0 0</span>
-              <span class="subheader">{{ hb[themeName].bevel }}</span>
-            </div>
-            <div class="state-details" *ngIf="!hb[themeName].bevel">
-              <span class="header">No Bevel</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value shadow" [ngClass]="{ 'none': !hb[themeName].shadow }"></div>
-            <div class="state-details" *ngIf="hb[themeName].shadow">
-              <span class="header">Shadow</span>
-              <span class="subheader">0 4px 10px 0</span>
-              <span class="subheader">{{ hb[themeName].shadow }}</span>
-            </div>
-            <div class="state-details" *ngIf="!hb[themeName].shadow">
-              <span class="header">No Shadow</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value glow" [ngClass]="{ 'none': !hb[themeName].glow }"></div>
-            <div class="state-details" *ngIf="hb[themeName].glow">
-              <span class="header">Glow</span>
-              <span class="subheader">{{ hb[themeName].glow.params }}</span>
-              <span class="subheader">{{ hb[themeName].glow.color }}</span>
-            </div>
-            <div class="state-details" *ngIf="!hb[themeName].glow">
-              <span class="header">No Glow</span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss
deleted file mode 100644
index 3ec8f28343..0000000000
--- a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.scss
+++ /dev/null
@@ -1,144 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    padding-bottom: 0;
-  }
-
-  .none {
-    position: relative;
-    transform: rotate(45deg);
-
-    &::before, &::after {
-      position: absolute;
-      content: '';
-      background: nb-theme(form-control-border-color);
-    }
-
-    &::before {
-      left: 50%;
-      top: 10%;
-      transform: translateX(-50%);
-      width: 1px;
-      height: 80%;
-    }
-
-    &::after {
-      top: 50%;
-      left: 10%;
-      transform: translateY(-50%);
-      height: 1px;
-      width: 80%;
-    }
-  }
-
-  .shadow {
-    box-shadow: nb-theme(btn-hero-shadow);
-  }
-
-  .primary-container {
-    .color {
-      background-color: nb-theme(color-primary);
-    }
-    .gradient {
-      @include btn-hero-primary-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-primary-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-primary-bevel();
-    }
-  }
-
-  .warning-container {
-    .color {
-      background-color: nb-theme(color-warning);
-    }
-    .gradient {
-      @include btn-hero-warning-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-warning-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-warning-bevel();
-    }
-  }
-
-  .success-container {
-    .color {
-      background-color: nb-theme(color-success);
-    }
-    .gradient {
-      @include btn-hero-success-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-success-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-success-bevel();
-    }
-  }
-
-  .info-container {
-    .color {
-      background-color: nb-theme(color-info);
-    }
-    .gradient {
-      @include btn-hero-info-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-info-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-info-bevel();
-    }
-  }
-
-  .danger-container {
-    .color {
-      background-color: nb-theme(color-danger);
-    }
-    .gradient {
-      @include btn-hero-danger-gradient();
-    }
-    .glow {
-      box-shadow: btn-hero-danger-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-danger-bevel();
-    }
-  }
-
-  .secondary-container {
-    .color {
-      background-color: nb-theme(btn-secondary-bg);
-    }
-    .border {
-      color: nb-theme(btn-secondary-color);
-      border: nb-theme(btn-secondary-border-width) solid nb-theme(btn-secondary-border);
-    }
-    .glow {
-      box-shadow: btn-hero-secondary-glow();
-    }
-    .bevel {
-      box-shadow: btn-hero-secondary-bevel();
-    }
-  }
-
-  .example-container {
-    margin-bottom: 1.5rem;
-  }
-
-  @include media-breakpoint-up(xxl) {
-    .example-container {
-      flex: 0 0 20%;
-      max-width: 20%;
-    }
-  }
-}
diff --git a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts b/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
deleted file mode 100644
index 19a0c268ae..0000000000
--- a/src/app/pages/forms/buttons/hero-buttons/hero-buttons.component.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import { Component, OnDestroy } from '@angular/core';
-import { NbThemeService } from '@nebular/theme';
-import { Subscription } from 'rxjs';
-
-@Component({
-  selector: 'ngx-hero-buttons',
-  styleUrls: ['./hero-buttons.component.scss'],
-  templateUrl: './hero-buttons.component.html',
-})
-export class HeroButtonComponent implements OnDestroy {
-
-  themeName = 'default';
-  settings: Array<any>;
-  themeSubscription: Subscription;
-
-  constructor(private themeService: NbThemeService) {
-    this.themeSubscription = this.themeService.getJsTheme().subscribe(theme => {
-      this.themeName = theme.name;
-      this.init(theme.variables);
-    });
-  }
-
-  init(colors: any) {
-    this.settings = [
-      {
-        status: 'primary',
-        container: 'primary-container',
-        title: 'Primary Button',
-        buttonTitle: 'Primary',
-        default: {
-          gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
-          gradientRight: colors.primary,
-        },
-        corporate: {
-          color: colors.primary,
-          glow: {
-            params: '0 0 20px 0',
-            color: 'rgba (115, 161, 255, 0.5)',
-          },
-        },
-        cosmic: {
-          gradientLeft: `adjust-hue(${colors.primary}, 20deg)`,
-          gradientRight: colors.primary,
-          bevel: `shade(${colors.primary}, 14%)`,
-          shadow: 'rgba (6, 7, 64, 0.5)',
-          glow: {
-            params: '0 2px 12px 0',
-            color: `adjust-hue(${colors.primary}, 10deg)`,
-          },
-        },
-      },
-      {
-        status: 'warning',
-        container: 'warning-container',
-        title: 'Warning Button',
-        buttonTitle: 'Warning',
-        default: {
-          gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
-          gradientRight: colors.warning,
-        },
-        corporate: {
-          color: colors.warning,
-          glow: {
-            params: '0 0 20px 0',
-            color: 'rgba (256, 163, 107, 0.5)',
-          },
-        },
-        cosmic: {
-          gradientLeft: `adjust-hue(${colors.warning}, 10deg)`,
-          gradientRight: colors.warning,
-          bevel: `shade(${colors.warning}, 14%)`,
-          shadow: 'rgba (33, 7, 77, 0.5)',
-          glow: {
-            params: '0 2px 12px 0',
-            color: `adjust-hue(${colors.warning}, 5deg)`,
-          },
-        },
-      },
-      {
-        status: 'success',
-        container: 'success-container',
-        title: 'Success Button',
-        buttonTitle: 'Success',
-        default: {
-          gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
-          gradientRight: colors.success,
-        },
-        corporate: {
-          color: colors.success,
-          glow: {
-            params: '0 0 20px 0',
-            color: 'rgba (93, 207, 227, 0.5)',
-          },
-        },
-        cosmic: {
-          gradientLeft: `adjust-hue(${colors.success}, 20deg)`,
-          gradientRight: colors.success,
-          bevel: `shade(${colors.success}, 14%)`,
-          shadow: 'rgba (33, 7, 77, 0.5)',
-          glow: {
-            params: '0 2px 12px 0',
-            color: `adjust-hue(${colors.success}, 10deg)`,
-          },
-        },
-      },
-      {
-        status: 'info',
-        container: 'info-container',
-        title: 'Info Button',
-        buttonTitle: 'Info',
-        default: {
-          gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
-          gradientRight: colors.info,
-        },
-        corporate: {
-          color: colors.info,
-          glow: {
-            params: '0 0 20px 0',
-            color: 'rgba (186, 127, 236, 0.5)',
-          },
-        },
-        cosmic: {
-          gradientLeft: `adjust-hue(${colors.info}, -10deg)`,
-          gradientRight: colors.info,
-          bevel: `shade(${colors.info}, 14%)`,
-          shadow: 'rgba (33, 7, 77, 0.5)',
-          glow: {
-            params: '0 2px 12px 0',
-            color: `adjust-hue(${colors.info}, -5deg)`,
-          },
-        },
-      },
-      {
-        status: 'danger',
-        container: 'danger-container',
-        title: 'Danger Button',
-        buttonTitle: 'Danger',
-        default: {
-          gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
-          gradientRight: colors.danger,
-        },
-        corporate: {
-          color: colors.danger,
-          glow: {
-            params: '0 0 20px 0',
-            color: 'rgba (255, 107, 131, 0.5)',
-          },
-        },
-        cosmic: {
-          gradientLeft: `adjust-hue(${colors.danger}, -20deg)`,
-          gradientRight: colors.danger,
-          bevel: `shade(${colors.danger}, 14%)`,
-          shadow: 'rgba (33, 7, 77, 0.5)',
-          glow: {
-            params: '0 2px 12px 0',
-            color: `adjust-hue(${colors.danger}, -10deg)`,
-          },
-        },
-      },
-    ];
-  }
-
-  ngOnDestroy() {
-    this.themeSubscription.unsubscribe();
-  }
-}
diff --git a/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.html b/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.html
deleted file mode 100644
index c08e786cb5..0000000000
--- a/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<nb-card>
-  <nb-card-body>
-    <nb-actions size="medium" fullWidth>
-      <nb-action>
-        <i class="nb-pause-outline"></i><span>Pause</span>
-      </nb-action>
-      <nb-action>
-        <i class="nb-list"></i><span>Logs</span>
-      </nb-action>
-      <nb-action>
-        <i class="nb-search"></i><span>Search</span>
-      </nb-action>
-      <nb-action>
-        <i class="nb-gear"></i><span>Setup</span>
-      </nb-action>
-    </nb-actions>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.scss b/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.scss
deleted file mode 100644
index cbc998dd90..0000000000
--- a/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-
-  nb-actions > nb-action {
-    padding: 0;
-  }
-
-  nb-action {
-    i {
-      color: nb-theme(color-fg);
-      font-size: 2.5rem;
-      @include nb-ltr(margin-right, 1rem);
-      @include nb-rtl(margin-left, 1rem);
-
-      @include nb-for-theme(corporate) {
-        color: nb-theme(actions-fg);
-      }
-    }
-
-    span {
-      font-family: nb-theme(font-secondary);
-      font-weight: nb-theme(font-weight-bold);
-      color: nb-theme(color-fg-heading);
-      text-transform: uppercase;
-    }
-  }
-
-  @include media-breakpoint-down(md) {
-    nb-actions nb-action {
-      padding: 0 0.75rem;
-    }
-  }
-  @include media-breakpoint-down(sm) {
-    nb-card-body {
-      padding: 1rem;
-    }
-
-    nb-action {
-      font-size: 0.75rem;
-      i {
-        font-size: 2rem;
-        @include nb-ltr(margin-right, 0.5rem);
-        @include nb-rtl(margin-left, 0.5rem);
-      }
-    }
-  }
-
-  @include media-breakpoint-down(is) {
-    nb-action i {
-      font-size: 1.75rem;
-      margin: 0;
-    }
-    span {
-      display: none;
-    }
-  }
-}
diff --git a/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.ts b/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.ts
deleted file mode 100644
index 8ff17224d6..0000000000
--- a/src/app/pages/forms/buttons/labeled-actions-group/labeled-actions-group.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-labeled-actions-group',
-  styleUrls: ['./labeled-actions-group.component.scss'],
-  templateUrl: './labeled-actions-group.component.html',
-})
-export class LabeledActionsGroupComponent {
-}
diff --git a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.html b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.html
deleted file mode 100644
index 2b031f4b64..0000000000
--- a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<nb-card>
-  <nb-card-header>
-    <span>Default Buttons</span>
-  </nb-card-header>
-  <nb-card-body>
-    <div class="row">
-      <div class="example-container col-md-4" *ngFor="let b of buttons">
-        <div class="container-title">
-          <span>{{ b.containerTitle }}</span>
-        </div>
-        <div class="container-btn">
-          <button nbButton
-                  outline
-                  status="{{ b.status }}"
-                  class="btn-demo">
-            {{ b.title }}
-          </button>
-        </div>
-        <div class="{{ b.container }}">
-          <div class="state-container">
-            <div class="state-value original"></div>
-            <div class="state-details">
-              <span class="header">Default</span>
-              <span class="subheader">{{ b.default }}</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value hover"></div>
-            <div class="state-details">
-              <span class="header">Hover</span>
-              <span class="subheader">14% white</span>
-            </div>
-          </div>
-          <div class="state-container">
-            <div class="state-value active"></div>
-            <div class="state-details">
-              <span class="header">Active</span>
-              <span class="subheader">14% black</span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.scss b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.scss
deleted file mode 100644
index 5ed3e93e32..0000000000
--- a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.scss
+++ /dev/null
@@ -1,130 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
-
-@include nb-install-component() {
-
-  nb-card-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  nb-card-body {
-    padding-bottom: 0;
-  }
-
-  .example-container {
-    margin-bottom: 1.5rem;
-  }
-
-  .primary-container {
-    .original {
-      background-color: nb-theme(btn-primary-bg);
-    }
-    .hover {
-      @include btn-primary-hover();
-    }
-    .active {
-      @include btn-primary-active();
-    }
-  }
-
-  .primary-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-primary-bg);
-  }
-
-  .success-container {
-    .original {
-      background-color: nb-theme(btn-success-bg);
-    }
-    .hover {
-      @include btn-success-hover();
-    }
-    .active {
-      @include btn-success-active();
-    }
-  }
-
-  .success-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-success-bg);
-  }
-
-  .warning-container {
-    .original {
-      background-color: nb-theme(btn-warning-bg);
-    }
-    .hover {
-      @include btn-warning-hover();
-    }
-    .active {
-      @include btn-warning-active();
-    }
-  }
-
-  .warning-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-warning-bg);
-  }
-
-  .info-container {
-    .original {
-      background-color: nb-theme(btn-info-bg);
-    }
-    .hover {
-      @include btn-info-hover();
-    }
-    .active {
-      @include btn-info-active();
-    }
-  }
-
-  .info-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-info-bg);
-  }
-
-  .danger-container {
-    .original {
-      background-color: nb-theme(btn-danger-bg);
-    }
-    .hover {
-      @include btn-danger-hover();
-    }
-    .active {
-      @include btn-danger-active();
-    }
-  }
-
-  .danger-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-danger-bg);
-  }
-
-  .secondary-container {
-    .original {
-      border: 2px solid nb-theme(btn-secondary-border);
-    }
-    .hover {
-      @include btn-secondary-hover();
-    }
-    .active {
-      @include btn-secondary-active();
-    }
-  }
-
-  .secondary-container.outline .original {
-    background-color: transparent;
-    border: 2px solid nb-theme(btn-secondary-border);
-  }
-
-  @include media-breakpoint-up(xxl) {
-    .example-container {
-      flex: 0 0 20%;
-      max-width: 20%;
-    }
-  }
-}
diff --git a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.ts b/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.ts
deleted file mode 100644
index 9b16982daf..0000000000
--- a/src/app/pages/forms/buttons/outline-buttons/outline-buttons.component.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-outline-buttons',
-  styleUrls: ['./outline-buttons.component.scss'],
-  templateUrl: './outline-buttons.component.html',
-})
-export class OutlineButtonsComponent {
-
-  buttons = [
-    {
-      status: 'primary',
-      container: 'primary-container outline',
-      containerTitle: 'Primary Button',
-      title: 'Primary',
-      default: '#7659ff',
-    },
-    {
-      status: 'warning',
-      container: 'warning-container outline',
-      containerTitle: 'Warning Button',
-      title: 'Warning',
-      default: '#ffcb17',
-    },
-    {
-      status: 'success',
-      container: 'success-container outline',
-      containerTitle: 'Success Button',
-      title: 'Success',
-      default: '#00d977',
-    },
-    {
-      status: 'info',
-      container: 'info-container',
-      containerTitle: 'Info Button',
-      title: 'Info',
-      default: '#0088ff',
-    },
-    {
-      status: 'danger',
-      container: 'danger-container outline',
-      containerTitle: 'Danger Button',
-      title: 'Danger',
-      default: '#ff386a',
-    },
-  ];
-}
diff --git a/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.html b/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.html
deleted file mode 100644
index 880da47496..0000000000
--- a/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<nb-card>
-  <nb-card-header>Button Shapes</nb-card-header>
-  <nb-card-body>
-    <div class="shape-container">
-      <div class="container-title">
-        <span>Rectangle Button</span>
-      </div>
-      <div class="subheader">
-        <span>Border radius:</span>
-        <span>4px</span>
-      </div>
-      <div>
-        <button nbButton shape="rectangle" status="success" class="btn-demo">Rectangle</button>
-      </div>
-    </div>
-
-    <div class="shape-container">
-      <div class="container-title">
-        <span>Semi-round Button</span>
-      </div>
-      <div class="subheader">
-        <span>Border radius:</span>
-        <span>12px</span>
-      </div>
-      <div>
-        <button nbButton shape="semi-round" status="success" class="btn-demo">Semi-round</button>
-      </div>
-    </div>
-
-    <div class="shape-container">
-      <div class="container-title">
-        <span>Rounded Button</span>
-      </div>
-      <div class="subheader">
-        <span>Border radius:</span>
-        <span>round</span>
-      </div>
-      <div>
-        <button nbButton shape="round" status="success" class="btn-demo">Round</button>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.scss b/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.scss
deleted file mode 100644
index 996e682166..0000000000
--- a/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    padding: 0 0 29px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-  }
-
-  .shape-container {
-    margin: 1.25rem 1.25rem 0;
-  }
-
-  .container-title {
-    margin-bottom: 0.25rem;
-  }
-
-  .subheader {
-    margin-bottom: 1rem;
-    font-size: 0.875rem;
-
-    span:nth-child(2) {
-      color: nb-theme(color-fg-heading);
-      font-weight: nb-theme(font-weight-bold);
-    }
-  }
-}
diff --git a/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.ts b/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.ts
deleted file mode 100644
index dde928d8ba..0000000000
--- a/src/app/pages/forms/buttons/shape-buttons/shape-buttons.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-shape-buttons',
-  styleUrls: ['./shape-buttons.component.scss'],
-  templateUrl: './shape-buttons.component.html',
-})
-export class ShapeButtonsComponent {
-}
diff --git a/src/app/pages/forms/buttons/size-buttons/size-buttons.component.html b/src/app/pages/forms/buttons/size-buttons/size-buttons.component.html
deleted file mode 100644
index c76996959d..0000000000
--- a/src/app/pages/forms/buttons/size-buttons/size-buttons.component.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<nb-card>
-  <nb-card-header>Button Sizes</nb-card-header>
-
-  <nb-card-body>
-    <div class="size-container">
-      <div class="container-title">
-        <span>Large Button</span>
-      </div>
-      <div class="subheader">
-        <span>0.875rem 1.75rem</span>
-      </div>
-      <div>
-        <button nbButton size="large">Large Button</button>
-      </div>
-    </div>
-    <div class="size-container">
-      <div class="container-title">
-        <span>Medium Button</span>
-      </div>
-      <div class="subheader">
-        <span>0.75rem 1.5rem</span>
-      </div>
-      <div>
-        <button nbButton size="medium">Medium Button</button>
-      </div>
-    </div>
-    <div class="size-container">
-      <div class="container-title">
-        <span>Small Button</span>
-      </div>
-      <div class="subheader">
-        <span>0.675rem 1.5rem</span>
-      </div>
-      <div>
-        <button nbButton size="small">Small Button</button>
-      </div>
-    </div>
-    <div class="size-container">
-      <div class="container-title">
-        <span>X-Small Button</span>
-      </div>
-      <div class="subheader">
-        <span>0.5rem 1.25rem</span>
-      </div>
-      <div>
-        <button nbButton size="xsmall">X-Small Button</button>
-      </div>
-    </div>
-  </nb-card-body>
-</nb-card>
diff --git a/src/app/pages/forms/buttons/size-buttons/size-buttons.component.scss b/src/app/pages/forms/buttons/size-buttons/size-buttons.component.scss
deleted file mode 100644
index 67d7ae288d..0000000000
--- a/src/app/pages/forms/buttons/size-buttons/size-buttons.component.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@import '../../../../@theme/styles/themes';
-@import '~@nebular/bootstrap/styles/buttons';
-
-@include nb-install-component() {
-
-  nb-card-body {
-    padding: 0 1.25rem 1.25rem 0;
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  .container-title {
-    margin-bottom: 0.25rem;
-  }
-
-  .size-container {
-    margin: 1.25rem 0 0 1.25rem;
-  }
-
-  .subheader {
-    margin-bottom: 0.75rem;
-    font-size: 0.875rem;
-    font-weight: nb-theme(font-weight-bolder);
-    color: nb-theme(color-fg-heading);
-  }
-}
diff --git a/src/app/pages/forms/buttons/size-buttons/size-buttons.component.ts b/src/app/pages/forms/buttons/size-buttons/size-buttons.component.ts
deleted file mode 100644
index bdc9bb3391..0000000000
--- a/src/app/pages/forms/buttons/size-buttons/size-buttons.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'ngx-size-buttons',
-  styleUrls: ['./size-buttons.component.scss'],
-  templateUrl: './size-buttons.component.html',
-})
-export class SizeButtonsComponent {
-}
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html
index b81ce9342b..c40a0b6d8b 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.html
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.html
@@ -3,108 +3,83 @@
     <nb-card>
       <nb-card-header>Default Inputs</nb-card-header>
       <nb-card-body>
-        <div class="input-group">
-          <input type="text" nbInput fullWidth placeholder="Project">
-        </div>
-        <div class="row full-name-inputs">
-          <div class="col-sm-6 input-group">
-            <input type="text" nbInput fullWidth placeholder="Nick">
-          </div>
-          <div class="col-sm-6 input-group">
-            <input type="text" nbInput fullWidth placeholder="Last Name">
-          </div>
-        </div>
-        <div class="input-group">
-          <input type="password" nbInput fullWidth placeholder="Password">
-        </div>
-        <div class="input-group has-person-icon">
-          <input type="text" placeholder="With Icon" class="form-control"/>
-        </div>
-        <div class="input-group">
-          <input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle border">
-        </div>
-        <div class="input-group">
-          <input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi-round border">
-        </div>
-        <div class="input-group">
-          <input type="text" nbInput fullWidth shape="round" placeholder="Rounded border">
-        </div>
-        <div class="input-group">
-          <input type="text" nbInput fullWidth placeholder="Disabled input" disabled/>
-        </div>
-        <div class="input-group">
-          <textarea rows="5" nbInput fullWidth shape="round"  placeholder="Text Area"></textarea>
-        </div>
-        <div class="input-group input-group-sm">
-          <input type="text" nbInput fullWidth fieldSize="small"  placeholder="Small Input">
-        </div>
-        <div class="input-group input-group-lg">
-          <input type="text" nbInput fullWidth fieldSize="medium"  placeholder="Medium Input">
-        </div>
-        <div class="input-group input-group-lg">
-          <input type="text" nbInput fullWidth fieldSize="large"  placeholder="Large Input">
-        </div>
+        <input type="text" nbInput fullWidth placeholder="Project">
+        <div class="full-name-inputs">
+          <input type="text" nbInput fullWidth placeholder="Nick">
+          <input type="text" nbInput fullWidth placeholder="Last Name">
+        </div>
+        <input type="password" nbInput fullWidth placeholder="Password">
+        <input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle border">
+        <input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi-round border">
+        <input type="text" nbInput fullWidth shape="round" placeholder="Rounded border">
+        <input type="text" nbInput fullWidth placeholder="Disabled input" disabled/>
+        <textarea rows="5" nbInput fullWidth shape="round"  placeholder="Text Area"></textarea>
+        <input type="text" nbInput fullWidth fieldSize="small"  placeholder="Small Input">
+        <input type="text" nbInput fullWidth fieldSize="medium"  placeholder="Medium Input">
+        <input type="text" nbInput fullWidth fieldSize="large"  placeholder="Large Input">
       </nb-card-body>
     </nb-card>
   </div>
 
   <div class="col-lg-6">
+
+    <nb-card>
+      <nb-card-header>Select</nb-card-header>
+      <nb-card-body>
+        <nb-select selected="1">
+          <nb-option value="1">Option 1</nb-option>
+          <nb-option value="2">Option 2</nb-option>
+        </nb-select>
+      </nb-card-body>
+    </nb-card>
+
     <nb-card>
       <nb-card-header>Validation States</nb-card-header>
       <nb-card-body>
-        <div class="form-group">
-          <input type="text" nbInput fullWidth status="info"  placeholder="Input with Info">
-        </div>
-        <div class="form-group">
-          <input type="text" nbInput fullWidth status="success"  placeholder="Input with Warning">
-        </div>
-        <div class="form-group">
-          <input type="text" nbInput fullWidth status="warning"  placeholder="Input with Danger">
-        </div>
-        <div class="form-group">
-          <input type="text" nbInput fullWidth status="danger" placeholder="Input with Danger">
-        </div>
-        <div class="form-group validation-checkboxes row">
-          <nb-checkbox status="success" class="col-sm-4">Checkbox with Success</nb-checkbox>
-          <nb-checkbox status="warning" class="col-sm-4">Checkbox with Warning</nb-checkbox>
-          <nb-checkbox status="danger" class="col-sm-4">Checkbox with Danger</nb-checkbox>
+        <input type="text" nbInput fullWidth status="info"  placeholder="Input with Info">
+        <input type="text" nbInput fullWidth status="success"  placeholder="Warning Input">
+        <input type="text" nbInput fullWidth status="warning"  placeholder="Danger Input">
+        <input type="text" nbInput fullWidth status="danger" placeholder="Danger Input">
+        <input type="text" nbInput fullWidth status="primary"  placeholder="Input with Primary">
+        <div class="validation-checkboxes">
+          <nb-checkbox status="success">Success Checkbox</nb-checkbox>
+          <nb-checkbox status="warning">Warning Checkbox</nb-checkbox>
+          <nb-checkbox status="danger">Danger Checkbox</nb-checkbox>
         </div>
       </nb-card-body>
     </nb-card>
 
     <nb-card>
       <nb-card-header>Checkboxes & Radios</nb-card-header>
-      <nb-card-body>
-        <div class="row demo-checkboxes-radio">
-          <div class="demo-checkboxes col-sm-4">
-            <nb-checkbox>Checkbox 1</nb-checkbox>
-            <nb-checkbox [value]="true">Checkbox 2</nb-checkbox>
-          </div>
-          <div class="demo-radio col-sm-4">
-            <nb-radio-group [(value)]="radioGroupValue">
-              <nb-radio
-                [value]="'This is value 1'">
-                Radio 1
-              </nb-radio>
-              <nb-radio
-                [value]="'This is value 2'">
-                Radio 2
-              </nb-radio>
-              <nb-radio
-                [value]="'This is value 3'">
-                Radio 3
-              </nb-radio>
-            </nb-radio-group>
-          </div>
-          <div class="demo-disabled-checkbox-radio col-sm-4">
-            <nb-checkbox disabled>Disabled Checkbox</nb-checkbox>
-            <nb-radio-group disabled>
-              <nb-radio
-                [value]="'Disabled Value'">
-                Disabled Radio
-              </nb-radio>
-            </nb-radio-group>
-          </div>
+      <nb-card-body class="checkbox-radio">
+        <div class="demo-items">
+          <nb-checkbox>Checkbox 1</nb-checkbox>
+          <nb-checkbox [value]="true">Checkbox 2</nb-checkbox>
+        </div>
+        <div class="demo-items">
+          <nb-radio-group [(value)]="radioGroupValue">
+            <nb-radio
+              [value]="'This is value 1'">
+              Radio 1
+            </nb-radio>
+            <nb-radio
+              [value]="'This is value 2'">
+              Radio 2
+            </nb-radio>
+            <nb-radio
+              [value]="'This is value 3'">
+              Radio 3
+            </nb-radio>
+          </nb-radio-group>
+        </div>
+        <div class="demo-items">
+          <nb-checkbox disabled>Disabled Checkbox</nb-checkbox>
+          <nb-radio-group disabled>
+            <nb-radio
+              [value]="'Disabled Value'">
+              Disabled Radio
+            </nb-radio>
+          </nb-radio-group>
         </div>
       </nb-card-body>
     </nb-card>
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.scss b/src/app/pages/forms/form-inputs/form-inputs.component.scss
index 763b31ae3f..f3fbf932b5 100644
--- a/src/app/pages/forms/form-inputs/form-inputs.component.scss
+++ b/src/app/pages/forms/form-inputs/form-inputs.component.scss
@@ -1,130 +1,26 @@
-@import '../../../@theme/styles/themes';
-@import '~bootstrap/scss/mixins/breakpoints';
-@import '~@nebular/theme/styles/global/breakpoints';
+nb-card-body {
+  overflow: visible;
+  padding-top: 0;
 
-@include nb-install-component() {
-
-  nb-card-body {
-    overflow: visible;
-  }
-
-  .input-group {
-    margin-bottom: 1rem;
-  }
-
-  .validation-checkboxes {
-    display: flex;
-    justify-content: space-between;
-
-    .custom-control {
-      margin-left: 1rem;
-    }
-  }
-
-  .demo-checkboxes {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 1rem;
-  }
-
-  .demo-radio {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 1rem;
-  }
-
-  .demo-disabled-checkbox-radio {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 1rem;
-  }
-
-  .demo-checkboxes-radio {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .demo-rating {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-  }
-
-  .star {
-    font-size: 1.5rem;
-    color: nb-theme(color-fg);
-  }
-
-  .filled {
-    color: nb-theme(color-fg);
-  }
-
-  // TODO: Replace with the card header styles mixin
-  .rating-header {
-    line-height: 2rem;
-    font-size: 1.25rem;
-    font-family: nb-theme(font-secondary);
-    font-weight: nb-theme(font-weight-bolder);
-    color: nb-theme(color-fg-heading);
-  }
-
-  .current-rate {
-    font-size: 1.5rem;
-    @include nb-ltr(padding-left, 1rem);
-    @include nb-rtl(padding-right, 1rem);
-    color: nb-theme(color-fg-heading);
-  }
-
-  .full-name-inputs {
-    display: flex;
-  }
-
-  .input-group.has-person-icon {
-    position: relative;
-
-    .form-control {
-
-      padding-left: 3rem;
-    }
-
-    &::before {
-      content: '\F47D';
-      font-family: 'Ionicons';
-      font-size: 2rem;
-      position: absolute;
-      z-index: 100;
-      left: 1rem;
-      top: 0.25rem;
-    }
-  }
-
-  .dropdown {
-    min-width: 7rem;
-  }
-
-  .dropdown-menu {
-    width: auto;
+  > * {
+    margin-top: 1rem;
   }
+}
 
-  .form-group label {
-    padding: 0 0 0.75rem;
-  }
+.full-name-inputs,
+.validation-checkboxes {
+  display: flex;
+  margin: 0 -0.5rem;
 
-  ngb-rating {
-    outline: none;
+  > * {
+    margin: 0 0.5rem;
   }
+}
 
-  ngb-rating i {
-    color: nb-theme(color-success);
-    @include nb-for-theme(cosmic) {
-      color: nb-theme(color-primary);
-    }
-  }
+.checkbox-radio {
+  display: flex;
+}
 
-  @include media-breakpoint-down(xs) {
-    button:not(.btn-icon) {
-      padding: 0.75rem 1rem;
-      font-size: 0.75rem;
-    }
-  }
+.demo-items {
+  flex: 1 0 33%;
 }
diff --git a/src/app/pages/forms/form-layouts/form-layouts.component.html b/src/app/pages/forms/form-layouts/form-layouts.component.html
index 8e0e755dd2..780ff8341c 100644
--- a/src/app/pages/forms/form-layouts/form-layouts.component.html
+++ b/src/app/pages/forms/form-layouts/form-layouts.component.html
@@ -4,13 +4,10 @@
       <nb-card-header>Inline form</nb-card-header>
       <nb-card-body>
         <form class="form-inline">
-          <input type="text" class="form-control full-width" placeholder="Jane Doe">
-          <div class="input-group full-width">
-            <div class="input-group-addon">@</div>
-            <input type="text" class="form-control" placeholder="Email">
-          </div>
+          <input type="text" nbInput fullWidth placeholder="Jane Doe">
+          <input type="text" nbInput fullWidth placeholder="Email">
           <nb-checkbox>Remember me</nb-checkbox>
-          <button type="submit" class="btn btn-primary">Submit</button>
+          <button type="submit" nbButton status="primary">Submit</button>
         </form>
       </nb-card-body>
     </nb-card>
@@ -24,46 +21,30 @@
       <nb-card-body>
         <form>
           <div class="form-group row">
-            <label for="inputEmail1" class="col-sm-3 col-form-label">Email</label>
+            <label for="inputEmail1" class="label col-sm-3 col-form-label">Email</label>
             <div class="col-sm-9">
-              <input type="email" class="form-control" id="inputEmail1" placeholder="Email">
+              <input type="email" nbInput fullWidth id="inputEmail1" placeholder="Email">
             </div>
           </div>
           <div class="form-group row">
-            <label for="inputPassword2" class="col-sm-3 col-form-label">Password</label>
+            <label for="inputPassword2" class="label col-sm-3 col-form-label">Password</label>
             <div class="col-sm-9">
-              <input type="password" class="form-control" id="inputPassword2" placeholder="Password">
+              <input type="password" nbInput fullWidth id="inputPassword2" placeholder="Password">
             </div>
           </div>
           <div class="form-group row">
-            <label class="col-sm-3">Radios</label>
+            <label class="col-sm-3 label">Radios</label>
             <div class="col-sm-9">
-              <div class="form-check">
-                <label class="custom-control custom-radio">
-                  <input type="radio" class="custom-control-input" name="gridRadios" checked>
-                  <span class="custom-control-indicator"></span>
-                  <span class="custom-control-description">Option one is this and that&mdash;be sure to include why it's great</span>
-                </label>
-              </div>
-              <div class="form-check">
-                <label class="custom-control custom-radio">
-                  <input type="radio" class="custom-control-input" name="gridRadios">
-                  <span class="custom-control-indicator"></span>
-                  <span class="custom-control-description">Option two can be something else and selecting it will deselect option one</span>
-                </label>
-              </div>
-              <div class="form-check disabled">
-                <label class="custom-control custom-radio">
-                  <input type="radio" class="custom-control-input" name="gridRadios" disabled>
-                  <span class="custom-control-indicator"></span>
-                  <span class="custom-control-description">Option three is disabled</span>
-                </label>
-              </div>
+              <nb-radio-group>
+                <nb-radio>Option 1</nb-radio>
+                <nb-radio>Option 2</nb-radio>
+                <nb-radio disabled>Disabled Option</nb-radio>
+              </nb-radio-group>
             </div>
           </div>
           <div class="form-group row">
             <div class="offset-sm-3 col-sm-9">
-              <button type="submit" class="btn btn-primary">Sign in</button>
+              <button type="submit" nbButton status="primary">Sign in</button>
             </div>
           </div>
         </form>
@@ -75,15 +56,15 @@
       <nb-card-body>
         <form>
           <div class="form-group">
-            <input type="text" class="form-control" placeholder="Recipients">
+            <input type="text" nbInput fullWidth placeholder="Recipients">
           </div>
           <div class="form-group">
-            <input type="text" class="form-control" placeholder="Subject">
+            <input type="text" nbInput fullWidth placeholder="Subject">
           </div>
           <div class="form-group">
-            <textarea class="form-control" placeholder="Message"></textarea>
+            <textarea nbInput placeholder="Message"></textarea>
           </div>
-          <button type="submit" class="btn btn-success">Send</button>
+          <button type="submit" nbButton status="success">Send</button>
         </form>
       </nb-card-body>
     </nb-card>
@@ -95,17 +76,17 @@
       <nb-card-body>
         <form>
           <div class="form-group">
-            <label for="exampleInputEmail1">Email address</label>
-            <input type="email" class="form-control" id="exampleInputEmail1" placeholder="Email">
+            <label for="exampleInputEmail1" class="label">Email address</label>
+            <input type="email" nbInput fullWidth id="exampleInputEmail1" placeholder="Email">
           </div>
           <div class="form-group">
-            <label for="exampleInputPassword1">Password</label>
-            <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
+            <label for="exampleInputPassword1" class="label">Password</label>
+            <input type="password" nbInput fullWidth id="exampleInputPassword1" placeholder="Password">
           </div>
           <div class="form-group">
             <nb-checkbox>Check me out</nb-checkbox>
           </div>
-          <button type="submit" class="btn btn-danger">Submit</button>
+          <button type="submit" nbButton status="danger">Submit</button>
         </form>
       </nb-card-body>
     </nb-card>
@@ -116,32 +97,32 @@
         <div class="row">
           <div class="col-sm-6">
             <div class="form-group">
-              <label for="inputFirstName">First Name</label>
-              <input type="text" class="form-control" id="inputFirstName" placeholder="First Name">
+              <label for="inputFirstName" class="label">First Name</label>
+              <input type="text" nbInput fullWidth id="inputFirstName" placeholder="First Name">
             </div>
           </div>
           <div class="col-sm-6">
             <div class="form-group">
-              <label for="inputLastName">Last Name</label>
-              <input type="text" class="form-control" id="inputLastName" placeholder="Last Name">
+              <label for="inputLastName" class="label">Last Name</label>
+              <input type="text" nbInput fullWidth id="inputLastName" placeholder="Last Name">
             </div>
           </div>
         </div>
         <div class="row">
           <div class="col-sm-6">
             <div class="form-group">
-              <label for="inputEmail">Email</label>
-              <input type="email" class="form-control" id="inputEmail" placeholder="Email">
+              <label for="inputEmail" class="label">Email</label>
+              <input type="email" nbInput fullWidth id="inputEmail" placeholder="Email">
             </div>
           </div>
           <div class="col-sm-6">
             <div class="form-group">
-              <label for="inputWebsite">Website</label>
-              <input type="text" class="form-control" id="inputWebsite" placeholder="Website">
+              <label for="inputWebsite" class="label">Website</label>
+              <input type="text" nbInput fullWidth id="inputWebsite" placeholder="Website">
             </div>
           </div>
         </div>
-        <button type="submit" class="btn btn-primary">Submit</button>
+        <button type="submit" nbButton>Submit</button>
       </nb-card-body>
     </nb-card>
   </div>
@@ -154,15 +135,15 @@
       <nb-card-body>
         <form class="form-horizontal">
           <div class="form-group row">
-            <label for="inputEmail3" class="col-sm-3 form-control-label">Email</label>
+            <label for="inputEmail3" class="label col-sm-3 form-control-label">Email</label>
             <div class="col-sm-9">
-              <input type="email" class="form-control" id="inputEmail3" placeholder="Email">
+              <input type="email" nbInput fullWidth id="inputEmail3" placeholder="Email">
             </div>
           </div>
           <div class="form-group row">
-            <label for="inputPassword3" class="col-sm-3 form-control-label">Password</label>
+            <label for="inputPassword3" class="label col-sm-3 form-control-label">Password</label>
             <div class="col-sm-9">
-              <input type="password" class="form-control" id="inputPassword3" placeholder="Password">
+              <input type="password" nbInput fullWidth id="inputPassword3" placeholder="Password">
             </div>
           </div>
           <div class="form-group row">
@@ -174,7 +155,7 @@
           </div>
           <div class="form-group row">
             <div class="offset-sm-3 col-sm-9">
-              <button type="submit" class="btn btn-warning">Sign in</button>
+              <button type="submit" nbButton status="warning">Sign in</button>
             </div>
           </div>
         </form>
diff --git a/src/app/pages/forms/form-layouts/form-layouts.component.scss b/src/app/pages/forms/form-layouts/form-layouts.component.scss
index 5bcd197d39..4328e97547 100644
--- a/src/app/pages/forms/form-layouts/form-layouts.component.scss
+++ b/src/app/pages/forms/form-layouts/form-layouts.component.scss
@@ -1,21 +1,15 @@
-@import '../../../@theme/styles/themes';
-
-@include nb-install-component() {
-  .full-width {
-    flex: 1;
-    min-width: 220px;
-  }
+nb-checkbox {
+  margin-bottom: 1rem;
+}
 
-  nb-checkbox {
-    margin-bottom: 1rem;
-  }
+.form-inline [fullWidth] {
+  flex: 1;
+}
 
-  .form-inline > * {
-    @include nb-ltr(margin, 0 1.5rem 1.5rem 0);
-    @include nb-rtl(margin, 0 0 1.5rem 1.5rem);
-  }
+.form-inline > * {
+  margin: 0 1.5rem 1.5rem 0;
+}
 
-  nb-card.inline-form-card nb-card-body {
-    padding-bottom: 0;
-  }
+nb-card.inline-form-card nb-card-body {
+  padding-bottom: 0;
 }
diff --git a/src/app/pages/forms/forms-routing.module.ts b/src/app/pages/forms/forms-routing.module.ts
index a3ec784d42..a50d05a7fc 100644
--- a/src/app/pages/forms/forms-routing.module.ts
+++ b/src/app/pages/forms/forms-routing.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 import { FormsComponent } from './forms.component';
 import { FormInputsComponent } from './form-inputs/form-inputs.component';
@@ -7,32 +7,34 @@ import { FormLayoutsComponent } from './form-layouts/form-layouts.component';
 import { DatepickerComponent } from './datepicker/datepicker.component';
 import { ButtonsComponent } from './buttons/buttons.component';
 
-const routes: Routes = [{
-  path: '',
-  component: FormsComponent,
-  children: [
-    {
-      path: 'inputs',
-      component: FormInputsComponent,
-    },
-    {
-      path: 'layouts',
-      component: FormLayoutsComponent,
-    },
-    {
-      path: 'layouts',
-      component: FormLayoutsComponent,
-    },
-    {
-      path: 'buttons',
-      component: ButtonsComponent,
-    },
-    {
-      path: 'datepicker',
-      component: DatepickerComponent,
-    },
-  ],
-}];
+const routes: Routes = [
+  {
+    path: '',
+    component: FormsComponent,
+    children: [
+      {
+        path: 'inputs',
+        component: FormInputsComponent,
+      },
+      {
+        path: 'layouts',
+        component: FormLayoutsComponent,
+      },
+      {
+        path: 'layouts',
+        component: FormLayoutsComponent,
+      },
+      {
+        path: 'buttons',
+        component: ButtonsComponent,
+      },
+      {
+        path: 'datepicker',
+        component: DatepickerComponent,
+      },
+    ],
+  },
+];
 
 @NgModule({
   imports: [
@@ -43,12 +45,5 @@ const routes: Routes = [{
   ],
 })
 export class FormsRoutingModule {
-
 }
 
-export const routedComponents = [
-  FormsComponent,
-  FormInputsComponent,
-  FormLayoutsComponent,
-  DatepickerComponent,
-];
diff --git a/src/app/pages/forms/forms.module.ts b/src/app/pages/forms/forms.module.ts
index fec35e0158..6782b85a0f 100644
--- a/src/app/pages/forms/forms.module.ts
+++ b/src/app/pages/forms/forms.module.ts
@@ -1,17 +1,45 @@
 import { NgModule } from '@angular/core';
+import {
+  NbActionsModule,
+  NbButtonModule,
+  NbCardModule,
+  NbCheckboxModule,
+  NbDatepickerModule, NbIconModule,
+  NbInputModule,
+  NbRadioModule,
+  NbSelectModule,
+  NbUserModule,
+} from '@nebular/theme';
 
 import { ThemeModule } from '../../@theme/theme.module';
-import { FormsRoutingModule, routedComponents } from './forms-routing.module';
-import { ButtonsModule } from './buttons/buttons.module';
+import { FormsRoutingModule } from './forms-routing.module';
+import { FormsComponent } from './forms.component';
+import { FormInputsComponent } from './form-inputs/form-inputs.component';
+import { FormLayoutsComponent } from './form-layouts/form-layouts.component';
+import { DatepickerComponent } from './datepicker/datepicker.component';
+import { ButtonsComponent } from './buttons/buttons.component';
 
 @NgModule({
   imports: [
     ThemeModule,
+    NbInputModule,
+    NbCardModule,
+    NbButtonModule,
+    NbActionsModule,
+    NbUserModule,
+    NbCheckboxModule,
+    NbRadioModule,
+    NbDatepickerModule,
     FormsRoutingModule,
-    ButtonsModule,
+    NbSelectModule,
+    NbIconModule,
   ],
   declarations: [
-    ...routedComponents,
+    FormsComponent,
+    ButtonsComponent,
+    FormInputsComponent,
+    FormLayoutsComponent,
+    DatepickerComponent,
   ],
 })
 export class FormsModule { }
diff --git a/src/app/pages/extra-components/accordion/accordion.component.html b/src/app/pages/layout/accordion/accordion.component.html
similarity index 100%
rename from src/app/pages/extra-components/accordion/accordion.component.html
rename to src/app/pages/layout/accordion/accordion.component.html
diff --git a/src/app/pages/layout/accordion/accordion.component.scss b/src/app/pages/layout/accordion/accordion.component.scss
new file mode 100644
index 0000000000..33607860c5
--- /dev/null
+++ b/src/app/pages/layout/accordion/accordion.component.scss
@@ -0,0 +1,7 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  .accordion-container:first-child {
+    margin-bottom: nb-theme(card-margin-bottom);
+  }
+}
diff --git a/src/app/pages/extra-components/accordion/accordion.component.ts b/src/app/pages/layout/accordion/accordion.component.ts
similarity index 84%
rename from src/app/pages/extra-components/accordion/accordion.component.ts
rename to src/app/pages/layout/accordion/accordion.component.ts
index e7aa4a10fe..94965cb5f1 100644
--- a/src/app/pages/extra-components/accordion/accordion.component.ts
+++ b/src/app/pages/layout/accordion/accordion.component.ts
@@ -7,7 +7,7 @@ import { Component, ViewChild } from '@angular/core';
 })
 export class AccordionComponent {
 
-  @ViewChild('item') accordion;
+  @ViewChild('item', { static: true }) accordion;
 
   toggle() {
     this.accordion.toggle();
diff --git a/src/app/pages/extra-components/infinite-list/infinite-list.component.html b/src/app/pages/layout/infinite-list/infinite-list.component.html
similarity index 100%
rename from src/app/pages/extra-components/infinite-list/infinite-list.component.html
rename to src/app/pages/layout/infinite-list/infinite-list.component.html
diff --git a/src/app/pages/layout/infinite-list/infinite-list.component.scss b/src/app/pages/layout/infinite-list/infinite-list.component.scss
new file mode 100644
index 0000000000..0e5b7ee1b9
--- /dev/null
+++ b/src/app/pages/layout/infinite-list/infinite-list.component.scss
@@ -0,0 +1,7 @@
+.infinite-cards {
+  nb-card {
+    &.own-scroll {
+      height: 50vh;
+    }
+  }
+}
diff --git a/src/app/pages/extra-components/infinite-list/infinite-list.component.ts b/src/app/pages/layout/infinite-list/infinite-list.component.ts
similarity index 94%
rename from src/app/pages/extra-components/infinite-list/infinite-list.component.ts
rename to src/app/pages/layout/infinite-list/infinite-list.component.ts
index fc9de880e8..34ad3a48c0 100644
--- a/src/app/pages/extra-components/infinite-list/infinite-list.component.ts
+++ b/src/app/pages/layout/infinite-list/infinite-list.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { NewsService } from '../services/news.service';
+import { NewsService } from '../news.service';
 
 @Component({
   selector: 'ngx-infinite-list',
diff --git a/src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.html b/src/app/pages/layout/infinite-list/news-post-placeholder/news-post-placeholder.component.html
similarity index 100%
rename from src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.html
rename to src/app/pages/layout/infinite-list/news-post-placeholder/news-post-placeholder.component.html
diff --git a/src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.scss b/src/app/pages/layout/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
similarity index 85%
rename from src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
rename to src/app/pages/layout/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
index 7179965a7c..e04756decc 100644
--- a/src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
+++ b/src/app/pages/layout/infinite-list/news-post-placeholder/news-post-placeholder.component.scss
@@ -1,6 +1,6 @@
 @import '../../../../@theme/styles/themes';
 
-@include nb-install-component() {
+:host {
   display: block;
 
   .title-placeholder {
@@ -18,8 +18,10 @@
     height: 1.25rem;
     width: 5rem;
   }
+}
 
+@include nb-install-component() {
   [class$='placeholder'] {
-    background: rgba(nb-theme(layout-bg), 0.6);
+    background: nb-theme(background-basic-color-2);
   }
 }
diff --git a/src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.ts b/src/app/pages/layout/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
similarity index 100%
rename from src/app/pages/extra-components/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
rename to src/app/pages/layout/infinite-list/news-post-placeholder/news-post-placeholder.component.ts
diff --git a/src/app/pages/extra-components/infinite-list/news-post/news-post.component.html b/src/app/pages/layout/infinite-list/news-post/news-post.component.html
similarity index 100%
rename from src/app/pages/extra-components/infinite-list/news-post/news-post.component.html
rename to src/app/pages/layout/infinite-list/news-post/news-post.component.html
diff --git a/src/app/pages/extra-components/infinite-list/news-post/news-post.component.ts b/src/app/pages/layout/infinite-list/news-post/news-post.component.ts
similarity index 78%
rename from src/app/pages/extra-components/infinite-list/news-post/news-post.component.ts
rename to src/app/pages/layout/infinite-list/news-post/news-post.component.ts
index 800f61b49b..44a80a436f 100644
--- a/src/app/pages/extra-components/infinite-list/news-post/news-post.component.ts
+++ b/src/app/pages/layout/infinite-list/news-post/news-post.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { NewsPost } from '../../services/news.service';
+import { NewsPost } from '../../news.service';
 
 @Component({
   selector: 'ngx-news-post',
diff --git a/src/app/pages/layout/layout-routing.module.ts b/src/app/pages/layout/layout-routing.module.ts
new file mode 100644
index 0000000000..ddf0425dbc
--- /dev/null
+++ b/src/app/pages/layout/layout-routing.module.ts
@@ -0,0 +1,58 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { LayoutComponent } from './layout.component';
+import { Tab1Component, Tab2Component, TabsComponent } from './tabs/tabs.component';
+import { AccordionComponent } from './accordion/accordion.component';
+import { InfiniteListComponent } from './infinite-list/infinite-list.component';
+import { ListComponent } from './list/list.component';
+import { StepperComponent } from './stepper/stepper.component';
+
+const routes: Routes = [{
+  path: '',
+  component: LayoutComponent,
+  children: [
+    {
+      path: 'stepper',
+      component: StepperComponent,
+    },
+    {
+      path: 'list',
+      component: ListComponent,
+    },
+    {
+      path: 'infinite-list',
+      component: InfiniteListComponent,
+    },
+    {
+      path: 'accordion',
+      component: AccordionComponent,
+    },
+    {
+      path: 'tabs',
+      component: TabsComponent,
+      children: [
+        {
+          path: '',
+          redirectTo: 'tab1',
+          pathMatch: 'full',
+        },
+        {
+          path: 'tab1',
+          component: Tab1Component,
+        },
+        {
+          path: 'tab2',
+          component: Tab2Component,
+        },
+      ],
+    },
+  ],
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class LayoutRoutingModule {
+}
diff --git a/src/app/pages/bootstrap/bootstrap.component.ts b/src/app/pages/layout/layout.component.ts
similarity index 65%
rename from src/app/pages/bootstrap/bootstrap.component.ts
rename to src/app/pages/layout/layout.component.ts
index 339c782330..f58be2eeae 100644
--- a/src/app/pages/bootstrap/bootstrap.component.ts
+++ b/src/app/pages/layout/layout.component.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'ngx-bootstrap',
+  selector: 'ngx-components',
   template: `
     <router-outlet></router-outlet>
   `,
 })
-export class BootstrapComponent {
+export class LayoutComponent {
 }
diff --git a/src/app/pages/layout/layout.module.ts b/src/app/pages/layout/layout.module.ts
new file mode 100644
index 0000000000..73e1a65ada
--- /dev/null
+++ b/src/app/pages/layout/layout.module.ts
@@ -0,0 +1,56 @@
+import { NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  NbAccordionModule,
+  NbButtonModule,
+  NbCardModule,
+  NbListModule,
+  NbRouteTabsetModule,
+  NbStepperModule,
+  NbTabsetModule, NbUserModule,
+} from '@nebular/theme';
+
+import { ThemeModule } from '../../@theme/theme.module';
+import { LayoutRoutingModule } from './layout-routing.module';
+import { LayoutComponent } from './layout.component';
+import { Tab1Component, Tab2Component, TabsComponent } from './tabs/tabs.component';
+import { StepperComponent } from './stepper/stepper.component';
+import { ListComponent } from './list/list.component';
+import { InfiniteListComponent } from './infinite-list/infinite-list.component';
+import { NewsPostComponent } from './infinite-list/news-post/news-post.component';
+import { NewsPostPlaceholderComponent } from './infinite-list/news-post-placeholder/news-post-placeholder.component';
+import { AccordionComponent } from './accordion/accordion.component';
+import { NewsService } from './news.service';
+
+@NgModule({
+  imports: [
+    FormsModule,
+    ReactiveFormsModule,
+    ThemeModule,
+    NbTabsetModule,
+    NbRouteTabsetModule,
+    NbStepperModule,
+    NbCardModule,
+    NbButtonModule,
+    NbListModule,
+    NbAccordionModule,
+    NbUserModule,
+    LayoutRoutingModule,
+  ],
+  declarations: [
+    LayoutComponent,
+    TabsComponent,
+    Tab1Component,
+    Tab2Component,
+    StepperComponent,
+    ListComponent,
+    NewsPostPlaceholderComponent,
+    InfiniteListComponent,
+    NewsPostComponent,
+    AccordionComponent,
+  ],
+  providers: [
+    NewsService,
+  ],
+})
+export class LayoutModule { }
diff --git a/src/app/pages/extra-components/list/fruits-list.ts b/src/app/pages/layout/list/fruits-list.ts
similarity index 100%
rename from src/app/pages/extra-components/list/fruits-list.ts
rename to src/app/pages/layout/list/fruits-list.ts
diff --git a/src/app/pages/extra-components/list/list.component.html b/src/app/pages/layout/list/list.component.html
similarity index 100%
rename from src/app/pages/extra-components/list/list.component.html
rename to src/app/pages/layout/list/list.component.html
diff --git a/src/app/pages/extra-components/list/list.component.scss b/src/app/pages/layout/list/list.component.scss
similarity index 100%
rename from src/app/pages/extra-components/list/list.component.scss
rename to src/app/pages/layout/list/list.component.scss
diff --git a/src/app/pages/extra-components/list/list.component.ts b/src/app/pages/layout/list/list.component.ts
similarity index 100%
rename from src/app/pages/extra-components/list/list.component.ts
rename to src/app/pages/layout/list/list.component.ts
diff --git a/src/app/pages/extra-components/services/news.service.ts b/src/app/pages/layout/news.service.ts
similarity index 100%
rename from src/app/pages/extra-components/services/news.service.ts
rename to src/app/pages/layout/news.service.ts
diff --git a/src/app/pages/extra-components/stepper/stepper.component.html b/src/app/pages/layout/stepper/stepper.component.html
similarity index 100%
rename from src/app/pages/extra-components/stepper/stepper.component.html
rename to src/app/pages/layout/stepper/stepper.component.html
diff --git a/src/app/pages/layout/stepper/stepper.component.scss b/src/app/pages/layout/stepper/stepper.component.scss
new file mode 100644
index 0000000000..067a9e1ffd
--- /dev/null
+++ b/src/app/pages/layout/stepper/stepper.component.scss
@@ -0,0 +1,8 @@
+:host ::ng-deep nb-stepper .step-content {
+  text-align: center;
+
+  button {
+    cursor: pointer;
+    margin: 0.5rem;
+  }
+}
diff --git a/src/app/pages/extra-components/stepper/stepper.component.ts b/src/app/pages/layout/stepper/stepper.component.ts
similarity index 100%
rename from src/app/pages/extra-components/stepper/stepper.component.ts
rename to src/app/pages/layout/stepper/stepper.component.ts
diff --git a/src/app/pages/extra-components/tabs/tabs.component.html b/src/app/pages/layout/tabs/tabs.component.html
similarity index 98%
rename from src/app/pages/extra-components/tabs/tabs.component.html
rename to src/app/pages/layout/tabs/tabs.component.html
index 27ea842852..9248cf5f83 100644
--- a/src/app/pages/extra-components/tabs/tabs.component.html
+++ b/src/app/pages/layout/tabs/tabs.component.html
@@ -15,7 +15,13 @@
     </nb-card>
   </div>
 
-  <div class="col-md-6">
+  <div class="col-md-12 col-lg-6">
+    <nb-card size="small">
+      <nb-route-tabset [tabs]="tabs"></nb-route-tabset>
+    </nb-card>
+  </div>
+
+  <div class="col-12">
     <nb-card size="small">
       <nb-tabset fullWidth>
         <nb-tab tabTitle="Full width tab #1">
@@ -31,10 +37,4 @@
       </nb-tabset>
     </nb-card>
   </div>
-
-  <div class="col-md-6">
-    <nb-card size="small">
-      <nb-route-tabset [tabs]="tabs"></nb-route-tabset>
-    </nb-card>
-  </div>
 </div>
diff --git a/src/app/pages/layout/tabs/tabs.component.scss b/src/app/pages/layout/tabs/tabs.component.scss
new file mode 100644
index 0000000000..45f4c187db
--- /dev/null
+++ b/src/app/pages/layout/tabs/tabs.component.scss
@@ -0,0 +1,10 @@
+nb-tabset {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+}
+
+:host ::ng-deep ngx-tab1, :host ::ng-deep ngx-tab2 {
+  display: block;
+  padding: 1rem 2rem;
+}
diff --git a/src/app/pages/extra-components/tabs/tabs.component.ts b/src/app/pages/layout/tabs/tabs.component.ts
similarity index 91%
rename from src/app/pages/extra-components/tabs/tabs.component.ts
rename to src/app/pages/layout/tabs/tabs.component.ts
index edb783ff3c..e5c642de9f 100644
--- a/src/app/pages/extra-components/tabs/tabs.component.ts
+++ b/src/app/pages/layout/tabs/tabs.component.ts
@@ -32,11 +32,11 @@ export class TabsComponent {
   tabs: any[] = [
     {
       title: 'Route tab #1',
-      route: '/pages/extra-components/tabs/tab1',
+      route: '/pages/layout/tabs/tab1',
     },
     {
       title: 'Route tab #2',
-      route: '/pages/extra-components/tabs/tab2',
+      route: '/pages/layout/tabs/tab2',
     },
   ];
 
diff --git a/src/app/pages/maps/bubble/bubble-map.component.scss b/src/app/pages/maps/bubble/bubble-map.component.scss
index 5cd1e57717..7a090fc9ff 100644
--- a/src/app/pages/maps/bubble/bubble-map.component.scss
+++ b/src/app/pages/maps/bubble/bubble-map.component.scss
@@ -3,7 +3,7 @@
 @include nb-install-component() {
 
   nb-card-body {
-    padding: nb-theme(card-padding) 0 0 0;
+    padding-top: 1.25rem;
   }
 
   .echarts {
diff --git a/src/app/pages/maps/bubble/bubble-map.component.ts b/src/app/pages/maps/bubble/bubble-map.component.ts
index ceb22e14e2..ffb28bbabd 100644
--- a/src/app/pages/maps/bubble/bubble-map.component.ts
+++ b/src/app/pages/maps/bubble/bubble-map.component.ts
@@ -10,10 +10,8 @@ import { registerMap } from 'echarts';
   styleUrls: ['./bubble-map.component.scss'],
   template: `
     <nb-card>
-    <nb-card-header>Bubble Maps</nb-card-header>
-      <nb-card-body>
-        <div echarts [options]="options" class="echarts"></div>
-      </nb-card-body>
+      <nb-card-header>Bubble Maps</nb-card-header>
+      <div echarts [options]="options" class="echarts"></div>
     </nb-card>
   `,
 })
@@ -473,7 +471,7 @@ export class BubbleMapComponent implements OnDestroy {
           title: {
             text: 'World Population (2011)',
             left: 'center',
-            top: 'top',
+            top: '16px',
             textStyle: {
               color: this.bubbleTheme.titleColor,
             },
diff --git a/src/app/pages/maps/gmaps/gmaps.component.scss b/src/app/pages/maps/gmaps/gmaps.component.scss
index 7c96244f0d..b6694cbfc2 100644
--- a/src/app/pages/maps/gmaps/gmaps.component.scss
+++ b/src/app/pages/maps/gmaps/gmaps.component.scss
@@ -6,7 +6,7 @@
     padding: 0;
   }
 
-  /deep/ agm-map {
+  ::ng-deep agm-map {
     width: 100%;
     height: nb-theme(card-height-large);
   }
diff --git a/src/app/pages/maps/leaflet/leaflet.component.scss b/src/app/pages/maps/leaflet/leaflet.component.scss
index 5a46781ea2..253a44713f 100644
--- a/src/app/pages/maps/leaflet/leaflet.component.scss
+++ b/src/app/pages/maps/leaflet/leaflet.component.scss
@@ -6,11 +6,11 @@
     padding: 0;
   }
 
-  /deep/ .leaflet-top, /deep/ .leaflet-bottom {
+  ::ng-deep .leaflet-top, ::ng-deep .leaflet-bottom {
     z-index: 997;
   }
 
-  /deep/ .leaflet-container {
+  ::ng-deep .leaflet-container {
     width: 100%;
     height: nb-theme(card-height-large);
   }
diff --git a/src/app/pages/maps/maps.module.ts b/src/app/pages/maps/maps.module.ts
index aef0352ccc..19c2c0df82 100644
--- a/src/app/pages/maps/maps.module.ts
+++ b/src/app/pages/maps/maps.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { AgmCoreModule } from '@agm/core';
 import { LeafletModule } from '@asymmetrik/ngx-leaflet';
 import { NgxEchartsModule } from 'ngx-echarts';
+import { NbCardModule } from '@nebular/theme';
 
 import { ThemeModule } from '../../@theme/theme.module';
 import { MapsRoutingModule, routedComponents } from './maps-routing.module';
@@ -16,6 +17,7 @@ import { MapsRoutingModule, routedComponents } from './maps-routing.module';
     LeafletModule.forRoot(),
     MapsRoutingModule,
     NgxEchartsModule,
+    NbCardModule,
   ],
   exports: [],
   declarations: [
diff --git a/src/app/pages/maps/search-map/map/map.component.scss b/src/app/pages/maps/search-map/map/map.component.scss
index a051dacb1c..13783ab31e 100644
--- a/src/app/pages/maps/search-map/map/map.component.scss
+++ b/src/app/pages/maps/search-map/map/map.component.scss
@@ -6,7 +6,7 @@
     padding: 0;
   }
 
-  /deep/ agm-map {
+  ::ng-deep agm-map {
     width: 100%;
     height: nb-theme(card-height-large);
   }
diff --git a/src/app/pages/maps/search-map/search/search.component.ts b/src/app/pages/maps/search-map/search/search.component.ts
index b82804fd39..b98168433f 100644
--- a/src/app/pages/maps/search-map/search/search.component.ts
+++ b/src/app/pages/maps/search-map/search/search.component.ts
@@ -11,7 +11,7 @@ export class SearchComponent implements OnInit {
 
   @Output() positionChanged = new EventEmitter<Location>();
 
-  @ViewChild('search')
+  @ViewChild('search', { static: true })
   public searchElementRef: ElementRef;
 
   constructor(private mapsAPILoader: MapsAPILoader,
diff --git a/src/app/pages/miscellaneous/miscellaneous-routing.module.ts b/src/app/pages/miscellaneous/miscellaneous-routing.module.ts
index f435c192b4..7fdd415fe6 100644
--- a/src/app/pages/miscellaneous/miscellaneous-routing.module.ts
+++ b/src/app/pages/miscellaneous/miscellaneous-routing.module.ts
@@ -1,25 +1,25 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
 import { MiscellaneousComponent } from './miscellaneous.component';
 import { NotFoundComponent } from './not-found/not-found.component';
 
-const routes: Routes = [{
-  path: '',
-  component: MiscellaneousComponent,
-  children: [{
-    path: '404',
-    component: NotFoundComponent,
-  }],
-}];
+const routes: Routes = [
+  {
+    path: '',
+    component: MiscellaneousComponent,
+    children: [
+      {
+        path: '404',
+        component: NotFoundComponent,
+      },
+    ],
+  },
+];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
 })
-export class MiscellaneousRoutingModule { }
-
-export const routedComponents = [
-  MiscellaneousComponent,
-  NotFoundComponent,
-];
+export class MiscellaneousRoutingModule {
+}
diff --git a/src/app/pages/miscellaneous/miscellaneous.module.ts b/src/app/pages/miscellaneous/miscellaneous.module.ts
index f9f18c4a0d..f6748ba500 100644
--- a/src/app/pages/miscellaneous/miscellaneous.module.ts
+++ b/src/app/pages/miscellaneous/miscellaneous.module.ts
@@ -1,14 +1,20 @@
 import { NgModule } from '@angular/core';
+import { NbCardModule } from '@nebular/theme';
+
 import { ThemeModule } from '../../@theme/theme.module';
-import { MiscellaneousRoutingModule, routedComponents } from './miscellaneous-routing.module';
+import { MiscellaneousRoutingModule } from './miscellaneous-routing.module';
+import { MiscellaneousComponent } from './miscellaneous.component';
+import { NotFoundComponent } from './not-found/not-found.component';
 
 @NgModule({
   imports: [
     ThemeModule,
+    NbCardModule,
     MiscellaneousRoutingModule,
   ],
   declarations: [
-    ...routedComponents,
+    MiscellaneousComponent,
+    NotFoundComponent,
   ],
 })
 export class MiscellaneousModule { }
diff --git a/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.html b/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.html
index 403d906b3d..267efd3782 100644
--- a/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.html
+++ b/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.html
@@ -4,7 +4,7 @@
     <input #name nbInput placeholder="Name">
   </nb-card-body>
   <nb-card-footer>
-    <button nbButton status="danget" (click)="cancel()">Cancel</button>
+    <button class="cancel" nbButton status="danger" (click)="cancel()">Cancel</button>
     <button nbButton status="success" (click)="submit(name.value)">Submit</button>
   </nb-card-footer>
 </nb-card>
diff --git a/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.scss b/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
index f5a3861257..4839f6dc4e 100644
--- a/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
+++ b/src/app/pages/modal-overlays/dialog/dialog-name-prompt/dialog-name-prompt.component.scss
@@ -5,7 +5,7 @@
     width: 100%;
   }
 
-  .btn-success {
-    margin-left: 1rem;
+  .cancel {
+    margin-right: 1rem;
   }
 }
diff --git a/src/app/pages/modal-overlays/modal-overlays.module.ts b/src/app/pages/modal-overlays/modal-overlays.module.ts
index 2a0e582a75..9616dc7197 100644
--- a/src/app/pages/modal-overlays/modal-overlays.module.ts
+++ b/src/app/pages/modal-overlays/modal-overlays.module.ts
@@ -1,4 +1,17 @@
 import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import {
+  NbButtonModule,
+  NbCardModule,
+  NbCheckboxModule,
+  NbDialogModule,
+  NbInputModule,
+  NbPopoverModule,
+  NbSelectModule,
+  NbTabsetModule,
+  NbTooltipModule,
+  NbWindowModule,
+} from '@nebular/theme';
 
 // modules
 import { ThemeModule } from '../../@theme/theme.module';
@@ -8,7 +21,6 @@ import { ModalOverlaysRoutingModule } from './modal-overlays-routing.module';
 import { ModalOverlaysComponent } from './modal-overlays.component';
 import { DialogComponent } from './dialog/dialog.component';
 import { ShowcaseDialogComponent } from './dialog/showcase-dialog/showcase-dialog.component';
-import { NbDialogModule, NbWindowModule } from '@nebular/theme';
 import { DialogNamePromptComponent } from './dialog/dialog-name-prompt/dialog-name-prompt.component';
 import { WindowComponent } from './window/window.component';
 import { WindowFormComponent } from './window/window-form/window-form.component';
@@ -46,10 +58,19 @@ const ENTRY_COMPONENTS = [
 ];
 
 const MODULES = [
+  FormsModule,
   ThemeModule,
   ModalOverlaysRoutingModule,
   NbDialogModule.forChild(),
   NbWindowModule.forChild(),
+  NbCardModule,
+  NbCheckboxModule,
+  NbTabsetModule,
+  NbPopoverModule,
+  NbButtonModule,
+  NbInputModule,
+  NbSelectModule,
+  NbTooltipModule,
 ];
 
 const SERVICES = [
diff --git a/src/app/pages/modal-overlays/popovers/popover-examples.component.ts b/src/app/pages/modal-overlays/popovers/popover-examples.component.ts
index 8e4395c7b0..c542b774ee 100644
--- a/src/app/pages/modal-overlays/popovers/popover-examples.component.ts
+++ b/src/app/pages/modal-overlays/popovers/popover-examples.component.ts
@@ -56,6 +56,12 @@ export class NgxPopoverFormComponent {
       </nb-card-body>
     </nb-card>
   `,
+  styles: [`
+    nb-card {
+      margin: 0;
+      max-width: 20rem;
+    }
+  `],
 })
 export class NgxPopoverCardComponent {
 }
diff --git a/src/app/pages/modal-overlays/popovers/popovers.component.html b/src/app/pages/modal-overlays/popovers/popovers.component.html
index a5762fc905..0f9f38d655 100644
--- a/src/app/pages/modal-overlays/popovers/popovers.component.html
+++ b/src/app/pages/modal-overlays/popovers/popovers.component.html
@@ -4,10 +4,10 @@
       <nb-card-header>Popover Position</nb-card-header>
       <nb-card-body>
         <p>When popover has not enough space based on the configured placement, it will adjust accordingly trying to fit the screen.</p>
-        <button class="btn btn-danger with-margins" nbPopover="Hello, how are you today?" nbPopoverMode="hint" nbPopoverPlacement="left">Left</button>
-        <button class="btn btn-danger with-margins" nbPopover="Hello, how are you today?" nbPopoverMode="hint" nbPopoverPlacement="top">Top</button>
-        <button class="btn btn-danger with-margins" nbPopover="Hello, how are you today?" nbPopoverMode="hint" nbPopoverPlacement="bottom">Bottom</button>
-        <button class="btn btn-danger with-margins" nbPopover="Hello, how are you today?" nbPopoverMode="hint" nbPopoverPlacement="right">Right</button>
+        <button nbButton status="danger" nbPopover="Hello, how are you today?" nbPopoverTrigger="hint" nbPopoverPlacement="left">Left</button>
+        <button nbButton status="danger" nbPopover="Hello, how are you today?" nbPopoverTrigger="hint" nbPopoverPlacement="top">Top</button>
+        <button nbButton status="danger" nbPopover="Hello, how are you today?" nbPopoverTrigger="hint" nbPopoverPlacement="bottom">Bottom</button>
+        <button nbButton status="danger" nbPopover="Hello, how are you today?" nbPopoverTrigger="hint" nbPopoverPlacement="right">Right</button>
       </nb-card-body>
     </nb-card>
   </div>
@@ -17,9 +17,9 @@
       <nb-card-header>Simple Popovers</nb-card-header>
       <nb-card-body>
         <p>In a simples form popover can take a string of text to render.</p>
-        <button class="btn btn-success with-margins" nbPopover="Hello, how are you today?">on click</button>
-        <button class="btn btn-success with-margins" nbPopover="Hello, how are you today?" nbPopoverMode="hover">on hover</button>
-        <button class="btn btn-success with-margins" nbPopover="Hello, how are you today?" nbPopoverMode="hint">on hint</button>
+        <button nbButton status="success" nbPopover="Hello, how are you today?">on click</button>
+        <button nbButton status="success" nbPopover="Hello, how are you today?" nbPopoverTrigger="hover">on hover</button>
+        <button nbButton status="success" nbPopover="Hello, how are you today?" nbPopoverTrigger="hint">on hint</button>
       </nb-card-body>
     </nb-card>
   </div>
@@ -76,9 +76,9 @@
       <nb-card-header>Template Popovers</nb-card-header>
       <nb-card-body>
         <p>You can pass a refference to `ng-template` to be rendered.</p>
-        <button class="btn btn-warning with-margins" [nbPopover]="tabs">With tabs</button>
-        <button class="btn btn-warning with-margins" [nbPopover]="form">With form</button>
-        <button class="btn btn-warning with-margins" [nbPopover]="card">With card</button>
+        <button nbButton status="warning" [nbPopover]="tabs">With tabs</button>
+        <button nbButton status="warning" [nbPopover]="form">With form</button>
+        <button nbButton status="warning" [nbPopover]="card">With card</button>
       </nb-card-body>
     </nb-card>
   </div>
@@ -88,9 +88,9 @@
       <nb-card-header>Component Popovers</nb-card-header>
       <nb-card-body>
         <p>Same way popover can render any angular compnoent.</p>
-        <button class="btn btn-warning with-margins" [nbPopover]="tabsComponent">With tabs</button>
-        <button class="btn btn-warning with-margins" [nbPopover]="formComponent">With form</button>
-        <button class="btn btn-warning with-margins" [nbPopover]="cardComponent">With card</button>
+        <button nbButton status="warning" [nbPopover]="tabsComponent">With tabs</button>
+        <button nbButton status="warning" [nbPopover]="formComponent">With form</button>
+        <button nbButton status="warning" [nbPopover]="cardComponent">With card</button>
       </nb-card-body>
     </nb-card>
   </div>
@@ -100,55 +100,55 @@
   <div class="col-md-12">
     <nb-card>
       <nb-card-header>Event Debouncing</nb-card-header>
-      <nb-card-body>
+      <nb-card-body class="debounce-card">
         <p>Quickly move mouse cursor over the buttons, only the last popover will be created. It allows us to avoid excess white improving page performance.</p>
 
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
-        <button class="btn btn-outline-secondary" nbPopover="Popover!" nbPopoverMode="hint">
+        <button nbButton nbPopover="Popover!" nbPopoverTrigger="hint">
           show hint
         </button>
       </nb-card-body>
diff --git a/src/app/pages/modal-overlays/popovers/popovers.component.scss b/src/app/pages/modal-overlays/popovers/popovers.component.scss
index 589bfcfbbf..cfc7a60cf8 100644
--- a/src/app/pages/modal-overlays/popovers/popovers.component.scss
+++ b/src/app/pages/modal-overlays/popovers/popovers.component.scss
@@ -1,19 +1,15 @@
 @import '~@nebular/theme/styles/core/mixins';
 
-/deep/ nb-card.popover-card {
-  margin-bottom: 0;
-  width: 300px;
-  box-shadow: none;
-}
+nb-card-body {
+  margin: 0 -0.5rem;
 
-:host {
-  button.with-margins {
-    @include nb-ltr(margin, 0 0.75rem 2rem 0);
-    @include nb-rtl(margin, 0 0 2rem 0.75rem);
+  button,
+  p {
+    margin: 0.5rem 0.5rem 0;
   }
+}
 
-  /deep/ .btn-outline-secondary {
-    @include nb-ltr(margin, 0 0.5rem 0.5rem 0);
-    @include nb-rtl(margin, 0 0 0.5rem 0.5rem);
-  }
+.popover-card {
+  margin: 0;
+  max-width: 20rem;
 }
diff --git a/src/app/pages/modal-overlays/toastr/toastr.component.html b/src/app/pages/modal-overlays/toastr/toastr.component.html
index c264a34505..6e1c4c6346 100644
--- a/src/app/pages/modal-overlays/toastr/toastr.component.html
+++ b/src/app/pages/modal-overlays/toastr/toastr.component.html
@@ -7,56 +7,53 @@
     <div class="row">
       <div class="col-md-6 col-sm-12">
         <div class="form-group">
-          <label class="form-control-label">Place to show toast:</label>
-          <div class="dropdown" ngbDropdown>
-            <button class="btn btn-primary" type="button" ngbDropdownToggle>
-              {{ position }}
-            </button>
-            <ul ngbDropdownMenu class="dropdown-menu">
-              <li class="dropdown-item" *ngFor="let p of positions" (click)="position = p">
-                {{ p }}
-              </li>
-            </ul>
-          </div>
+          <label class="label">Position:</label>
+          <nb-select [(selected)]="position" class="position-select">
+            <nb-option *ngFor="let p of positions" [value]="p">{{ p }}</nb-option>
+          </nb-select>
         </div>
+
         <div class="form-group">
-          <label class="form-control-label">Title:</label>
-          <input class="form-control" [(ngModel)]="title" name="title">
+          <label class="label">Title:</label>
+          <input nbInput [(ngModel)]="title" name="title">
         </div>
+
         <form>
           <div class="form-group">
-            <label class="form-control-label">Content:</label>
-            <input class="form-control" [(ngModel)]="content" name="content">
+            <label class="label">Content:</label>
+            <input nbInput [(ngModel)]="content" name="content">
           </div>
         </form>
+
         <div class="form-group">
-          <label class="form-control-label">Time to hide toast, ms. 0 to persistent toast:</label>
-          <input class="form-control" type="number" [(ngModel)]="duration" name="timeout">
+          <label class="label">Time to hide toast, ms. 0 to persistent toast:</label>
+          <input nbInput type="number" [(ngModel)]="duration" name="timeout">
         </div>
       </div>
 
       <div class="col-md-6 col-sm-12">
         <div class="form-group">
-          <label class="form-control-label">Toast type:</label>
-          <div class="dropdown" ngbDropdown>
-            <button class="btn btn-primary" type="button" ngbDropdownToggle>
-              {{ status }}
-            </button>
-            <ul ngbDropdownMenu class="dropdown-menu">
-              <li class="dropdown-item" *ngFor="let t of types" (click)="status = t">{{ t }}</li>
-            </ul>
-          </div>
+          <label class="label">Toast type:</label>
+          <nb-select [(selected)]="status">
+            <nb-option *ngFor="let t of types" [value]="t">{{ t }}</nb-option>
+          </nb-select>
+        </div>
+
+        <div>
+          <nb-checkbox [(ngModel)]="destroyByClick">Hide on click</nb-checkbox>
+        </div>
+        <div>
+          <nb-checkbox [(ngModel)]="preventDuplicates">Prevent arising of duplicate toast</nb-checkbox>
+        </div>
+        <div>
+          <nb-checkbox [(ngModel)]="hasIcon">Show toast with icon</nb-checkbox>
         </div>
-        
-        <div><nb-checkbox [(ngModel)]="destroyByClick">Hide on click</nb-checkbox></div>
-        <div><nb-checkbox [(ngModel)]="preventDuplicates">Prevent arising of duplicate toast</nb-checkbox></div>
-        <div><nb-checkbox [(ngModel)]="hasIcon">Show toast with icon</nb-checkbox></div>
       </div>
     </div>
   </nb-card-body>
 
   <nb-card-footer>
-    <button class="btn btn-primary" (click)="makeToast()">Show toast</button>
-    <button class="btn btn-success" (click)="openRandomToast()">Random toast</button>
+    <button nbButton (click)="makeToast()">Show toast</button>
+    <button nbButton status="success" (click)="openRandomToast()">Random toast</button>
   </nb-card-footer>
 </nb-card>
diff --git a/src/app/pages/modal-overlays/toastr/toastr.component.scss b/src/app/pages/modal-overlays/toastr/toastr.component.scss
index 09a409c569..1cfeca42fe 100644
--- a/src/app/pages/modal-overlays/toastr/toastr.component.scss
+++ b/src/app/pages/modal-overlays/toastr/toastr.component.scss
@@ -3,27 +3,16 @@
 @import '~@nebular/theme/styles/global/breakpoints';
 
 @include nb-install-component() {
-
-  nb-card-footer {
-    padding-bottom: 0.25rem;
-
-    button {
-      @include nb-ltr(margin, 0 1rem 1rem 0);
-      @include nb-rtl(margin, 0 0 1rem 1rem);
-    }
+  .position-select {
+    min-width: 13rem;
   }
 
-  /* stylelint-disable */
-  toaster-container /deep/ {
-    #toast-container .toast-close-button {
-      right: 0;
-    }
+  .label {
+    display: block;
   }
-  /* stylelint-enable */
 
-  @include media-breakpoint-down(xs) {
-    .dropdown-toggle {
-      font-size: 0.75rem;
-    }
+  nb-card-footer button:first-child {
+    @include nb-ltr(margin-right, 1rem);
+    @include nb-rtl(margin-left, 1rem);
   }
 }
diff --git a/src/app/pages/modal-overlays/toastr/toastr.component.ts b/src/app/pages/modal-overlays/toastr/toastr.component.ts
index 04f7901683..3086f7706b 100644
--- a/src/app/pages/modal-overlays/toastr/toastr.component.ts
+++ b/src/app/pages/modal-overlays/toastr/toastr.component.ts
@@ -2,8 +2,13 @@ import { Component } from '@angular/core';
 import { ToasterConfig } from 'angular2-toaster';
 
 import 'style-loader!angular2-toaster/toaster.css';
-import { NbGlobalLogicalPosition, NbGlobalPhysicalPosition, NbGlobalPosition, NbToastrService } from '@nebular/theme';
-import { NbToastStatus } from '@nebular/theme/components/toastr/model';
+import {
+  NbComponentStatus,
+  NbGlobalLogicalPosition,
+  NbGlobalPhysicalPosition,
+  NbGlobalPosition,
+  NbToastrService,
+} from '@nebular/theme';
 
 @Component({
   selector: 'ngx-toastr',
@@ -21,18 +26,17 @@ export class ToastrComponent {
   hasIcon = true;
   position: NbGlobalPosition = NbGlobalPhysicalPosition.TOP_RIGHT;
   preventDuplicates = false;
-  status: NbToastStatus = NbToastStatus.SUCCESS;
+  status: NbComponentStatus = 'primary';
 
   title = 'HI there!';
   content = `I'm cool toaster!`;
 
-  types: NbToastStatus[] = [
-    NbToastStatus.DEFAULT,
-    NbToastStatus.DANGER,
-    NbToastStatus.INFO,
-    NbToastStatus.PRIMARY,
-    NbToastStatus.SUCCESS,
-    NbToastStatus.WARNING,
+  types: NbComponentStatus[] = [
+    'primary',
+    'success',
+    'info',
+    'warning',
+    'danger',
   ];
   positions: string[] = [
     NbGlobalPhysicalPosition.TOP_RIGHT,
@@ -58,13 +62,13 @@ export class ToastrComponent {
   openRandomToast () {
     const typeIndex = Math.floor(Math.random() * this.types.length);
     const quoteIndex = Math.floor(Math.random() * this.quotes.length);
-    const type: NbToastStatus = this.types[typeIndex];
+    const type = this.types[typeIndex];
     const quote = this.quotes[quoteIndex];
 
     this.showToast(type, quote.title, quote.body);
   }
 
-  private showToast(type: NbToastStatus, title: string, body: string) {
+  private showToast(type: NbComponentStatus, title: string, body: string) {
     const config = {
       status: type,
       destroyByClick: this.destroyByClick,
diff --git a/src/app/pages/modal-overlays/tooltip/tooltip.component.html b/src/app/pages/modal-overlays/tooltip/tooltip.component.html
index a9f234ea01..edddfcd144 100644
--- a/src/app/pages/modal-overlays/tooltip/tooltip.component.html
+++ b/src/app/pages/modal-overlays/tooltip/tooltip.component.html
@@ -3,8 +3,8 @@
     <nb-card>
       <nb-card-header>Tooltip With Icon</nb-card-header>
       <nb-card-body>
-        <button nbTooltip="This is a tooltip" nbTooltipIcon="nb-home" nbButton>Show Tooltip</button>
-        <button nbTooltip="" nbTooltipIcon="nb-alert" nbTooltipStatus="danger" nbButton>Show Tooltip</button>
+        <button nbTooltip="This is a tooltip" nbTooltipIcon="home-outline" nbButton>Show Tooltip</button>
+        <button nbTooltip="" nbTooltipIcon="alert-triangle" nbTooltipStatus="danger" nbButton>Show Tooltip</button>
       </nb-card-body>
     </nb-card>
   </div>
diff --git a/src/app/pages/modal-overlays/tooltip/tooltip.component.scss b/src/app/pages/modal-overlays/tooltip/tooltip.component.scss
index 74aaf7a5c3..e4c650dd83 100644
--- a/src/app/pages/modal-overlays/tooltip/tooltip.component.scss
+++ b/src/app/pages/modal-overlays/tooltip/tooltip.component.scss
@@ -1,6 +1,10 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
+  nb-card-body {
+    margin: -0.5rem;
+  }
+
   button {
     margin: 0.5rem;
   }
diff --git a/src/app/pages/modal-overlays/window/window-form/window-form.component.scss b/src/app/pages/modal-overlays/window/window-form/window-form.component.scss
index 61a7020775..9ef1b9a0d4 100644
--- a/src/app/pages/modal-overlays/window/window-form/window-form.component.scss
+++ b/src/app/pages/modal-overlays/window/window-form/window-form.component.scss
@@ -1,7 +1,7 @@
 @import '../../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  /deep/ .form {
+  ::ng-deep .form {
     display: flex;
     flex-direction: column;
 
diff --git a/src/app/pages/modal-overlays/window/window.component.html b/src/app/pages/modal-overlays/window/window.component.html
index fcefecc497..db824d2d11 100644
--- a/src/app/pages/modal-overlays/window/window.component.html
+++ b/src/app/pages/modal-overlays/window/window.component.html
@@ -23,7 +23,7 @@
 </div>
 
 <ng-template #contentTemplate let-data>
-  <p>Here is the text provided via config: "{{ data.title }}"</p>
+  <p>Here is the text provided via config: "{{ data.text }}"</p>
 </ng-template>
 
 <ng-template #disabledEsc>
diff --git a/src/app/pages/modal-overlays/window/window.component.ts b/src/app/pages/modal-overlays/window/window.component.ts
index 71665f736d..a1748dd99a 100644
--- a/src/app/pages/modal-overlays/window/window.component.ts
+++ b/src/app/pages/modal-overlays/window/window.component.ts
@@ -9,8 +9,8 @@ import { WindowFormComponent } from './window-form/window-form.component';
 })
 export class WindowComponent {
 
-  @ViewChild('contentTemplate') contentTemplate: TemplateRef<any>;
-  @ViewChild('disabledEsc', { read: TemplateRef }) disabledEscTemplate: TemplateRef<HTMLElement>;
+  @ViewChild('contentTemplate', { static: true }) contentTemplate: TemplateRef<any>;
+  @ViewChild('disabledEsc', { read: TemplateRef, static: true }) disabledEscTemplate: TemplateRef<HTMLElement>;
 
   constructor(private windowService: NbWindowService) {}
 
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 82c162b457..6134b318f4 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -3,13 +3,13 @@ import { NbMenuItem } from '@nebular/theme';
 export const MENU_ITEMS: NbMenuItem[] = [
   {
     title: 'E-commerce',
-    icon: 'nb-e-commerce',
+    icon: 'shopping-cart-outline',
     link: '/pages/dashboard',
     home: true,
   },
   {
     title: 'IoT Dashboard',
-    icon: 'nb-home',
+    icon: 'home-outline',
     link: '/pages/iot-dashboard',
   },
   {
@@ -17,66 +17,35 @@ export const MENU_ITEMS: NbMenuItem[] = [
     group: true,
   },
   {
-    title: 'Extra Components',
-    icon: 'nb-star',
+    title: 'Layout',
+    icon: 'layout-outline',
     children: [
-      {
-        title: 'Calendar',
-        link: '/pages/extra-components/calendar',
-      },
       {
         title: 'Stepper',
-        link: '/pages/extra-components/stepper',
+        link: '/pages/layout/stepper',
       },
       {
         title: 'List',
-        link: '/pages/extra-components/list',
+        link: '/pages/layout/list',
       },
       {
         title: 'Infinite List',
-        link: '/pages/extra-components/infinite-list',
-      },
-      {
-        title: 'Form Inputs',
-        link: '/pages/extra-components/form-inputs',
+        link: '/pages/layout/infinite-list',
       },
       {
         title: 'Accordion',
-        link: '/pages/extra-components/accordion',
-      },
-      {
-        title: 'Progress Bar',
-        link: '/pages/extra-components/progress-bar',
-      },
-      {
-        title: 'Spinner',
-        link: '/pages/extra-components/spinner',
-      },
-      {
-        title: 'Alert',
-        link: '/pages/extra-components/alert',
-      },
-      {
-        title: 'Tree',
-        link: '/pages/extra-components/tree',
+        link: '/pages/layout/accordion',
       },
       {
         title: 'Tabs',
-        link: '/pages/extra-components/tabs',
-      },
-      {
-        title: 'Calendar Kit',
-        link: '/pages/extra-components/calendar-kit',
-      },
-      {
-        title: 'Chat',
-        link: '/pages/extra-components/chat',
+        pathMatch: 'prefix',
+        link: '/pages/layout/tabs',
       },
     ],
   },
   {
     title: 'Forms',
-    icon: 'nb-compose',
+    icon: 'edit-2-outline',
     children: [
       {
         title: 'Form Inputs',
@@ -98,7 +67,7 @@ export const MENU_ITEMS: NbMenuItem[] = [
   },
   {
     title: 'UI Features',
-    icon: 'nb-keypad',
+    icon: 'keypad-outline',
     link: '/pages/ui-features',
     children: [
       {
@@ -121,7 +90,7 @@ export const MENU_ITEMS: NbMenuItem[] = [
   },
   {
     title: 'Modal & Overlays',
-    icon: 'nb-layout-default',
+    icon: 'browser-outline',
     children: [
       {
         title: 'Dialog',
@@ -146,26 +115,38 @@ export const MENU_ITEMS: NbMenuItem[] = [
     ],
   },
   {
-    title: 'Bootstrap',
-    icon: 'nb-gear',
+    title: 'Extra Components',
+    icon: 'message-circle-outline',
     children: [
       {
-        title: 'Form Inputs',
-        link: '/pages/bootstrap/inputs',
+        title: 'Calendar',
+        link: '/pages/extra-components/calendar',
       },
       {
-        title: 'Buttons',
-        link: '/pages/bootstrap/buttons',
+        title: 'Progress Bar',
+        link: '/pages/extra-components/progress-bar',
+      },
+      {
+        title: 'Spinner',
+        link: '/pages/extra-components/spinner',
       },
       {
-        title: 'Modal',
-        link: '/pages/bootstrap/modal',
+        title: 'Alert',
+        link: '/pages/extra-components/alert',
+      },
+      {
+        title: 'Calendar Kit',
+        link: '/pages/extra-components/calendar-kit',
+      },
+      {
+        title: 'Chat',
+        link: '/pages/extra-components/chat',
       },
     ],
   },
   {
     title: 'Maps',
-    icon: 'nb-location',
+    icon: 'map-outline',
     children: [
       {
         title: 'Google Maps',
@@ -187,7 +168,7 @@ export const MENU_ITEMS: NbMenuItem[] = [
   },
   {
     title: 'Charts',
-    icon: 'nb-bar-chart',
+    icon: 'pie-chart-outline',
     children: [
       {
         title: 'Echarts',
@@ -205,7 +186,7 @@ export const MENU_ITEMS: NbMenuItem[] = [
   },
   {
     title: 'Editors',
-    icon: 'nb-title',
+    icon: 'text-outline',
     children: [
       {
         title: 'TinyMCE',
@@ -218,18 +199,22 @@ export const MENU_ITEMS: NbMenuItem[] = [
     ],
   },
   {
-    title: 'Tables',
-    icon: 'nb-tables',
+    title: 'Tables & Data',
+    icon: 'grid-outline',
     children: [
       {
         title: 'Smart Table',
         link: '/pages/tables/smart-table',
       },
+      {
+        title: 'Tree Grid',
+        link: '/pages/tables/tree-grid',
+      },
     ],
   },
   {
     title: 'Miscellaneous',
-    icon: 'nb-shuffle',
+    icon: 'shuffle-2-outline',
     children: [
       {
         title: '404',
@@ -239,7 +224,7 @@ export const MENU_ITEMS: NbMenuItem[] = [
   },
   {
     title: 'Auth',
-    icon: 'nb-locked',
+    icon: 'lock-outline',
     children: [
       {
         title: 'Login',
diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts
index 613a5fca3e..376cc4fa9d 100644
--- a/src/app/pages/pages-routing.module.ts
+++ b/src/app/pages/pages-routing.module.ts
@@ -9,50 +9,75 @@ import { NotFoundComponent } from './miscellaneous/not-found/not-found.component
 const routes: Routes = [{
   path: '',
   component: PagesComponent,
-  children: [{
-    path: 'dashboard',
-    component: ECommerceComponent,
-  }, {
-    path: 'iot-dashboard',
-    component: DashboardComponent,
-  }, {
-    path: 'ui-features',
-    loadChildren: './ui-features/ui-features.module#UiFeaturesModule',
-  }, {
-    path: 'modal-overlays',
-    loadChildren: './modal-overlays/modal-overlays.module#ModalOverlaysModule',
-  }, {
-    path: 'extra-components',
-    loadChildren: './extra-components/extra-components.module#ExtraComponentsModule',
-  }, {
-    path: 'bootstrap',
-    loadChildren: './bootstrap/bootstrap.module#BootstrapModule',
-  }, {
-    path: 'maps',
-    loadChildren: './maps/maps.module#MapsModule',
-  }, {
-    path: 'charts',
-    loadChildren: './charts/charts.module#ChartsModule',
-  }, {
-    path: 'editors',
-    loadChildren: './editors/editors.module#EditorsModule',
-  }, {
-    path: 'forms',
-    loadChildren: './forms/forms.module#FormsModule',
-  }, {
-    path: 'tables',
-    loadChildren: './tables/tables.module#TablesModule',
-  }, {
-    path: 'miscellaneous',
-    loadChildren: './miscellaneous/miscellaneous.module#MiscellaneousModule',
-  }, {
-    path: '',
-    redirectTo: 'dashboard',
-    pathMatch: 'full',
-  }, {
-    path: '**',
-    component: NotFoundComponent,
-  }],
+  children: [
+    {
+      path: 'dashboard',
+      component: ECommerceComponent,
+    },
+    {
+      path: 'iot-dashboard',
+      component: DashboardComponent,
+    },
+    {
+      path: 'layout',
+      loadChildren: () => import('./layout/layout.module')
+        .then(m => m.LayoutModule),
+    },
+    {
+      path: 'forms',
+      loadChildren: () => import('./forms/forms.module')
+        .then(m => m.FormsModule),
+    },
+    {
+      path: 'ui-features',
+      loadChildren: () => import('./ui-features/ui-features.module')
+        .then(m => m.UiFeaturesModule),
+    },
+    {
+      path: 'modal-overlays',
+      loadChildren: () => import('./modal-overlays/modal-overlays.module')
+        .then(m => m.ModalOverlaysModule),
+    },
+    {
+      path: 'extra-components',
+      loadChildren: () => import('./extra-components/extra-components.module')
+        .then(m => m.ExtraComponentsModule),
+    },
+    {
+      path: 'maps',
+      loadChildren: () => import('./maps/maps.module')
+        .then(m => m.MapsModule),
+    },
+    {
+      path: 'charts',
+      loadChildren: () => import('./charts/charts.module')
+        .then(m => m.ChartsModule),
+    },
+    {
+      path: 'editors',
+      loadChildren: () => import('./editors/editors.module')
+        .then(m => m.EditorsModule),
+    },
+    {
+      path: 'tables',
+      loadChildren: () => import('./tables/tables.module')
+        .then(m => m.TablesModule),
+    },
+    {
+      path: 'miscellaneous',
+      loadChildren: () => import('./miscellaneous/miscellaneous.module')
+        .then(m => m.MiscellaneousModule),
+    },
+    {
+      path: '',
+      redirectTo: 'dashboard',
+      pathMatch: 'full',
+    },
+    {
+      path: '**',
+      component: NotFoundComponent,
+    },
+  ],
 }];
 
 @NgModule({
diff --git a/src/app/pages/pages.component.scss b/src/app/pages/pages.component.scss
index 272cb26eb4..691980935e 100755
--- a/src/app/pages/pages.component.scss
+++ b/src/app/pages/pages.component.scss
@@ -1,7 +1,7 @@
 @import '../@theme/styles/themes';
 
 @include nb-install-component() {
-  /deep/ router-outlet + * {
+  ::ng-deep router-outlet + * {
     display: block;
     animation: fade 1s;
 
diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts
index b16da939e0..61287cd703 100644
--- a/src/app/pages/pages.component.ts
+++ b/src/app/pages/pages.component.ts
@@ -6,10 +6,10 @@ import { MENU_ITEMS } from './pages-menu';
   selector: 'ngx-pages',
   styleUrls: ['pages.component.scss'],
   template: `
-    <ngx-sample-layout>
+    <ngx-one-column-layout>
       <nb-menu [items]="menu"></nb-menu>
       <router-outlet></router-outlet>
-    </ngx-sample-layout>
+    </ngx-one-column-layout>
   `,
 })
 export class PagesComponent {
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 42ec1f76e5..c1de7ffdb2 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -1,26 +1,24 @@
 import { NgModule } from '@angular/core';
+import { NbMenuModule } from '@nebular/theme';
 
+import { ThemeModule } from '../@theme/theme.module';
 import { PagesComponent } from './pages.component';
 import { DashboardModule } from './dashboard/dashboard.module';
 import { ECommerceModule } from './e-commerce/e-commerce.module';
 import { PagesRoutingModule } from './pages-routing.module';
-import { ThemeModule } from '../@theme/theme.module';
 import { MiscellaneousModule } from './miscellaneous/miscellaneous.module';
 
-const PAGES_COMPONENTS = [
-  PagesComponent,
-];
-
 @NgModule({
   imports: [
     PagesRoutingModule,
     ThemeModule,
+    NbMenuModule,
     DashboardModule,
     ECommerceModule,
     MiscellaneousModule,
   ],
   declarations: [
-    ...PAGES_COMPONENTS,
+    PagesComponent,
   ],
 })
 export class PagesModule {
diff --git a/src/app/pages/tables/smart-table/smart-table.component.scss b/src/app/pages/tables/smart-table/smart-table.component.scss
new file mode 100644
index 0000000000..6c585cf454
--- /dev/null
+++ b/src/app/pages/tables/smart-table/smart-table.component.scss
@@ -0,0 +1,55 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  nb-card {
+    transform: translate3d(0, 0, 0);
+  }
+
+  ng2-smart-table ::ng-deep {
+    .ng2-smart-action-add-add {
+      background-color: nb-theme(button-filled-primary-background-color);
+      border-color: nb-theme(button-filled-primary-border-color);
+      color: nb-theme(button-filled-primary-text-color);
+
+      &:focus {
+        border-color: nb-theme(button-filled-primary-focus-border-color);
+      }
+
+      &:hover {
+        background-color: nb-theme(button-filled-primary-hover-background-color);
+        border-color: nb-theme(button-filled-primary-hover-border-color);
+      }
+
+      &:active {
+        background-color: nb-theme(button-filled-primary-active-background-color);
+        border-color: nb-theme(button-filled-primary-active-border-color);
+      }
+    }
+
+    nav.ng2-smart-pagination-nav .pagination li {
+      a, > span {
+        background-color: transparent;
+        color: nb-theme(button-outline-primary-text-color);
+
+        &:focus {
+          border-color: nb-theme(button-outline-primary-focus-border-color);
+          color: nb-theme(button-outline-primary-focus-text-color);
+        }
+
+        &:hover {
+          border-color: nb-theme(button-outline-primary-hover-border-color);
+          color: nb-theme(button-outline-primary-hover-text-color);
+        }
+      }
+    }
+
+    .ng2-smart-pagination .page-item.disabled {
+      .page-link,
+      .page-link:focus,
+      .page-link:hover {
+        background-color: transparent;
+        color: nb-theme(button-outline-primary-disabled-text-color);
+      }
+    }
+  }
+}
diff --git a/src/app/pages/tables/smart-table/smart-table.component.ts b/src/app/pages/tables/smart-table/smart-table.component.ts
index 00da51fc57..89c8ec5931 100644
--- a/src/app/pages/tables/smart-table/smart-table.component.ts
+++ b/src/app/pages/tables/smart-table/smart-table.component.ts
@@ -6,11 +6,7 @@ import { SmartTableData } from '../../../@core/data/smart-table';
 @Component({
   selector: 'ngx-smart-table',
   templateUrl: './smart-table.component.html',
-  styles: [`
-    nb-card {
-      transform: translate3d(0, 0, 0);
-    }
-  `],
+  styleUrls: ['./smart-table.component.scss'],
 })
 export class SmartTableComponent {
 
diff --git a/src/app/pages/tables/tables-routing.module.ts b/src/app/pages/tables/tables-routing.module.ts
index 0a737d2eef..3271c0a241 100644
--- a/src/app/pages/tables/tables-routing.module.ts
+++ b/src/app/pages/tables/tables-routing.module.ts
@@ -3,14 +3,21 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { TablesComponent } from './tables.component';
 import { SmartTableComponent } from './smart-table/smart-table.component';
+import { TreeGridComponent } from './tree-grid/tree-grid.component';
 
 const routes: Routes = [{
   path: '',
   component: TablesComponent,
-  children: [{
-    path: 'smart-table',
-    component: SmartTableComponent,
-  }],
+  children: [
+    {
+      path: 'smart-table',
+      component: SmartTableComponent,
+    },
+    {
+      path: 'tree-grid',
+      component: TreeGridComponent,
+    },
+  ],
 }];
 
 @NgModule({
@@ -22,4 +29,5 @@ export class TablesRoutingModule { }
 export const routedComponents = [
   TablesComponent,
   SmartTableComponent,
+  TreeGridComponent,
 ];
diff --git a/src/app/pages/tables/tables.module.ts b/src/app/pages/tables/tables.module.ts
index 335a00157d..a9074c4fed 100644
--- a/src/app/pages/tables/tables.module.ts
+++ b/src/app/pages/tables/tables.module.ts
@@ -1,17 +1,24 @@
 import { NgModule } from '@angular/core';
+import { NbCardModule, NbIconModule, NbInputModule, NbTreeGridModule } from '@nebular/theme';
 import { Ng2SmartTableModule } from 'ng2-smart-table';
 
 import { ThemeModule } from '../../@theme/theme.module';
 import { TablesRoutingModule, routedComponents } from './tables-routing.module';
+import { FsIconComponent } from './tree-grid/tree-grid.component';
 
 @NgModule({
   imports: [
+    NbCardModule,
+    NbTreeGridModule,
+    NbIconModule,
+    NbInputModule,
     ThemeModule,
     TablesRoutingModule,
     Ng2SmartTableModule,
   ],
   declarations: [
     ...routedComponents,
+    FsIconComponent,
   ],
 })
 export class TablesModule { }
diff --git a/src/app/pages/tables/tree-grid/tree-grid.component.html b/src/app/pages/tables/tree-grid/tree-grid.component.html
new file mode 100644
index 0000000000..8e339f90aa
--- /dev/null
+++ b/src/app/pages/tables/tree-grid/tree-grid.component.html
@@ -0,0 +1,34 @@
+<nb-card>
+  <nb-card-body>
+
+    <label class="search-label" for="search">Search:</label>
+    <input nbInput [nbFilterInput]="dataSource" id="search" class="search-input">
+
+    <table [nbTreeGrid]="dataSource" [nbSort]="dataSource" (sort)="updateSort($event)">
+
+      <tr nbTreeGridHeaderRow *nbTreeGridHeaderRowDef="allColumns"></tr>
+      <tr nbTreeGridRow *nbTreeGridRowDef="let row; columns: allColumns"></tr>
+
+      <ng-container [nbTreeGridColumnDef]="customColumn">
+        <th nbTreeGridHeaderCell [nbSortHeader]="getSortDirection(customColumn)" *nbTreeGridHeaderCellDef>
+          {{customColumn}}
+        </th>
+        <td nbTreeGridCell *nbTreeGridCellDef="let row">
+          <ngx-fs-icon [kind]="row.data.kind" [expanded]="row.expanded"></ngx-fs-icon>
+          {{row.data[customColumn]}}
+        </td>
+      </ng-container>
+
+      <ng-container *ngFor="let column of defaultColumns; let index = index"
+                    [nbTreeGridColumnDef]="column"
+                    [showOn]="getShowOn(index)">
+        <th nbTreeGridHeaderCell [nbSortHeader]="getSortDirection(column)" *nbTreeGridHeaderCellDef>
+          {{column}}
+        </th>
+        <td nbTreeGridCell *nbTreeGridCellDef="let row">{{row.data[column] || '-'}}</td>
+      </ng-container>
+
+    </table>
+
+  </nb-card-body>
+</nb-card>
diff --git a/src/app/pages/tables/tree-grid/tree-grid.component.scss b/src/app/pages/tables/tree-grid/tree-grid.component.scss
new file mode 100644
index 0000000000..755b885b17
--- /dev/null
+++ b/src/app/pages/tables/tree-grid/tree-grid.component.scss
@@ -0,0 +1,55 @@
+@import '../../../@theme/styles/themes';
+
+@include nb-install-component() {
+  button[nbTreeGridRowToggle] {
+    background: transparent;
+    border: none;
+    padding: 0;
+  }
+
+  .search-label {
+    display: block;
+  }
+  .search-input {
+    margin-bottom: 1rem;
+  }
+
+  .nb-column-name {
+    width: 100%;
+  }
+
+  ::ng-deep .row-toggle-button {
+    color: nb-theme(text-basic-color);
+  }
+
+  .nb-tree-grid-header-cell,
+  .nb-tree-grid-header-cell button {
+    text-transform: capitalize;
+  }
+
+  @media screen and (min-width: 400px) {
+    .nb-column-name,
+    .nb-column-size {
+      width: 50%;
+    }
+  }
+
+  @media screen and (min-width: 500px) {
+    .nb-column-name,
+    .nb-column-size,
+    .nb-column-kind {
+      width: 33.333%;
+    }
+  }
+
+  @media screen and (min-width: 600px) {
+    .nb-column-name {
+      width: 31%;
+    }
+    .nb-column-size,
+    .nb-column-kind,
+    .nb-column-items {
+      width: 23%;
+    }
+  }
+}
diff --git a/src/app/pages/tables/tree-grid/tree-grid.component.ts b/src/app/pages/tables/tree-grid/tree-grid.component.ts
new file mode 100644
index 0000000000..d1cf35c48f
--- /dev/null
+++ b/src/app/pages/tables/tree-grid/tree-grid.component.ts
@@ -0,0 +1,98 @@
+import { Component, Input } from '@angular/core';
+import { NbSortDirection, NbSortRequest, NbTreeGridDataSource, NbTreeGridDataSourceBuilder } from '@nebular/theme';
+
+interface TreeNode<T> {
+  data: T;
+  children?: TreeNode<T>[];
+  expanded?: boolean;
+}
+
+interface FSEntry {
+  name: string;
+  size: string;
+  kind: string;
+  items?: number;
+}
+
+@Component({
+  selector: 'ngx-tree-grid',
+  templateUrl: './tree-grid.component.html',
+  styleUrls: ['./tree-grid.component.scss'],
+})
+export class TreeGridComponent {
+  customColumn = 'name';
+  defaultColumns = [ 'size', 'kind', 'items' ];
+  allColumns = [ this.customColumn, ...this.defaultColumns ];
+
+  dataSource: NbTreeGridDataSource<FSEntry>;
+
+  sortColumn: string;
+  sortDirection: NbSortDirection = NbSortDirection.NONE;
+
+  constructor(private dataSourceBuilder: NbTreeGridDataSourceBuilder<FSEntry>) {
+    this.dataSource = this.dataSourceBuilder.create(this.data);
+  }
+
+  updateSort(sortRequest: NbSortRequest): void {
+    this.sortColumn = sortRequest.column;
+    this.sortDirection = sortRequest.direction;
+  }
+
+  getSortDirection(column: string): NbSortDirection {
+    if (this.sortColumn === column) {
+      return this.sortDirection;
+    }
+    return NbSortDirection.NONE;
+  }
+
+  private data: TreeNode<FSEntry>[] = [
+    {
+      data: { name: 'Projects', size: '1.8 MB', items: 5, kind: 'dir' },
+      children: [
+        { data: { name: 'project-1.doc', kind: 'doc', size: '240 KB' } },
+        { data: { name: 'project-2.doc', kind: 'doc', size: '290 KB' } },
+        { data: { name: 'project-3', kind: 'txt', size: '466 KB' } },
+        { data: { name: 'project-4.docx', kind: 'docx', size: '900 KB' } },
+      ],
+    },
+    {
+      data: { name: 'Reports', kind: 'dir', size: '400 KB', items: 2 },
+      children: [
+        { data: { name: 'Report 1', kind: 'doc', size: '100 KB' } },
+        { data: { name: 'Report 2', kind: 'doc', size: '300 KB' } },
+      ],
+    },
+    {
+      data: { name: 'Other', kind: 'dir', size: '109 MB', items: 2 },
+      children: [
+        { data: { name: 'backup.bkp', kind: 'bkp', size: '107 MB' } },
+        { data: { name: 'secret-note.txt', kind: 'txt', size: '2 MB' } },
+      ],
+    },
+  ];
+
+  getShowOn(index: number) {
+    const minWithForMultipleColumns = 400;
+    const nextColumnStep = 100;
+    return minWithForMultipleColumns + (nextColumnStep * index);
+  }
+}
+
+@Component({
+  selector: 'ngx-fs-icon',
+  template: `
+    <nb-tree-grid-row-toggle [expanded]="expanded" *ngIf="isDir(); else fileIcon">
+    </nb-tree-grid-row-toggle>
+    <ng-template #fileIcon>
+      <nb-icon icon="file-text-outline"></nb-icon>
+    </ng-template>
+  `,
+})
+export class FsIconComponent {
+  @Input() kind: string;
+  @Input() expanded: boolean;
+
+  isDir(): boolean {
+    return this.kind === 'dir';
+  }
+}
diff --git a/src/app/pages/ui-features/grid/grid.component.scss b/src/app/pages/ui-features/grid/grid.component.scss
index f0490a4811..668b68a06b 100644
--- a/src/app/pages/ui-features/grid/grid.component.scss
+++ b/src/app/pages/ui-features/grid/grid.component.scss
@@ -12,7 +12,7 @@
 
       div {
         text-align: center;
-        background-color: nb-theme(color-bg-active);
+        background-color: nb-theme(background-basic-color-2);
         padding: 0.75rem 0.25rem;
         border-radius: 0.25rem;
       }
diff --git a/src/app/pages/ui-features/icons/icons.component.html b/src/app/pages/ui-features/icons/icons.component.html
index 8c8ca9934f..9b75cb5e91 100644
--- a/src/app/pages/ui-features/icons/icons.component.html
+++ b/src/app/pages/ui-features/icons/icons.component.html
@@ -5,11 +5,7 @@
         Eva Icons
       </nb-card-header>
       <nb-card-body>
-        <div class="icon" *ngFor="let icon of evaIcons">
-          <i class="eva-icon-container" [nbPopover]="icon">
-            <i [innerHTML]="icon | eva: { animationType: 'pulse' }"></i>
-          </i>
-        </div>
+        <nb-icon *ngFor="let icon of evaIcons" [icon]="icon" pack="eva"></nb-icon>
       </nb-card-body>
       <nb-card-footer>
         <a href="https://akveo.github.io/eva-icons/" target="_blank">See all Eva Icons</a>
@@ -18,27 +14,13 @@
   </div>
 
   <div class="col-md-12 col-lg-6">
-    <nb-card class="nb-icons">
-      <nb-card-header>
-        Nebular
-      </nb-card-header>
-      <nb-card-body>
-        <div class="icon"
-             *ngFor="let icon of icons.nebular">
-          <i class="{{ icon }}" [nbPopover]="icon"></i>
-        </div>
-      </nb-card-body>
-    </nb-card>
-
     <nb-card>
       <nb-card-header>
         Font awesome icons
       </nb-card-header>
       <nb-card-body>
-        <div class="icon"
-             *ngFor="let icon of icons.fontAwesome">
-          <i class="{{ icon }}" [nbPopover]="icon"></i>
-        </div>
+        <nb-icon *ngFor="let icon of icons.fontAwesome" [icon]="icon" pack="fa"></nb-icon>
+        <nb-icon *ngFor="let icon of icons.fontAwesomeRegular" [icon]="icon" pack="far"></nb-icon>
       </nb-card-body>
       <nb-card-footer>
         <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank">
@@ -52,9 +34,7 @@
         Ionicons
       </nb-card-header>
       <nb-card-body>
-        <div class="icon" *ngFor="let icon of icons.ionicons">
-          <i class="{{ icon }}" [nbPopover]="icon"></i>
-        </div>
+        <nb-icon *ngFor="let icon of icons.ionicons" [icon]="icon" pack="ion"></nb-icon>
       </nb-card-body>
       <nb-card-footer>
         <a href="http://ionicons.com/" target="_blank">See all ionicons</a>
diff --git a/src/app/pages/ui-features/icons/icons.component.scss b/src/app/pages/ui-features/icons/icons.component.scss
index e43c303053..786e7cd67b 100644
--- a/src/app/pages/ui-features/icons/icons.component.scss
+++ b/src/app/pages/ui-features/icons/icons.component.scss
@@ -1,30 +1,14 @@
 @import '../../../@theme/styles/themes';
 
 @include nb-install-component() {
-  .icon {
-    display: inline-block;
-    width: 4rem;
-    padding: 1.25rem 0;
-    text-align: center;
-    font-size: 1.25rem;
-
-    i:hover {
-      opacity: 0.8;
-      cursor: pointer;
-    }
-  }
-
-  .eva-icon-container {
-    fill: nb-theme(card-fg-text);
-  }
-
-  .nb-icons .icon {
-    padding: 0.75rem 0;
-    font-size: 1.75rem;
+  nb-card-body {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
   }
 
-  nb-card-body {
-    padding: 0;
+  nb-icon {
+    margin: 1rem;
   }
 
   nb-card-footer {
diff --git a/src/app/pages/ui-features/icons/icons.component.ts b/src/app/pages/ui-features/icons/icons.component.ts
index b97b3bdf3d..91a7c0a6c1 100644
--- a/src/app/pages/ui-features/icons/icons.component.ts
+++ b/src/app/pages/ui-features/icons/icons.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { icons } from 'eva-icons';
+import { NbIconLibraries } from '@nebular/theme';
 
 @Component({
   selector: 'ngx-icons',
@@ -11,56 +11,43 @@ export class IconsComponent {
 
   evaIcons = [];
 
-  constructor() {
-    this.evaIcons = Object.keys(icons).filter(icon => icon.indexOf('outline') === -1);
+  constructor(iconsLibrary: NbIconLibraries) {
+    this.evaIcons = Array.from(iconsLibrary.getPack('eva').icons.keys())
+      .filter(icon => icon.indexOf('outline') === -1);
+
+    iconsLibrary.registerFontPack('fa', { packClass: 'fa', iconClassPrefix: 'fa' });
+    iconsLibrary.registerFontPack('far', { packClass: 'far', iconClassPrefix: 'fa' });
+    iconsLibrary.registerFontPack('ion', { iconClassPrefix: 'ion' });
   }
 
   icons = {
 
-    nebular: ['nb-alert', 'nb-angle-double-left', 'nb-angle-double-right',
-      'nb-arrow-down', 'nb-arrow-dropdown', 'nb-arrow-dropleft',
-      'nb-arrow-dropright', 'nb-arrow-dropup', 'nb-arrow-left', 'nb-arrow-retweet', 'nb-arrow-right',
-      'nb-arrow-thin-down', 'nb-arrow-thin-left', 'nb-arrow-thin-right', 'nb-arrow-thin-up',
-      'nb-arrow-up', 'nb-audio', 'nb-bar-chart', 'nb-checkmark', 'nb-chevron-down',
-      'nb-chevron-down-outline', 'nb-chevron-left', 'nb-chevron-left-outline', 'nb-chevron-right',
-      'nb-chevron-right-outline', 'nb-chevron-up', 'nb-chevron-up-outline', 'nb-close',
-      'nb-close-circled', 'nb-cloudy', 'nb-coffee-maker', 'nb-compose', 'nb-edit', 'nb-email',
-      'nb-flame-circled', 'nb-gear', 'nb-grid-a', 'nb-grid-a-outline', 'nb-grid-b', 'nb-grid-b-outline',
-      'nb-heart', 'nb-home', 'nb-keypad', 'nb-layout-centre', 'nb-layout-default', 'nb-layout-one-column',
-      'nb-layout-sidebar-left', 'nb-layout-sidebar-right', 'nb-layout-two-column', 'nb-lightbulb',
-      'nb-list', 'nb-location', 'nb-locked', 'nb-loop', 'nb-loop-circled', 'nb-menu', 'nb-notifications',
-      'nb-paper-plane', 'nb-partlysunny', 'nb-pause', 'nb-pause-outline', 'nb-person', 'nb-phone',
-      'nb-play', 'nb-play-outline', 'nb-plus', 'nb-plus-circled', 'nb-power', 'nb-power-circled',
-      'nb-rainy', 'nb-roller-shades', 'nb-search', 'nb-shuffle', 'nb-skip-backward',
-      'nb-skip-backward-outline', 'nb-skip-forward', 'nb-skip-forward-outline', 'nb-snowy-circled',
-      'nb-square', 'nb-square-outline', 'nb-star', 'nb-sunny', 'nb-sunny-circled', 'nb-tables', 'nb-title',
-      'nb-trash', 'nb-volume-high', 'nb-volume-mute', 'nb-drop', 'nb-drops', 'nb-info', 'nb-expand', 'nb-collapse',
-      'nb-e-commerce', 'nb-danger', 'nb-checkmark-circle', 'nb-help'],
-
     ionicons: [
-      'ion-ionic', 'ion-arrow-right-b', 'ion-arrow-down-b', 'ion-arrow-left-b', 'ion-arrow-up-c', 'ion-arrow-right-c',
-      'ion-arrow-down-c', 'ion-arrow-left-c', 'ion-arrow-return-right', 'ion-arrow-return-left', 'ion-arrow-swap',
-      'ion-arrow-shrink', 'ion-arrow-expand', 'ion-arrow-move', 'ion-arrow-resize', 'ion-chevron-up',
-      'ion-chevron-right', 'ion-chevron-down', 'ion-chevron-left', 'ion-navicon-round', 'ion-navicon',
-      'ion-drag', 'ion-log-in', 'ion-log-out', 'ion-checkmark-round', 'ion-checkmark', 'ion-checkmark-circled',
-      'ion-close-round', 'ion-plus-round', 'ion-minus-round', 'ion-information', 'ion-help',
-      'ion-backspace-outline', 'ion-help-buoy', 'ion-asterisk', 'ion-alert', 'ion-alert-circled',
-      'ion-refresh', 'ion-loop', 'ion-shuffle', 'ion-home', 'ion-search', 'ion-flag', 'ion-star',
-      'ion-heart', 'ion-heart-broken', 'ion-gear-a', 'ion-gear-b', 'ion-toggle-filled', 'ion-toggle',
-      'ion-settings', 'ion-wrench', 'ion-hammer', 'ion-edit', 'ion-trash-a', 'ion-trash-b',
-      'ion-document', 'ion-document-text', 'ion-clipboard', 'ion-scissors', 'ion-funnel',
-      'ion-bookmark', 'ion-email', 'ion-email-unread', 'ion-folder', 'ion-filing', 'ion-archive',
-      'ion-reply', 'ion-reply-all', 'ion-forward',
+      'ionic', 'arrow-right-b', 'arrow-down-b', 'arrow-left-b', 'arrow-up-c', 'arrow-right-c',
+      'arrow-down-c', 'arrow-left-c', 'arrow-return-right', 'arrow-return-left', 'arrow-swap',
+      'arrow-shrink', 'arrow-expand', 'arrow-move', 'arrow-resize', 'chevron-up',
+      'chevron-right', 'chevron-down', 'chevron-left', 'navicon-round', 'navicon',
+      'drag', 'log-in', 'log-out', 'checkmark-round', 'checkmark', 'checkmark-circled',
+      'close-round', 'plus-round', 'minus-round', 'information', 'help',
+      'backspace-outline', 'help-buoy', 'asterisk', 'alert', 'alert-circled',
+      'refresh', 'loop', 'shuffle', 'home', 'search', 'flag', 'star',
+      'heart', 'heart-broken', 'gear-a', 'gear-b', 'toggle-filled', 'toggle',
+      'settings', 'wrench', 'hammer', 'edit', 'trash-a', 'trash-b',
+      'document', 'document-text', 'clipboard', 'scissors', 'funnel',
+      'bookmark', 'email', 'email-unread', 'folder', 'filing', 'archive',
+      'reply', 'reply-all', 'forward',
     ],
 
     fontAwesome: [
-      'fa fa-adjust', 'fa fa-anchor', 'fa fa-archive', 'fa fa-chart-area', 'fa fa-arrows-alt', 'fa fa-arrows-alt-h',
-      'fa fa-arrows-alt-v', 'fa fa-asterisk', 'fa fa-at', 'fa fa-car', 'fa fa-ban', 'fa fa-university',
-      'fa fa-chart-bar', 'far fa-chart-bar', 'fa fa-barcode', 'fa fa-bars', 'fa fa-bed', 'fa fa-beer',
-      'fa fa-bell', 'far fa-bell', 'fa fa-bell-slash', 'far fa-bell-slash', 'fa fa-bicycle', 'fa fa-binoculars',
-      'fa fa-birthday-cake', 'fa fa-bolt', 'fa fa-bomb', 'fa fa-book', 'fa fa-bookmark', 'far fa-bookmark',
-      'fa fa-briefcase', 'fa fa-bug', 'fa fa-building', 'far fa-building', 'fa fa-bullhorn',
+      'adjust', 'anchor', 'archive', 'chart-area', 'arrows-alt', 'arrows-alt-h',
+      'arrows-alt-v', 'asterisk', 'at', 'car', 'ban', 'university',
+      'chart-bar', 'barcode', 'bars', 'bed', 'beer',
+      'bell', 'bell-slash', 'bicycle', 'binoculars',
+      'birthday-cake', 'bolt', 'bomb', 'book', 'bookmark',
+      'briefcase', 'bug', 'building', 'bullhorn',
     ],
+
+    fontAwesomeRegular: [ 'chart-bar', 'bell', 'bell-slash', 'bookmark', 'building' ],
   };
 
 }
diff --git a/src/app/pages/ui-features/typography/typography.component.html b/src/app/pages/ui-features/typography/typography.component.html
index 1cfcb988cd..c471d425e1 100644
--- a/src/app/pages/ui-features/typography/typography.component.html
+++ b/src/app/pages/ui-features/typography/typography.component.html
@@ -1,159 +1,116 @@
 <div class="row">
-  <div class="col-xxxl-8">
-    <div class="row">
-      <div class="col-md-6 col-xxl-7">
-        <nb-card size="medium">
-          <nb-card-header>
-            Used Fonts
-          </nb-card-header>
-          <nb-card-body>
-            <div class="font-row font-secondary">
-              <div class="header">
-                <div class="name bold">Exo</div>
-
-                <div class="variants">
-                  <span class="font-w-bold">Bold</span>
-                  <span class="font-w-regular">Regular</span>
-                  <span class="font-w-light">Light</span>
-                </div>
-              </div>
-              <p>
-                Far far away, behind the word mountains, far from the countries Vokalia and Consonantia,
-                there live the blind texts.
-                Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.
-              </p>
-            </div>
-
-            <div class="font-row font-main">
-              <div class="header">
-                <div class="name bold">Roboto</div>
-
-                <div class="variants">
-                  <span class="font-w-bold">Bold</span>
-                  <span class="font-w-regular">Regular</span>
-                  <span class="font-w-light">Light</span>
-                </div>
-              </div>
-              <p>
-                Far far away, behind the word mountains, far from the countries Vokalia and Consonantia,
-                there live the blind texts.
-                Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.
-              </p>
-            </div>
-          </nb-card-body>
-        </nb-card>
+  <div class="col-md-6 col-xxxl-4">
+    <nb-card size="medium">
+      <nb-card-header>
+        Used Fonts
+      </nb-card-header>
+      <nb-card-body>
+        <div class="font-row">
+          <div class="header">
+            <div class="name bold">Open Sans</div>
+          </div>
+          <p>
+            Far far away, behind the word mountains, far from the countries Vokalia and Consonantia,
+            there live the blind texts.
+            Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean.
+          </p>
+        </div>
+      </nb-card-body>
+    </nb-card>
+  </div>
 
-        <nb-card size="small">
-          <nb-card-header>
-            Article Example
-          </nb-card-header>
-          <nb-card-body>
-            <h4>So what's About the grammar?</h4>
-            <p class="text-indent">
-              Far far away, behind the word mountains, far from the countries <strong>Vokalia</strong> and <strong>Consonantia</strong>,
-              there live the blind texts.
-              They live in <strong>Bookmarksgrove</strong>.
-            </p>
-            <p class="text-indent">
-              A small <strong>river named Duden</strong> flows by their place and supplies it with the
-              necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly
-              into your mouth.
-              Even the all-powerful Pointing has no control about the blind texts it is an almost
-              unorthographic life One day however a small
-              line of blind text by the name of
-              <a href="http://google.com" target="_blank">Lorem Ipsum</a> decided to leave for
-              the far <strong>World of Grammar</strong>.
-            </p>
-          </nb-card-body>
-        </nb-card>
-      </div>
-      <div class="col-md-6 col-xxl-5">
-        <nb-card size="medium" class="headings-card">
-          <nb-card-header>
-            Headings
-          </nb-card-header>
-          <nb-card-body>
-            <div class="header">
-              <div>
-                <h1>H1. Heading</h1>
-              </div>
+  <div class="col-md-6 col-xxxl-4">
+    <nb-card size="medium" class="headings-card">
+      <nb-card-header>
+        Headings
+      </nb-card-header>
+      <nb-card-body>
+        <div class="header">
+          <div>
+            <h1>H1. Heading</h1>
+          </div>
 
-              <div class="detail font-w-light">
-                Demibold 2.5rem (40px)
-              </div>
-            </div>
-            <div class="header">
-              <div>
-                <h2>H2. Heading</h2>
-              </div>
+          <div class="detail">
+            800 2.25rem (36px)
+          </div>
+        </div>
+        <div class="header">
+          <div>
+            <h2>H2. Heading</h2>
+          </div>
 
-              <div class="detail font-w-light">
-                Demibold 2rem (32px)
-              </div>
-            </div>
-            <div class="header">
-              <div>
-                <h3>H3. Heading</h3>
-              </div>
+          <div class="detail">
+            800 2rem (32px)
+          </div>
+        </div>
+        <div class="header">
+          <div>
+            <h3>H3. Heading</h3>
+          </div>
 
-              <div class="detail font-w-light">
-                Demibold 1.75rem (28px)
-              </div>
-            </div>
-            <div class="header">
-              <div>
-                <h4>H4. Heading</h4>
-              </div>
+          <div class="detail">
+            800 1.875rem (30px)
+          </div>
+        </div>
+        <div class="header">
+          <div>
+            <h4>H4. Heading</h4>
+          </div>
 
-              <div class="detail font-w-light">
-                Demibold 1.5rem (24px)
-              </div>
-            </div>
-            <div class="header">
-              <div>
-                <h5>H5. Heading</h5>
-              </div>
+          <div class="detail">
+            800 1.625rem (26px)
+          </div>
+        </div>
+        <div class="header">
+          <div>
+            <h5>H5. Heading</h5>
+          </div>
 
-              <div class="detail font-w-light">
-                Demibold 1.25rem (20px)
-              </div>
-            </div>
-            <div class="header">
-              <div>
-                <h6>H6. Heading</h6>
-              </div>
+          <div class="detail">
+            800 1.375rem (22px)
+          </div>
+        </div>
+        <div class="header">
+          <div>
+            <h6>H6. Heading</h6>
+          </div>
 
-              <div class="detail font-w-light">
-                Demibold 1rem (16px)
-              </div>
-            </div>
-          </nb-card-body>
-        </nb-card>
+          <div class="detail">
+            800 1.125rem (18px)
+          </div>
+        </div>
+      </nb-card-body>
+    </nb-card>
+  </div>
 
-        <nb-card size="small">
-          <nb-card-header>
-            Blockquotes
-          </nb-card-header>
-          <nb-card-body>
-            <blockquote class="blockquote">
-              <p class="mb-0">Far far away, behind the word mountains, far from the countries Vokalia and Consonantia.
-            </blockquote>
-            <blockquote class="blockquote">
-              <p class="mb-0">Far far away, behind the word mountains, far from the countries.</p>
-              <footer class="blockquote-footer">Vladimir Lugovsky</footer>
-            </blockquote>
-            <blockquote class="blockquote-reverse">
-              <p class="mb-0">Far far away, behind the word mountains.</p>
-              <footer class="blockquote-footer">Vladimir Lugovsky</footer>
-            </blockquote>
-          </nb-card-body>
-        </nb-card>
-      </div>
-    </div>
+  <div class="col-md-6 col-xxxl-4">
+    <nb-card [size]="breakpoint.width >= breakpoints.xxxl ? 'medium' : 'large'">
+      <nb-card-header>
+        Article Example
+      </nb-card-header>
+      <nb-card-body>
+        <h4>So what's About the grammar?</h4>
+        <p>
+          Far far away, behind the word mountains, far from the countries <strong>Vokalia</strong> and <strong>Consonantia</strong>,
+          there live the blind texts.
+          They live in <strong>Bookmarksgrove</strong>.
+        </p>
+        <p>
+          A small <strong>river named Duden</strong> flows by their place and supplies it with the
+          necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly
+          into your mouth.
+          Even the all-powerful Pointing has no control about the blind texts it is an almost
+          unorthographic life One day however a small
+          line of blind text by the name of
+          <a href="http://google.com" target="_blank">Lorem Ipsum</a> decided to leave for
+          the far <strong>World of Grammar</strong>.
+        </p>
+      </nb-card-body>
+    </nb-card>
   </div>
 
   <div class="col-md-6 col-xxxl-4">
-    <nb-card [size]="breakpoint.width >= breakpoints.xxxl ? 'xxlarge' : 'large'">
+    <nb-card size="large">
       <nb-card-header>
         Font Colors
       </nb-card-header>
@@ -187,38 +144,38 @@ <h5 class="text-link">Link Text</h5>
               Far far away, behind the your awesomeness.
             </div>
           </div>
-          <div class="item text-primary">
-            <div class="color bg-primary"></div>
+          <div class="item text-status-primary">
+            <div class="color bg-status-primary"></div>
             <div>
-              <h5 class="text-primary">Primary Text</h5>
+              <h5 class="text-status-primary">Primary Text</h5>
               Far far away, behind the your awesomeness.
             </div>
           </div>
-          <div class="item text-success">
-            <div class="color bg-success"></div>
+          <div class="item text-status-success">
+            <div class="color bg-status-success"></div>
             <div>
-              <h5 class="text-success">Success Text</h5>
+              <h5 class="text-status-success">Success Text</h5>
               Far far away, behind the your awesomeness.
             </div>
           </div>
-          <div class="item text-info">
-            <div class="color bg-info"></div>
+          <div class="item text-status-info">
+            <div class="color bg-status-info"></div>
             <div>
-              <h5 class="text-info">Info Text</h5>
+              <h5 class="text-status-info">Info Text</h5>
               Far far away, behind the your awesomeness.
             </div>
           </div>
-          <div class="item text-warning">
-            <div class="color bg-warning"></div>
+          <div class="item text-status-warning">
+            <div class="color bg-status-warning"></div>
             <div>
-              <h5 class="text-warning">Warning Text</h5>
+              <h5 class="text-status-warning">Warning Text</h5>
               Far far away, behind the your awesomeness.
             </div>
           </div>
-          <div class="item text-danger">
-            <div class="color bg-danger"></div>
+          <div class="item text-status-danger">
+            <div class="color bg-status-danger"></div>
             <div>
-              <h5 class="text-danger">Danger Text</h5>
+              <h5 class="text-status-danger">Danger Text</h5>
               Far far away, behind the your awesomeness.
             </div>
           </div>
@@ -233,49 +190,24 @@ <h5 class="text-danger">Danger Text</h5>
         Alerts
       </nb-card-header>
       <nb-card-body>
-        <div class="alert alert-primary" role="alert">
-          <strong>Oh snap!</strong> <a href="#" class="alert-link">Change a few things up</a> and try submitting again.
-        </div>
-        <div class="alert alert-hint" role="alert">
-          <strong>Heads up!</strong> This <a href="#" class="alert-link">alert needs your attention</a>, but it's not super important.
-        </div>
-        <div class="alert alert-success" role="alert">
-          <strong>Well done!</strong> You successfully read <a href="#" class="alert-link">this important alert message</a>.
-        </div>
-        <div class="alert alert-info" role="alert">
-          <strong>Heads up!</strong> This <a href="#" class="alert-link">alert needs your attention</a>, but it's not super important.
-        </div>
-        <div class="alert alert-warning" role="alert">
-          <strong>Warning!</strong> Better check yourself, you're <a href="#" class="alert-link">not looking too good</a>.
-        </div>
-        <div class="alert alert-danger" role="alert">
-          <strong>Oh snap!</strong> <a href="#" class="alert-link">Change a few things up</a> and try submitting again.
-        </div>
-      </nb-card-body>
-    </nb-card>
-  </div>
-
-  <div class="col-md-6 col-xxxl-4">
-    <nb-card size="large">
-      <nb-card-header>
-        Text Types
-      </nb-card-header>
-      <nb-card-body>
-        <h4>Highlighted text</h4>
-        <p class="mb-5">
-          Far far away, behind the word mountains, far from the countries
-          Vokalia and <mark>Consonantia, there live the blind texts.</mark>
-        </p>
-        <h4>Bold Text</h4>
-        <p class="mb-5">
-          Far far away, behind the word mountains, far from the countries
-          Vokalia and <strong>Consonantia, there live the blind texts.</strong>
-        </p>
-        <h4>Link Text</h4>
-        <p class="mb-5">
-          Far far away, behind the word mountains, far from the countries
-          Vokalia and <a href="http://google.com" target="_blank">Consonantia, there live the blind texts.</a>
-        </p>
+        <nb-alert>
+          <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
+        </nb-alert>
+        <nb-alert status="primary">
+          <strong>Oh snap!</strong> Change a few things up and try submitting again.
+        </nb-alert>
+        <nb-alert status="success">
+          <strong>Well done!</strong> You successfully read this important alert message.
+        </nb-alert>
+        <nb-alert status="info">
+          <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
+        </nb-alert>
+        <nb-alert status="warning">
+          <strong>Warning!</strong> Better check yourself, you're not looking too good.
+        </nb-alert>
+        <nb-alert status="danger">
+          <strong>Oh snap!</strong> Change a few things up and try submitting again.
+        </nb-alert>
       </nb-card-body>
     </nb-card>
   </div>
diff --git a/src/app/pages/ui-features/typography/typography.component.scss b/src/app/pages/ui-features/typography/typography.component.scss
index c664ffea35..d5d295eeef 100644
--- a/src/app/pages/ui-features/typography/typography.component.scss
+++ b/src/app/pages/ui-features/typography/typography.component.scss
@@ -2,17 +2,6 @@
 
 @include nb-install-component() {
 
-  .font-secondary .font-header .name {
-    font-size: 4.5rem;
-    line-height: 4rem;
-    font-weight: nb-theme(font-weight-bold);
-  }
-
-  .font-main .font-header .name {
-    font-size: 3rem;
-    font-weight: nb-theme(font-weight-bold);
-  }
-
   .font-row {
     &:first-child {
       margin-bottom: 2rem;
@@ -28,15 +17,15 @@
   }
 
   .headings-card {
-    nb-card-body {
-      padding: 1rem 1.25rem;
+    h1 {
+      margin: 0;
     }
+
     .header {
       padding-bottom: 0.675rem;
       margin-bottom: 0.675rem;
 
       &:last-child {
-        padding-bottom: 0;
         margin-bottom: 0;
       }
     }
@@ -48,13 +37,10 @@
     align-items: center;
     padding-bottom: 1rem;
     margin-bottom: 1rem;
-    border-bottom: 1px solid nb-theme(separator);
-    color: nb-theme(color-fg-heading);
+    border-bottom: 1px solid nb-theme(divider-color);
 
     &:last-child {
       border-bottom: none;
-      padding: 0;
-      margin: 0;
     }
 
     div:first-child {
@@ -78,16 +64,12 @@
       span {
         padding-right: 1rem;
         padding-left: 1rem;
-        font-size: 1.5rem;
       }
     }
 
     .detail {
       flex: 1;
       display: flex;
-      justify-content: flex-end;
-      align-items: flex-end;
-      color: nb-theme(color-fg);
     }
   }
 
@@ -119,10 +101,43 @@
   }
 
   .text-link {
-    color: nb-theme(link-color);
+    color: nb-theme(link-text-color);
+  }
+
+  .bg-link {
+    background: nb-theme(link-text-color);
+  }
+
+  .bg-heading {
+    background: nb-theme(text-basic-color);
+  }
+
+  .bg-body {
+    background: nb-theme(text-basic-color);
+  }
+
+  .bg-hint {
+    background: nb-theme(text-hint-color);
+  }
+
+  .text-hint {
+    color: nb-theme(text-hint-color);
   }
 
   .bg-link {
-    background: nb-theme(link-color);
+    background: nb-theme(link-text-color);
+  }
+
+  .text-link {
+    color: nb-theme(link-text-color);
+  }
+
+  @each $status in nb-get-statuses() {
+    .bg-status-#{$status} {
+      background: nb-theme(text-#{$status}-color);
+    }
+    .text-status-#{$status} {
+      color: nb-theme(text-#{$status}-color);
+    }
   }
 }
diff --git a/src/app/pages/ui-features/ui-features.module.ts b/src/app/pages/ui-features/ui-features.module.ts
index 16ee1b88da..4f1c815968 100644
--- a/src/app/pages/ui-features/ui-features.module.ts
+++ b/src/app/pages/ui-features/ui-features.module.ts
@@ -1,4 +1,5 @@
 import { NgModule } from '@angular/core';
+import { NbAlertModule, NbCardModule, NbIconModule, NbPopoverModule, NbSearchModule } from '@nebular/theme';
 
 import { ThemeModule } from '../../@theme/theme.module';
 import { UiFeaturesRoutingModule } from './ui-features-routing.module';
@@ -18,6 +19,11 @@ const components = [
 
 @NgModule({
   imports: [
+    NbCardModule,
+    NbPopoverModule,
+    NbSearchModule,
+    NbIconModule,
+    NbAlertModule,
     ThemeModule,
     UiFeaturesRoutingModule,
   ],
diff --git a/src/assets/images/kitten-dark.png b/src/assets/images/kitten-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..3966612cb6d49b0a87e275ba4820597ab8f895b8
GIT binary patch
literal 48440
zcmeFYcT|(h7B?IlHj3p)k*a_w2%&d^O7BSThyg+mkkFeAP(V;x1O%jaklu?TM0y9Q
zp+iEG-pTvKbM86ka?f?$wchtz-#@Ze5~l1uGr!rhXYZLkuT+&~NG@Ez00MzX<YXn)
zK%i5!AkazDb3{PSX!fHkz|VPmSzQDObnz<Ta{?6oo)QESTDH{CLFy<e3Pa(x944ml
z$7UR^w)Q}65J*(q)!qbZZH8ocYzDKm6T7)mS$mVg(p2oGHlGrwlD&kPg{7>!qnWz9
zvIf-M8Y*OZQyg+Z)KwT@U~7gnVQ{szu|o*EirxIdR~Y!8kPW`c@S_USTI}Y1LW2xC
zN~#PJa7Qx+J`R3%C>M_)gMbhR7oU(IH}72rZcZ+KFsBfhi<g~~OPEtgn3Id)kH4Fc
z3&4M(j;7|qYLe1_GzX-_ZdxFb_QGJWi;D|~3l9g}5eDWG5)uM)a)Y_K*?}7D2sb;V
zi7UGug7J4I|KcNQhJZR++9NIDb_@i*CXeAxNU@tY2@U=E_s6(w?f-1Z4)F(e0E%E&
z6MHZh2PgQSh)kh>(%3sW+WhF6DHLpGV`gh+heQB$T>nUCZvjWb5f<?O(&V4T|FvOY
zPL!1XZ2KSkYis+DO(T#}&Hw~|K>ClA2n{!TGq9Q&0`BApHIs4%hQjzyqeohr|1~-P
z#)(k!U;A$6YWZKt2qnLh{SbxUXGjzntFVNlnF$i^r~!xDKz^4p)qg?AAR$4JDglPu
z+Lm^va2LcKQSfn+zvlZdZf24uNHYk5lATkKom)tQi&vPBPncVPjgv>1lk;y(ey@3q
zhZ5Y>(%kJoc<>2x@gL*yx0=U!0PDxp1Zna=art}Qzwt4J3Y)_nZB396OIs6|8Q9(q
zCJO#5^KUi(lqz8fxDDJ9=$09TM-==|*?*(@A!)*Lb_k@29n?%t5&~p!SX!D2^KlDs
znejb_vYT>oLD>b&c!k&>^KtXD^O&1)2|@+UOiayx2T@7s@8ti%S`rR*BCHmG_3w(s
z6b=R0|J5y1eqK&fQyzYHLFi*1b}lY60d^sNelvC<9<IkGJbX|A9&_#=vjsHtH)j9Q
zkcy)vp!ZB{{#J)D7E_=xb10`d9}kq1ou6Nb_m8odahtOX2$%}+@bhsAnh5aytBHSL
z^B+ygS|R{xb^DtX1G4->v#Fao{Cn=d3T!NYXefIVM}!$+{fXWD*8==grTwX~2sA&|
zv9Jl0pxYo&!tyXP6$SrW?qA*dlkyKT%m19t{|$oQ`TvdlzqjFHVP^NU<@GzOAGQ8F
z69n8G>0;t&b{_^v$p5nPf9Lw|WXIWyf(d(pjphFb6M-;s{=b`s|7}(M-%P_X4fX%u
zH2fvSPzw_~n3*XA{4W9iSH}M~bHC5$zpt!+t=9isiK2wfNf=ngfJB-6SUp^#;Qz?`
ztL5M8>kw9>jnj|%0^FRyADD~q{Ripai;t7){+#sh#m7niqSUmrL_z>H_oJi7vj0X!
z*g=0+@9KcDX9nTt<KqD|*YWJ*6snf4W;QyKmVh2c5cG+FkiZ{A$4mZ^Qui-PU<dd+
z<=;yFp!|KZ{$`l{ScSjm0%jjzaf1IeIsapU{;9|QU;gvgkp5qCJ;v)-BgX*wdGZ%r
zKgZ`-=`XmB0rK<YFSve=&#}^9a2*5W=gD7i{T!cTrN7`h2FTBozu@{gKF3Ob!F3Ff
zpC^C8^>ciVmHvY37$84S{(|f0_#7+!1=le^exCdV*U#}eR{9IBV}SfT`3tU}<8!R^
z7hJ~x`FZjeTtCO>Sm`ggjsf!X<S)2>j?b~uUvM1*<mbs>aQz&gW2L{~ItIwklfU5l
zIX=fqf5CMOke?@i!S!=|j+Op`>lh$EPyT}I=lC2e{RP)CKz^S51=r8<Iac}$u491w
zJoyW*pW}0^^cP&m0Qq_H7hFHb=UC}4xQ+qx^W-nMevZ$v(qC{L1LWt)UvT{#pJS!J
z;5r7#&yzoe>%w1;IL+*UmzyrY6HWC)iYDNBCj(SgO$h{YX9j_uJO_bx@xU(@1ajg8
zfpCvNAmMi)5CuHcxIr2OdiF(5^1g=a(Bi0vr^aS1es$Y4G>R!qkztzX#IqAGK(EG0
z5?_`ukEgIcEA6+-an4#QsnlPv8$EOyUUG67we4Ff8MZ3bvd*VCldm-s+E0D%_U&75
z7~b4tcsla+kUy;D;E1x`sXa=Ln<q-nr~^IK%MHuL2=NH5?0So1^2}CyS6ojMo}}Km
zA_2T!1^SNs>l>7CijesG_epX#U5hh>+#3=qX9>R#{`S4|o5Bw!p}uN!oxY^kDS+~O
zx4Ehak7xgljpt*BdxX3jQvb+Aioo-UYGT@dwC@>U7DY;+OpyF1O6!Dl0?EB|T|FlV
zEIR-C2EF(}_xJDL$NKV8_K(U8$@9P@0mSpaf8Tqf6c_z~5lB2ze3_EWxMtvE{qzV!
zCZ6H5?=Oyxm{YL01Qbg0xeMRyj5XG|D_3#2j_LuP{sJH}>>SOOz&3CdYF;zJm`+0G
zOZP}Ng!gy?70?84j3}QJOQyc%Ife&6x|%q&SxP=%o@3k(`~uYpm^198`<^}rJT?Yk
zVrROvoBpGFm(=okPb5Nw3cnEpj7<GWmA?TsKrgQF5o&^d)c@mqT>UQdkIV<J;(iSN
zMniZx=(E*Ul_Imy63zmFeWXiEa`MO2JY#I4%JcDg{F<C2&Kp-CCK7^+U(rtsE}^@A
z4)i3SM))=sbcxglpECnHLn^0N=2`*4_oeKux&&G>fIy0-N=grHoveEyJ}sI&M{V`P
z=NNj&L=QS3;1wGeY{fGfiw|6NLN}z;!C$+2FQ&E#aY<R~MirokRhIIE95r(7P?;eb
z8HtNehV=9-c|qsuoB%lD@e4$U`{Fg(+VS95%>#AcSwTt7Z*9^pCyrD}or!jFs40Lc
z3RI7cAB|KE>N$@(^7Z#G9F}4<rFKu0yHh?s3zA;mS!iLFD;@RF?e!zIZhxWT8B==Y
zUb<niW3XBe?VMo^Z0=$8p64Bs-+WVzI1Nj^k2q%7n^A}d&2QlG@1{Fjt1j}TJ&H3B
z<KXM%&If^Z)DF<xO3kv}rT8tWazn3&yVvh(x9zz2X`eV(KDf@kIfe1j3r_A4qmHHJ
zI2@(z;11Lb&qt%Jo6smLlZll3)tG2Tna%E@%?)=@9i`+v=n}uKx;k>d8fDpEMNG?@
zH9#NdDUcaB*_gD^6s4EHN0ee__G0?TP>kacJLr@N@eFSyA}qQ`Rl3LqGrfcS6xcO?
z|K_-*%8f?0Rx2V9^o;K`2&BHX<C>%6_1tmY{4CNdOH<xa{?%Ogcchd2sA1^v3?4#G
zZj_lpp*WymJ;2p+4HR@@16cXQDJt!~uj7q!ra>1P!rrS%M}~8E9k|olcE7s5;&bS*
zSyp6r*phi$ye{ShVL{dD6wU{<6fIV$>{Q3~u`0!}roc#+jzor%Gn?z&A(VD!e$=Am
z4xi9C|4OZ0amB|!sn$3%^Nn82p>b(`N!*0ij|C@LnLwP@{57-y@oc?}q*%=<0>8jD
zasiaci@aMoE>4hYU|zJl*a!B3hHy)x-?b~bG)4`_j6#+<@B^cTUZ^q8&5kO|-?^Rg
zs4{HHHO{T_y?9_GaN}WfwQ7N{MgPc=H#|f}{W*StzrWvlG_0e!Z)#HMGyzTqwG^0H
z`t7=gqh~_zo8wcZGxlBzym;rZUAB>i$%S#<2feiKfB&kbR*45xx5L8&FM;f0`Mehd
zvbC_!1|{NSt(dM{VV*mkQ7D01;B&Lf&u`Wb2Wy8Y6!)Rs)K3sJ(aYZg#Y;5kD;-j@
z^Ygt`j$j>OG;$L@!43}HUwAW02Yg~>+7}IkSd>-UCX#R~3v(nyPtMf`OoKRszfCQ%
z>H(8Ew--+;@V-7HNGC^4IX8T9gFGsxNx$qKR+nn8r*I)kivo0$7*GV9%BS^eFJ}&B
zNM}|mWQvaaaNWm=f*95~0ae`i^xlHNl`APDLTaHrYeo_V?|JWx>d%>wi>9xGo_vLt
zM+3@&vWFlaS-JZ!FbgTE3hIa|G1|AeCDOtVm+<a09$T5Nhb=UxL7dHiQhLH=vx}oX
zspkW=Qg(%<UC+q2f#)e|`tBB0Ja?j7(Cs({l8$g9s?P#FYRyLvJMDYLYqn=!Y{j3`
zNzp~5yb4QP;cH|$&7WiUI8;KY5TWU^SXLn{EF=he^xKzCpplYfn3=_9b^Mk-XWX0H
zZEYc~d#~@2C}S7$=Eath_~pnRU6ush`>vZ?Gj3uf45;ff!75GUaDi$g-ahzg)=uG&
zNeZKfyZatOIv|FiA3eSa?>fm|xqQ|86nZ*iEc#{sEjImv!4w?htP@=eyxa&_JxhZ%
zfzOFRpI=O9f;gp5qSy3u1xRR~FTjHu>bP$6wTX;08<Vwb4tN=~Xd8DtJw=f8dko}0
zi}LKX4F{)(tTy9<(o$a^Zc%1y%E@kA?Iq`6a0T6a_eJk6?@5qk)=a5EUb%Pb7bV$n
zNAL!z*mbatGyH3&D1%c`)Y*_7*UA86SKm8MT+6M|sD$KcSEr)wc~xC8l4oxU48jy{
z2!VoT>Mnn^Ps-2ERI{?;tW}2ERvYc~!OzoC3YbjoiyP;(F7~Jo^z{{Cjcdx{zCV3q
z;tH(uuDZ9;%e3aaai{#5W~SW(=h~9Z%;qCKAj}?BvCl6;A@&E`D-bWO@i)n>HfePG
zOKH5;bUpIV0Rg6bF#feEC5On&%p-6fXl4bny{*mKWwKu0@z!);?&wJV`gs5Z2KyZ{
zny|Dhf}TYAywA?s&#VnH4v}3F20f|cnoavcBK`ecEDSOoG=2i~2|f7)bm`WXYbBt`
zwTGsApsB<9dVT#Pvxjhng_oz$uJ5k6B!|8qo7{VD));t>l!(lyVa8IIssN2<vvq9D
zc%z2cd3W7<;kLYtWM-D7NM78O;<cIILJ8e{*aU1iC}2Kn6F!YjskOaL%7i#7^7)5k
z0(z(J^3CUk?j+2v#D0yy?jhgOtg07z|I-rR7=95`sJ&8E(#ETJa$>932i_-vx2%G+
zt=A4oG2UQ$$4voxaNA|srk2f@+7fQ5uCI^<be_@vg{%w8?faYLXht+s)5`v%=?>~2
zLT70s8RWB<w@~c3xhrmJqgShqUk%CYymwA>en$n+JTGqB8{jiEZ+H=(lyQBAmOXT<
z&pJ&e8SWdHh8@zUxXmUaRm_(&v~yszH0T!OcLFdC5?>)61S}tPkJjTR80>@E##fu+
z0_l$U``4-K%DyaWf-aqmFPjlQDf8QTbn_A*&%sprAYcMOpWc>QeENvSUlo)VaGf@y
ztk^GY7<PI%k;2RS#Nkf=18UGcRl}m`EA?J0%Y%s|)bXkzS?j%K>fDHk*odqso;5y%
z^iwq!)9Ygp#=yGE@^Z@X^sG$ITBC-yS7?RRG6NWyt*kQC5m_#&`L2}`S-I6JDE7N+
zZk4_Y99@-pwn+&mf@(YOUj<g{JEasob^Q!X_0GH-iasx^ceO&kdjI}v#wEwW&og?Q
zrQfqbq0t;>bDfO|{FJzMV!BbW*r7_i?b2wip@;a0iR&<(cAEG0WRm<#mF{QdzH>{!
zSRzDR_={-)`{!O!3?EoRuF2V{s1lhTBo%zgXpn-EENkds4}P*DWXdVR-J$0y;gfdq
zE1&kYJ1hhDPx*7X7M04uYl;nl;Xl64>pA#w)geAXB9!B6jMO|~Yf01$?a5s^JRmnL
z+S!o9oD~Vd#u$6vr?t%{4&w9;rt0xB8tYYa!F_R(GLB9qWt!hDyJ}Uqafaqzu0eq$
zTVOy@(Z@G_qzOY6!a2hq?^6c`_6-hFb=tm<(-|ES(GA^5UV0a;zfkOgcaHy5KTmn$
zNj|OcZCoAY>I~fbAiM5{90hw^Y9;<i{%~X8C*kQOa%qVy*5L5>!a`n&Y{sD*Pptix
zWj&3}`h%Y=dkhED4wXRtxp}yewh!NGaTw=jw<=y2J0~nGQoOlTTAWd)LmwVViY-w;
zJGmLS>^ZZ^A{Xkc6QgOq)S1A@43UsoJDs+8-nra;hwF5m>jm06$_Z;HO}Pr^wv!Le
ze!k`QtcL;Vs$x3lg?!8^*A%C7SYzGw=9xcJU*Et2w%B@eW2kt;JE$|ES)MRj{Zcqt
znf8?8`d-+^ey)`K*83wwMIzYHte=!NFNc>T?KxZQDZuolJVn#g8W{4O6F2jwsy@rp
zFWiJE<UVZ6`!4(4-e}FN&;9%PX~~kbv9X!y8*v8ondz$NOUfe@<iE*=0%Hx2h|19A
zfw4AS-m8cRZdbM)Dv$zzRuS8tcqe?x$7o!T%|a_;ErH;>G)4!kxwo~7;FDLLyX^2?
zp5Pks#YkTlWrDAuD=3V637^&x1H($saxL;}XJ(jcN^+I`S=lrn>Sl;BGYf0z3S}ET
zU5CU#{J4Z@NZXp*`m#q1+FINCK0kZ*!8bi;xYW8Qk{y@@^ve}%BcD+3u2?vw;6YOy
zS1hp2PO&3Zd!Ob{Oyt3Pp|#cOujES9QBF=}n>{Plw}KHb{8t^!dwU%0zPoZJ7{oxS
zWytH;*fx7u;yP90zmvxs>*@$5hi!k_^COd2C<Y*L+MI|vlUrD*4oqv@HCY-`|44Fj
zT;jpOjoM(KyF(>j`yc&PsLqfU(gow*EnlVwgE)yK&T{h8u;vXI`>a{!?2a%;^MMWh
zo39rwXN+d%*rhmd;)p0hvVyT(By=jsnFabQ&6}PEwyJb4_B#<w@Q(Z5H5{zBJAv^Q
zy5F~2z!ll<Z(Sx6x}bS!P{SZwsi7gw2wmKQT4?_KdHv+qxX>$_8d_EhTT2og=g6di
zUB*g*?5rrDoj4==v`W=@gJ1IUuoz#{Oi4|Ec9K=D^Exry4;dsoyD6mM$t!6!8VHsb
zHdMHAhlyoA!O>i$y*0$|abJI*?*ZS)P)rKF^PB@GL54s#jg=Hb3eHX{<*jQD5Gzr?
z9B`Q=+cRu|mf>&<^}<M2jT1~XVm!u9h9B}O%ugdnY4h2=^LqNb8_%Ao+qpm+bo<Pc
zaY0?`Z|6OA75y=tH{`6{3whxTa>lafvi(ngn%nq-lNohm#VK4AR3!~4rKVVQDJoLy
zI`PQhRl<1?gJ3JUM~qO?crPA9R|lSWz6J=r)ts5$<#9RiGuW7ntugP55{!x1;g~sW
zru!v9xjY%S7NF!06TUGObhT&p#^~Imr@N)@<}Fwg4I4qvKBuQf*s8l9=rVY0LjW>m
zuJg2tsEY*4lCnhl`3)`g0`s^%Jh1W${U%Q1jJ7qZhuoqfH<UgkNSNa8Re58|Z;$W2
zM#Kt@=08-C5!s|6xQS0xUj#2^j}$iUz^~8h(F~qi-7_4x=`QwQJS+ENQE`%L;J!Zv
zt~rMmcI_~piuaU|^v(PIy}yy3CYU=fk!U5qw$|vkJ~+HMy~|_C5Q#jQ@5KFf#HB9K
zPOxnnX8+Y4DnGz<ye_PjtNWoi&*whdz}@i=KSnES?)<>boNL$KUnkb`<G^#ekhi;D
z12+LB^m-mL#O?(n$%%Gq^biYwBphwGe~=QI%oktz;`zxRvm2F#Hgi=ge`GhIi$6-q
zahD7!?iosCvF*E|kA_yc_IgW-bi8x2668no$8AF1?;DXhZkOFGd3liKa-<bAu+lTI
zyhnTX%##m+#X9fq(14y{zx!W{=7tWrq0*GUiWYO1Pt!i$1hi?W|2Oq~=8}hGx58yi
zzr91D*wT8c20rBENSMt;TwZ@4UqsszRswZ&f4rF|R#==WVEuL5VYV~VwX&WQNptl5
z&CSgfJ6NSYez#Lv?#dhy=oy``#Yxb)+@fq`y_YYFUHqEx&|R-RU<|Uwr}?<V_8vUO
zrdO9R2VUgm6H&iN(c1T3h$mdw;h7o>v-RUl0gEz2FDq-TmZD-1vVYBmZUyg7WEvQv
zS-^8Yw6}XCqtTDN*aex1#N43G%<g{rTyrSDkZCb5r>#5f?A2yICkAiXhG~%;cGg1Y
z_j}uk&mM$98K0A#`{7fXrnbII6{2Vp81boh(w_I#j#q`j(wN|IwCV%2J*@h=UER)3
zUtsZkVtF*5b@Z*&TNyd!`nk*A#ibkRm08+tXpcVCz7HjlP}mvbkh!4r)h=<-=bxs6
zT0&XAuyM3!o|btQdACB64dR`0g~mZX>P>p&tTHXcAZc6t_Q0$-oJ{}HZpz_1a+fo7
z!gR&-kOfTqZZGSmv+UvFoUx0VdBufDgTzqU%H5AYPOAK1*kXE~5for2C_7tNnk4XF
zqfiLVgt`}T<noW-5EFSEBe6Aty35hYrvM&6=hi49)>1QyGxTkh#H`>>*t-4KR`852
zs)v&rA1PmzMA|ha@l3rGrGtw)D8EFt+4V86Q((geycMa!Vuy^qHAI{vEugFYZ+zbr
zybFGkR|$w5Ei9W;oJT<04T0!WWz*E&t!XnG_zhPt=Aoqh@hkz=y0r3(bJl99D+!uf
zS-gDcef&VSo)arlcFef>6bY?_(2XrL7HQG2##S^tdrhy%qGWGh)GBj93jsxqxnke!
zxt~?`4SIB%n2|#}9v4!YaU>a|7gMR}Ql-S+7HegRTO+y@B6Er^BsA1kPvc!u;6=p7
zypL#da=7c#NWKbnAf|hEvb3+ipDKJ#owg^*S;6>TG5_3_V|MwjxtyANB(mT>Zdn-5
z&tGYXGD7&4*m}MuBYEObzxGO3e4~>X#K{d9=#ce3@K^KF{Sk3Kw8u^1`KSJL-DgwM
zta-e9W9I~1d%tYVHzzMKdgrnQTyWY>v+Ih`W>>XVFU4hv^x9WRh#6L=<s!D|{SXr9
zT`}6YLOT=Ds^-3)G#q1_m0(vc^qNv;p0&D)_DY8R#9M(!uA-;t54Vx?f?iSEwP9(>
zoqPlBeM&AI-S2nRHLA=|{N%MMa|3WH2kJw>?ve7cOdS}swC$n|-c~srp0J-!nTr$I
zTnXmKJ}O^b@>$2!K5}yW;h~LlRL)*7bT3{xIr&1;((Y&wwRGoB*T4}rUioks`>L-b
z_(6~Hz(7ME?$e7k6S3Ni!KjLrv0>!CZA)L@SXNlEA<*57IOWogg|lqPGWR`=^4j}+
zGJ44D0=b;F(Y3D#t*_r*Me8rnj<uZS9jEFH&$zmgzc6Rnm&T#FRrG48%B+&^Fdn91
zs4kGbRWTr@guz9bxyOoJ#fV#5^o_cVrc|y}EMzZeXv!;*)WChJGWEcaO%I4DsPPPN
z%v5)dS;hW35h-@#V<r##-P@|>(tbExb>Mj-?y$ZslU_vjZPs3l=aG7}h`0<%A1&*s
zQPx&uXa5!6e&<X_pCr~6>OR$Bj@Zk$9;D3b6nY=7mu~cSjP;J33ELb58>MLDcWPPL
zM6&0MzVS|vh0toPmq1D*>nH3j+A=jEnEn1+7^xX`$5gB4Aj`{@It-xGVSEBk4W*Vu
zAj+DQ0q<6O*4|#^o%%<;8lm+GwjzL%afvFHh{v`?jy@Xg_mTYuMwu~um_wqYtv9n+
zYO)rz?y9Q<BFCQ-@x{%DSEh+G+1eN6s(X}ZF1$vO;i_$AG!e;ChP1Hl#M9S>+T#|Q
z2h7s8y?V7B8}X>?xS^t56=wG>)NpT4U*1`|D$RKO2)mW_g2v!cz>_!$i6H&bO=W(A
zrNf#pYJ6YbdwU5O`cy}f$I**IA6JPzpe0I5?`DBnU~<WJE}bBp2nPWNZWe<iEnYsK
z^inRG%V|A_%mC)3)l?*VT55-rE|DopQ^7O)az00{7Pz5r-wU$7=D0a*j7R0_=WC$Z
zhBY4!r3Y)Fh=`tHTE?9>Gi+RP0tQwF_J@Nra#Ia+;~?TDH#ZU_=t%}0H#e+|<%*A1
z(tI8&D3sE<e%BiH=wOXl$|JV_79pj*owDZ%?jH({cN!GHW8=far#&8iVM^=mov$oq
z<Z4O??&s(0=l^bUk~6h|a8Tl@9j*8_hD*0#unq2GM^XpuOIF+Y-8%>emIDY%q~9P*
z`)KE?t^xm&_u;$i!7eYR`Qp>9dKLg>VSG48T3ubPw!|)W84nTLj-k~P-KKV*tTpbr
zir;4+b#J*)Tj~Z`e$lZ#IYO27hcD5yA1&JFib)wT_;mI>VP75}4yWqjWkzogCil5-
z*=R~f8aepVkfJkuN_F=((ht81-A~@j-aBC&3FzeQ+I0bUe2x{Z7-e*^XeKEyHU+kY
zOEE^_>dA14YhwEiDgjOkT|QWSykopwb;{R`3foAC7t7JO+lrJ^>)?$RZFY3IT2GZ2
zT@6#3AfL;GCqxz0$m^$l=8?IPUuuV<W+;zQ+v`}~b0E2Hw6<Z|^!b_&rouGpc+<Eh
z^TLeM((P<40#jNdSMc>FR?efCPGk<{WNhSlRIBNcEV0S=X=OBBxHDNho?U&{qu2^g
z>wVe1%wIdU9K#qJO`DZlqFL#zF`plQ^t%6O*{s~4+OH#}btr+`+J90^tNQYAGJ4U!
zBQvY1^=qfs_Q=)Fg@WPg`fN`+FomM}U@loNW}xHj#kzODEgTjSVN4heF}s6p&8-lx
zSyk<xRG-7{z|7mQ19r~1s7=Rji%&NliS-JtBI1lHx3XL43hDcyTXlA|rVdZ9OipR4
zT^<?pzp9xtbU4cun{GvdoqUpHGEBX%SuvLmU?-~rss6N40r(KbLj5j!WqePJg73>I
zugqqpkC>NcJ!)be+T3%77=Rj?{IsJ^2g`VSpmm>0gmM?gx=#;^@bZ9TrB62IE97y-
z-5jtvsOboM=r6&B0@H6Hb|>fH+Ukbdoksc|Sql1b!+EIq!L+NIP?yyT45XUx!w@Nt
zHaR&db}y{(_4c*9<vLrgBJ>=f7s0F3g+4C6S7`a;_pgN6>@8v*?wk$MK5`dQ>v`a_
z=AIfz(RN->@Y{a-dE1@ZE1F*4cxN$aK!oFF+v0De^>Aem!^};0*crsZkA$mxZtp{!
z7n_Y8x#&56@D7;aktw3D`*y7r7^;FlmGFCI|MypEa2B+K&wOZeII0g~xR<^;enAcm
z=O-7ZC=8E{<hi-=)b9asJGUl$psAz0rXYtt*XdkWb~OOtK`}EIuc=D+vH>-dRqkLa
zkwqHGZ-Ji8bhygju2GRDuRuO$jcyOUfpIRYR_CuQElp~Yv3%qhppGDKAMmGNoT?{!
zq?nLaf6wssuBvbI;cua*rn*wJ&(@-#o!KKJH!!!@*pwKfE=}i%YtFZ!Sf}ayff>-#
ztKjXlrd?YCyg736--!1e+T2B2-MfL?Ew09cJ)c(CCEe{_58f-B?My26e%UCA(20P4
zb8?RNJlP4F)w$lbJ7yWA;oncmmz|s}M+Xj8&>}b<zq<x{fG+#!b_lWcPH5e(p=d60
z6EnorxgxNAjaOxZicrup_ff9^l_1(~+h|<n#%FxQyeaJh>FZlQJh~_9bgn2|rQFZ+
z=eJtl^U}+AuPG>q&CIdvncdvq_|y*NCH>JGt9Ge%&*h8KV1FhjB(axCEwryV;PpjM
zS5<W{l+muzU>U9QOkjgBCu@jxi5)t*6{!@(rGyUozD)#5fEw&Pn&Wyv1nQaK2zyp!
z(~;2Jd;^n;n?KK-^6eZ=y~amQ8K1$e#y4<neTw(Klq@iXvn2B8z||G1K1@guB_pNL
z8IU({bnaJgnBAX{1F=g@Ld@64me>w6%0<74yf;pn7=Heho_pJfNt=PDwlRJ9+?(l*
zt?*rLW>{t@i=bN);n3`n=sPZ0q>VEM<`>po{fUv1)vv3kYot4MvUag|@fot-MC&vu
z=4eSKUQ1UuCDYn(z#2H6V7lE=pH25QJNO(ZQ7+rJ;TEVaeDJr_Pq-P%_Rh@vWCv3|
zSYM2Is+6`FaAjrHJ232H6+hgUr|qpy7g;wUTVi>X62^xwxKr_HnQ7C*Jt9KvzFgC)
za8a!mS3zcC)x&EuB<__vZ-(?eq?g1F<Bh$I&QQP>+B=S>UOt$VO>LtMkG`cz|8{S`
z1LN{(B+A`Gy=p{^1M(7-D1rp`ibpohK^gMOt72c6`9@tWTHi>>NHu(f505T&v%7d|
zc8Kr4<k;WgjaU{;0QRzxT<_}ZessYXXO+82;&nfSj3N_A7xVg4+2IQ*EaDpa`e{Q$
zRSm1kX)eO!Y!t@XS#aI-v-oORIEA*wVb6+XM{tsfhj{FrS9>eQp2|H4mU*D3Nkc<^
z;?D<UpG}r?-%?=7?5G7)ku@MPniXM|LnjE>w>BHwh&o}Di^j#28_uabs;o4un1}=~
zh~t+|jC$+84PJzI=iwI&W3v}7=nk7I%JqvG8z;J<%yCU=N9k~*^%ZY_R+4@d!B|qS
zBShBb65cQ+U`<-=5CiuY_56*aQZ+=(p|p8RJ4n#}v<Na8wo6JI8eVI9IpNg3-lWu1
zAYx!mSv9_of^0K0T?a4Ec7$hi2Sts!zxh@+9#`jmh!@MOTscggj3pmE>@;hxWa61$
znv^ZUZh?)m@m`yx5%i;3pRJGN#rIa#B{E-ISTFP@iF-?H8?5VAm#^D;ZO;iTB;YHQ
z<&-@-<MVi!?}vyU=^o<9jC;dsjq>(u4wf#T4gU1uTi0NQY1+0JZPQ(It*p|y);WiF
zlfB_o>bv(&0!B-njw!#AUE}lw1`f~r?J8r6;+xctH{CobFTRZT4OFl8+p(ALaa5OC
z79Jh>w;(aKMhP2Da`($uS|E{0{`imb6b7LmQU*qn;9mGNM&YM$pqnAy2SvHns|o>5
z6&u3>D+9LMM%RlzuJ-xV7{O6qDtEA470apMg{Cy)bIo2VZSB3<_+^eZ{Wl*r6z@Pj
z?Z*X6`pJ2{(G8&nNuE;ZT9gsxJq3Ed(&K}7i{GRH93h{sujV=OvTtrFuf=7PX6A@w
z&_mX&Z8^L}Zr6Sxi=)BUV=y_Ir3Oi*M;Zy6D&gr9Wu@((5smm}#8$0XT;WklQIp(W
z%!*M;Z<Djv{=WD?BRkwTxsBlMF_Phv0LNpaMWz&2y(BZe>dHI5`gMv*aITh)#FYpz
z%LS+K9^s2c3wg`6^4kY(eFT$N#%FE8L@98gB_Q#^Xi0^vR14~TMRuNwm2KqEaPrg3
zxjbdH8aRH+%iD_~J{en){E&BqBNR@p)^{T6Z1CEqxtgH6cSKkOL#|S@6g$!M1yNbb
z%gcu|ZEloptg*qd<(m!nMRXxNo{Qd7@Ax75xdo$6-V!oH;Y_3M_y>kwQ+E%iSvs(<
zj1O;EJpI~w%4b`9?_kcZOFxEm9#7|{&WDaZ^b2n4QA4iBqHxP#qiek%xqw50(p=qK
z6^uhHH@BLKVa<B1+Tl#`wi6oHLA2x~z$dRsgt$;ujU}-X`JvD5>be2PHk&l-6h!cT
zR=K@dm)flE0<|0+Z(oQ{M_Y4DjE9x6msi-)22S67O`F=UI_^spuy-z3&N+`(xR+-~
z>MVIz>%nU@5;DnRlzoH0n8t8an@0nm3c|<8b;9XzzBZoU%QKBdYr7&X)=Ae%u{4u?
z%+dk1p%TtSIE?Fk>Z*y}n18r$0{py#48VP+;6;fRuf~SGHQ+WQc>_l5+WOW58J%zW
z_@qz<ToM8pw|tJu$Ep1}9)`7^du|aC+QDV9T6b$7xQx}Pp^Ug!dS_^94fpCR*we<y
z{Oc1?aUL8N=m$QvMJryIp1G3J66_%Uh?!oQ;097&v{`i?UEi!-EeAK<X=}f@JT>Y%
zY>N|x@~yeKl>?}2S<VEoDQ|kqcKe?Vp5N}U?GKJ+W`tzWdA?T}-IKe<!O@v5q>kLV
z_nf1wQ@`zCtn%z8E>d7~---GZZcwKSmC91F=D)Fnf1{c^H)VC|0;n|4C?lc;g)3-4
zI3-r-^7XOsnOS9qs$VHWpdq$*y{*60cN0BtY)<@K=%*sr9XUxmRAg2eXIwi|H7vFo
z7H^?tXV)3*pDCY_@oBpT<$d@*m_B1x;sW6Wu#3ZIwV~qiOdn)>rgej3mY?R%)hZqu
zCue!vHZ_-04Snr26$~O|wW%uP`m^?2yK6?9gCEEc(I`|FF1o^GbVb{cVm>REN}{4I
zti;Mo;As3~Tv|_5G7eYqVdIFHD7X}JP#j8=7HHGFt&J;pY9P3=*eTE5ntdeNHVe3k
z?#J=QZ`735_l?fvEPbD;J8R~?)S%=kdqR@7AGjk%wCW0W%*|+Jg>yUXY!7dDUH2mO
zcR^I9Fru%|AcculHU!{<xo!F-@tbT1<Ig-k@rRCuvDl)E3cyNkhfmu=HSLx<p<DGP
zK5>2tj6!nzTeP7)*mJini1iA}?kPkXe89q{bG`}6F`lD6|7xsF`~GfFIZq13ZqUh>
z5FoUnj_Q_K%0mA>WC~$yRT0kf`5|vUaPO|s^cLwJ(3hJ_ceq@xbU$mDl3iIP+Z$8-
z75@Epsq=jBm+d}tY+(BU7CGPFCsnbMH*lK`(VfxaQIXP5p22f2>SKadX6{<`$|i-t
zLOt2ms>zv4h6&IH-;gW9pm9d+>?*yB9LCcK%wp99_?&C*JIXtQcQ&`;HMIJ%R|h1n
zp*Pl9;>d7C<r7;;%c42h&Fc9t6=iyWlk-S}DEOL`uU>hTs<jqa+(}nP2E}jdt<RGR
z?)?%z&i)XC0Y@wXEr0dDHgw>R+WC0$C2N0FSneTz8wg~iJ^KCp;ABU9bh9}sb@ud%
zgD71_W~TDMsAs8jl{#x+Rq=(4j5~S{HPXSOK9#9TZQ*y-q|A`lNa4ZO8Zjxx6x$+Z
z;!u(y^rFnh=+1LTU82O<;?|ayK2(is<<SC$zB9JeILpm#EH`)UFv5MOHm)1L-;bY9
zL1B7>uspohv#lS*>=c7sTq9c0(?(aj)in3o_X%MQr!F#BsRAKa^ikmvxyip_45_Z(
zBEqk3g}V;C`IcWO2^_M`i-@}#l;(1D+geAm!R>PUvyF23vQSw`h59l4wmmN1-(7n*
zyhSZVQrq%L^tw<SfTHO@$8yHf34{{1`pp$clC`!$!kw@l6+?)i;qv-I$$M?>wfmMC
zx$LYLaO>~h;0%$SC@O?G4v<t&i>D9ydBBFjrj^3OhMBkFAMOKseH`;XaF%LWL5cq8
zP&hPsLop+7KxDSIdTHYoE^25<cyn5vdIR|Ig2CFQxp%soXMCI6+dHHCT8i_k)KnnF
zH>`#Vg;QlzhJvL=9lqyb%J99HGCxhI#{^WLIXpUP`rw(%Iiny=;lXjQ4u3YYM3=Rb
z#@5c4gr9UpOcyN}`?x1v;D~p}6@<EEZpMOZlY{vwNPvhT5L7zw1Zn#%UW43_qoZ$&
zW8b;%j8a2z*Mq6YQnRbnFo#D|d&}GO165T9Z7nfa#OrgXF-hV^Sx`PFR<=A|lIySv
zE38y=^RoKmNvwDlNim}b9k4J%aUN~K03yxga8#v#81*Aw&sDtPk4S)LEonF&pGrw_
z{3mMOH)Me0@}x>4tKV~iBYr=1Ru-$vSc(7ic{Ti%+9H+sw#}Wfgt>nB`JHL<w@@qR
z)a7be#B!OfFU_m5O)(;(szPl(f!En6sH%0LhFjfs%>ceEYK-(zxXs@8tRDemmYXT!
zNl!gL0P%mOkRn#*bDK1$PK}Md?k8Wd&+=9&OjV3ZPn=QEDDr%TTZq|6)5ZksSt8IC
zpElKMzVGVu&V8mz<H*a%7|1pBM|M49<Gu7n*v(JpL{|eLdJLG_N3Av%5$s=mB!oqh
z{poijwjxltF%K>57N1n}SJ}R57fiOtN{uc(onRtHyi{oX4DM3ghx~%{@7WO(DTN-H
z=CiXn3i0xr^C2CV*cjF{mf@<)BkO^O@?#mP4#Yr|O<fsE^izh);ZikZ+sssMQ0S9S
zE7)^}Ei+wI>{R#f_QlsZxh0C44a2eIhiggxwa)z&G@&jPBXj-N7IruF+hdd#!Fg3z
zHs(5eZ)<AqjFs+^fw90^uX=dzU0bWd0GSUW2Jo8GI2LgB3-pk6nnE2a0I|9<SZ~XX
z*EapEJTM|sIlw9x5$P_k&FqL5S65DBw4%5WWUgMwqjDxVI@;Zqb!^#XXBfDY15Ogp
z;nq2+#{{75iVx0mUSMse-e`#NPSS^z%JR&mW<B<KZsdyd0>VkU1PL3c-u%Zw8Gh@C
z!B-h?OG=c*YP~P=Xi7c7MGLc6&&H|aeTsB)#>OYC2_glP_nEFfDJ@~BM9rf~a-UcU
zaH<L$hWUhGnH^qo?VX~tpP!vHEH^#>nx6R+V`m)~kAOgWR%ra4!Ev3U!KLW%h<55T
zgl+DvO~C!}HxCLg?0)d4^Hk+QAlyzhzHAL5_F9R-0OyUDL-)4@zFYv^G|ZMF*8}eH
zNN9Odsg^Hls`xW83(@Q~sCXx)4dnLqSP!g8OXjno?siF#K`0CAZn*jH4K4zKacqJr
zJsv|%)F&7UB+e50$+H(B*o383pto|tIH7Xy-tASP_b~wOSJ(U`-vTX*Z4~F7skR^a
z`r?&Zb%<s=%bY2X69?hkUovz0yfSkN6Ls9UZwqiMEVlQ(en?%7&;e#o$+D>Oay`U)
zTSZCw?d*`4=?z+8rWMZn=J_WHH-YDP2b1F%!zHqU?%pNbt)2v~I4wv0NQNrBDuMe;
zx1^g->L)t8KR?LPEtW5o&LBrGzI!hUM7=O{OPmFQJ{zs)-%W@hb#fA-SOrvdqoVfK
z4!0LtwlR5x8|mS#B?2R15#1~(@3Y1TUtc{v9YI_N+G>+1B$)p>s11VvU8V*6ulLbc
zW-}c9p;#G~Dl$3Xx;sNjzohdNckr{u@=%fofXB`|Ci>$luq;d<%sto?W(t|pEiaGW
zd`Ncggz3TQ*M%n?3RY{Hgw&l9GouB5yC+$Y{eJzOzd49=%)qPXf}zfvIl|`n6}R*q
z1{|>tX&5M;*t=wAZaTkQx!m2&mU|A1EdA8``(BrqRIIe%y?VD$hj3I|XQ2=`uF+*H
z5KSthTO=rKJlxZ9Al1j`G*p3zHOS={v!P$yk~A#&uBX&4KY&`U6=F56KT^vW9$#{*
zG}!CO8^D?xo`Ul~dHFat!g+~sggy0X`hCXUG;H9uP(v9tW78ca`H-3c=Xup?caKyH
z`To1?&G;94dmc_zTbJN_ROWL=iG1+~(S+YucZ3QWi>)V5%k)+QQ3q3<Ca+&>jxp~7
z_l}yz>Mb#(1Oc8vHWe^e?4{n+g|;aS-ck&Ie>HKTcyrUe$jLfs^6^q=vX1q8N5qA2
z9zGQr>#Y#r-m+5cp@8xJHFm=)J?DL_Wm7PXWpCAPm-Z8}PH-`Qj4^Dem4;bGw(C`<
z)#mo*`k5b5&k3f1rPkQZ_|9i76noWnfW^Zl74W*?4!@C`Q{H09dL>NlJ+?W%R58{t
zClj819kqgA98uW7^5GMMir%l+zidkgXqIn_j<{^-Q<gIZ?H#zQ1&a=k%C+Qyr6(?e
zKAoydFEkLDtIfcIIB&Tv2tYD4#Cu-p<#hK_saZu&JInEVY*aN$_~SGkI(_7a^p7F~
zFz)6Co9>>E2aU1afm(ajW1j<Un_CqFDh39+ZfVkeCr8CNRF1eu36p`6T7}t`D&RfD
zpvGvqC~O6GOoTYCfj0cj?V0ws@9)ri-I3M>qZjh}zLL-RFxLld(9FylB(FUm?!#b2
zQZXI?W-cQKPBU#rS2{PvMeQ}#=U~#K3q^w|MT!}P_0*9h_)fGQAL0{@lZ!LX)R57b
zl;Fu-BBn43PYcPbQRc5~+i<^gwfZSzv^#(M#@2Ae8gVj_r<cs*fLTMG^d!C++@ck2
z;nS&}EW8wO@qWfL#<fzNgeAm!sJA!Wqne9r>=oHv^7RR=ew{4G+17BT*!0W^g_HMo
zYV&~GUnsl%-OBv0@bP!ij59{_w0hTG@41T!4^oOx4-19$Y+(B^s?zT5??`B<EPMPt
zha2}!12U30e<;3>(H(qB+d%==2hLbnCj)=nhWjnxVgia5rPr^rX7zbEM#ecE)jWMV
z@0KHuZ=g2|45aV3T`Kv)MIkDEMUbh9oFWe+TFGo>l$QtPGfU+4h;#Y+A!_i98*9a3
zSV6<^ZZ{B=Oq_R;)BGgb=J~b8vn2g+${hZ&h2Y@mV1bh5?hc<_3EJ$Dl*MdaN5Naf
zyO75@4$)DFxAHBRpuOuMZ;41zSqd>mK5F_#_~&bL;O^<{ug2*qwV3Vv>l7?XitEO6
zTqfO;<|RK=-MzudrM(^8Lb%AvgW9LiEz$M8*GEt1DeX4Fm?M{B7v8MGEKQHCBdJhc
zFRQVS%KhjE4!g7hK3=kXG%#VEa{Z26{8Qy#P1(?3nv4OKJiH_j>WxLl`VZSyz5Kw$
z%*1>J&`>1mvnOBT>Q<X-^`>0pM}QkDmI3^sR6VjBT&0tZcRP5y&e0(oliMdC`r)^^
zPM;JEAhJdr-kx7NY^5G1%+AbY+B-Z=HHWc^3~%pI%<QuP7pfUcA__%NScdcBU8*f8
zkudvmIiPl~)ouoDMb<iv)$A|t7A#jS`MrdY?(Ln_S4jnYg{?wK1sUtgl7k5q#f%@(
z8}+~}>#8|FNx8_*BEn}9%9v=pZR_G?#1f;jGXg7R#$9cJBpp<lNz`Dp1L9RJcVp@=
zTrbVxQ0rP_uJ=}2T8bq&V{!V%qRAj`k?kuvH4{&7h#PrHMD$l5qz?^wsnClEt)I*}
z>{CIv!csCGW@dh;DAR2@b<YBLno$P`nGjD(>z${VmAWS~4kcgNaXT0m@1#+W66)oZ
zm6g6v&7)Sf@J`=y6e+eQO{GnJ_Y>_2FrDiH?&jen4AX5GUtz?9NDH2K8eHOU13ZMB
zEYv~?pA_K|PS-6ZewYc@V|^r*-(Pk^tUp(by7(vpJ?%(c+aBCbK4^Qj=+TicbaFlP
z&21&wh-ejgy65p!X9w2ObJNvaU=+sOpl88@S)ianAa0evXkS?|U@>1aCP07)SzSE?
z$7<Ie`bg+`jo2yllC-R>dsG81)6mwQ`rbr686|1_^;e6F#E0J}&K50grWFBKB@>%=
zI^MO5C0}lgZnrdqEOfvRZ+%#(*=S~i;t)JKJ*HZPriH`Edf0%4nz^tsFVH#=rv+uT
z*U9P5E+4~6phM#!N7-B9%fvf-fbwJ&`DiFK=ysyRE@Dzq+Y1^I?MaM@j*iVRJ~+_d
z>-H*b!V(`|;!W#G(ANeJ9JujpHtJVSJH~P#<Ktq}vhvCp$M+q}D>hmY_{@44g;O<3
zGO$1cjw}w{qDQSX5)KZbh?8P;AZh=Zit=70=w)!7Lp|)^Z1BDQJ1?aLMz<`TkR`;s
z&Ju=UNjcRI#XWFYFvF6>bX9Tp9cy`Ix>$GA)|T?9!+=DZpMe(^5z-VzqazU6(w71o
z@G;(eE#rSs7DdIgF`Rbf(n_mvc-Z}kdp#;=grn4Gr=bvMVLR1w_MWN^tf%J$!v%x=
z3{Clt_UovpQ`#M(d4?;t^t0#9^P0&PRqd4T-xH&A_DCEWqSnOB$F9w1`M99GzmMj9
zU55E?s}>B~RxGFwWL2aZX({zRtIB#nC&-k62<met4tTYiJJZ$gc+@<b22sh^Qfi9I
zluzwBb18d;E*f+%S>GA@wjdQ2(gFlOHu$*NN|w5mS8gos(WloWuzpwo1N&m=24Fv@
z<{d2=UhW|k_uM&QSbC86`HCRX;p&X|>n14cn+`=Q^Ju%B*6UgvX94?)6LQjjP<{$3
zW^XfckgD8EOSgJROcZi2pe44+a_>{A_Xoh+l+n;%1iLgPzW4~dc*)GkQ(HAIk)F=y
z;=EJ?gf0UfB6&XWCpF2BUz3^=wwLYpL-7+W)l_|&+COn7M9|vqOL2q0S?-fu?Sp=v
z`{!w%AARKD_7EA#eTzYl!@k-)Z0&93Wv|SCxx&QHUvk+NIHh<gTX=D;DEX`B;*ky+
z%~?{~uBQQF_p3Yh8k1PP7pQ6nL<Ya*HTr#}YQc>0f0*L)^3E%DnsblO3JUp>P|qyv
zI&c4lmY(bW-bK4&`ErVAl{Aq`1{GklXr;LNWWop5bsBWD4Y*}t*EOlhbZ&3Wrxj$v
zX29aenhuxQeH8Rva<@II$yxvy$^F?zz4H(s9ZO593n5G)_;tL#NNPy&z5Z1lWZz7x
zSO_78>k=PujAn?}&NAbPVz(5$h?h$8n(=txj2Rx&%>y>c)PanQ<=5{@zOBG4Gy#QV
zG`8mYl@6~u<L!iW4h|eQF&}*0qAPj{xH>-P4}_av;ONjYF9~Zr_mmm}r4!^XXp|Xu
zJ-~aXZ3U;kfi&)ki&^Pm918M{muycZjgfPpWLT*8m9|{4Gn42UM}Ir6%B|pAhq!@`
z*Sk|3H@c{CZ3aN+qPi{+8c0dhU)#u<tlXqm$?MMxSkdZYC+0hs$}H8QNP$;SLKPqy
zW%L(aw_`iwTPrJzmS<#?^3>IN_Nr;ohZ|)!qvagwzEjd$o*%)9!Ec{ln)%erYnj<J
z*J@sh_3Ox<y?Bw(NW}h;TNJjI%M+MLUi?}h@iq%nbo{y3%zP|3O(z>49l8Y_rE*Iz
zbkn)pw*=T2#DNX067uc0$T^3d`I?ukw?kf&jC!TP+$3sDIGYrELT}dKfm7QjZ|s>o
z{0|q0ohGw=pr)Z}?^AuJp7*#%Un>u0u65rdGx4gjUC9<O5d4^*0Ph{HpBE}KFuaj7
z^?fD^CLpOi|MKF};oNkzN<Syisc;?^ZNl_D%XWQU`rR40Y3kS$kWQU1p;lZFY*Yt=
zGR2rH>yO@nDfS_5WTw$Wo&Lez^>Z}M!lcGqkv^QckeDNgM~mIv#F|t0?mcENI&tYE
z%h3{h-#`%?e$6JLMm>o{W#w{w!du<Nv|y;H;%kr8?XB>Pj1-Q=5PgiR1|Vny-3@OA
zv@lCs?_CCg9Y$D(>d3yoTQ6^EWl?Qn1{EAQ<?s>Z;FGa($X}@>RXX}XJ5CpfRwbe3
zJ#ne5-5J$?WXeKvnJElWptK;U)`LbXYQo&HGi^y*-w48YP?Z%vDeA$AU&R?IMO_zQ
z?P$^lqb-QDgnI&g?$QY)NC+FMXfAo2jstXy_0i15;+0r2&x{kCUkI<vK9j=-GzG|a
z#k#2Aq%^{unIU+`)vK5L=<Eh|)p>0JQCO_cY)4MdzjbgiNQKGWx%zq=tXHBVcSn(t
zVCOS@zFT3HAF38gvOU*IW9$St_WhYxosv8rcx0z~YWT6A$pn;_O`#?g#J@3VNL`PA
z8B!?3!yI#e*RRd4rywSBy@9AsHJkD+DMPCoPmiL%rcxVKtZ?vFBnPt!W%bF>xq(`m
z%PT6YF&!4p%gmSE7JsYVjCtuwmuKgxba8#|byi1CA1<~F_u<n4Rhqx<>%7Mvpr;9G
zr|x}Yuk6~P=weE9xsA4%cM4gK{%vNTO!~`yPyd)jg)`bh2#`p$)lFz)SwOuEdIl!Y
zbjR$SCxn7sztu*IU?odq4qCw6?{loaqk30yl7`dozb+3IKIG8WmMkW8NU{}SX^~CU
zhhCv>hzcr9jV3G9GeBN5M*biUVIRwtY9Xgyj<<2-zDgSTu8Z1kZ!C@*F!ZEaJ!TwT
zu%lwsjI+Dpk+m5mTa7Q>AWO7LtVb>V4?PZ^K3oi6-=3;ld{!R)KCF#`?g`?7ztm$W
z6nYU|Vlg=57YMq=6g>7Z^M2fkj&!jtV<Qid$)kJ3Th2lK$nsESF=r;y?V%b(N12$L
ztfPBc5q|+d<v9na@z`SE9VUY)%bh#QZMCgcuAZV<f{ucdaq7t%&XRgy^oL9+S{lqC
zQ@0Qw4Hd07=-;q$7XiKZ1?KuLIeX=ZJ#ebLjq2%&jD9O>6*B5tz;P2(x-HM2nUjOi
zh_4SGeOo@{q|h>dCPDU{OSjb~=_}p`wuJD&Cm-eI9ju&>45qG9cwg#kN}amATUFsv
zQB>}_;pe^dO*b)hw(+G+Olss+*1=LZ@`22YR_FLQGXwvK=(nkW)$Un#!d2p|MC-S2
z-yT#O+H|+P<#Iy?q8UG31e42btb1&rt<f{kv*ZEtGBXZSHg9`~%&Tb&FV3#fer;^L
z6*v#P>wH||T4^4&;TYt+>dN#@+nXUV-dIVg8Zc|m?@wtB^jgk|q+A~5M`x-8?N15t
zwYj>Q0^>J(I81og#?adufabYHO_3NJnM<nujlM7`iER>t?wWUaxnV>qXJuhAEy1yV
z=G2^V$r~bq$$v?&khl>kV+EE`L5VDe=z1N<eyI%+!Q9bwQrZa^9Uc-cc5B&s2}hM|
zMSc{Yt-Ci}EYU1EWfIy0uDU08N15RJ-;-6W<<yqDQv-V;FZa62h}05Eeh#@^ku-Ve
z3EWwI-qPvF!z6BPwZDXiwdeMK6gM}9o0j<M+RC)Qzqs>&@UHgKbs<C$iaofODoYyr
zw5~C%@8PPq9V@AEM?GR8ASqF4NF=(qi)ze%`c-F%tP;=B4HG(v>~IkQrCk(^&BgAz
z4-F?rLpShz&}`4QMndMn<LP#tYs<yLfGhWK-MhcHHw!q81%ksQ_5^`L3090T72i?;
zbZ%eoXf?&eLsa2(X+ttHqh{-%B}^?eB04HHwPIEK)Rb(=LX3F1(M1lCLxq+x7we7c
zysAV%<2_k@2AHBZF4FK<uDFTu-0Fcm=f75aZ4Lc#_{wHOC4FB6Dlc+0Qt<QD#m<h$
znp*s8bzJNsDg)qJ_?J9^ORrh#MZU1|b2x^~^&+RdgeYc%TRL{U@Sc5yI3IF@$ehX=
zM<L@Ul-iFO_XVzkx~$YvR|jR9C5K?D9x@(Z>7m%kK6!^!Yv8BCW}?{Lr9*m&u<o}z
zVQm-CxM{PQdNSIcg7qTgs+Cg5mhz)<M<*=7zE18a&8Zg4Mk^|w#v2HJ3&d`%p7Pde
z*TCkuphsZ`SF>iX8^oot9C@)BKciFuqR5_gSlAuC`118GgSfi3zrriI2`c=|>WeL6
zM?lwAASa5`j%-U=h=5bHXhePE2L%eFtWyz{PT8rVrXhyf=%R91G-sFV%WKLAreTZI
zL2Q6Cdr7P5AtxerxR0U)ZDm6|+DQX*j3&4O9bV5TrWE2mY-H<mBk#78xy1khlr(DJ
zc6xE}`JSv=2cvPyqFKMQ4}@DYlXyH6a`M1y;^NYqdQ*Hrcz37E?f+BRTSrCtg<YVd
zBB-RIgfN7J0wUd|k|H4>E#2KUq=F1TQo2F9L8M~{Y3UY*l<v+U?iu{PyS{b*yR7BF
zEN9+0?>SHGXFvN)qqgm?sL<dJO?1MVyFZb|<HHiXL%0pKU(8q}b&XCP^Pu}rD;|*v
zQ23p4-7<+zPS$gs1_7o;*WWMSs=5G7U!;zhI^+-9k3GXBGihj-FS%-uJN<-vD0$@|
zBlWm%cU9zC9WWr}gQiF4#|W>lh(dhr=wbr#AZfZE#VBwip40kmmA+-0&YxZu>gto~
zzkk7fEOxn3Wv!%fo(wSm5m39#FD@Q#*q83@?;Z_I|MdeS^bI;kNJxz>kTrQp!0Tk5
z{eXDI0<e%r291Y<Htv*UbxQRQ9(C^wGquU@&XbD+SF5b4%u%d;Fn<|xj@0zZNfdDp
zw+Gm;J-~)9j<E7e%yROH7MRfd65C2%%|kCPyyqY;&I%%oirHqajE{{a+c&ejW4E)S
zvNqFSv|rP|7WIIry}(djzUd?upivR&{H|jAJ<6;qI>W^}A2>tpLebrqftGg70zr=S
zIk-%=GF_pgMnQz>#aqRnVshV^i6%x<iP*$%*BoH!#Y^+hdY5NhlvLKiofyy<EXKj&
zucgrSmD!m`DSvennR#0V&{&<j$dQdG9yxcS__!B44BMjwW%$#wG7VR;3*53$>iK8(
zq3nY<xMlRl=eOI7)G#04zBk$>K6c2UfVx1P|5B2nu%T4P_nnT(m4Auq$x9Oz#U<w{
zvHNWuHY0-3)kiX2-=4SPB~Y&31Yow>6{YL!B7t!Wq`*c7Z6{ej&XafNy@AtwE0A_O
zfc3JjuLp;&n1$i@&z+eKv%{g>ue4l?UTL}(&64H^Pt~`(<%iNFWMyd{l|F-OBiRpq
z(M#}mf1R}Eta=GzsU=CalQ4xLOHg6o%Te<BCkxuori)8jBxWAC^Pi(K7S7-nc1>ya
z^f?S7HWLBA{AoQ4JK5-OcYLpLn>n%IZKi39FD8qbEy;>485?sM+t6*>re==gwV9dv
zQ7>T;Rj+l4Y4IQDC`b7NwB;QTh3~A%)Crg+a%9O$AGjw6m#-y&WEKrk6i@J~+USH?
zBZRb+vO^JO-y|Lh_Tf+#7t}g_w~xhB*&Z8Qw{N`FYK?t)IN*u!y(AA85zg!WUNa?R
zExg-wiU-B{fkDtPFgUw2{p?Z|ITRsBM~`E=yg5LmuH!Je1Y54kA+G9{Nqki|o#yJE
z&OYQ26(7TqP7%UUGo=M{zQlLzC-!<_X4!|}=jnfCVjrx1WsrD&?tgO9Yc2oLYv!kt
z6Z;Xaa=t~OqJ?J0I$6QU0zaydpN;wup$}Z%q|Qv1IPr6)3DOBlimGM|<(X&peSAK4
z<opmSjI@k4*ZInAIfgFM`2M<*@r;vM3sohh)S;ob-uA>~CilC|CqPPFakV5lIyv?o
z6thuUdjbg{{LJwm6Dg=d{rcYXAv!$8V6vrrzjowXWA^g0my-+rYI3sGZx-7ZG#vKC
zvz!m05+Y&{5=zi$`dVs)f=k<pR}otli9A2*>jQg;x?yFV9Qv);)wxf;g<XTx0Z@03
zuk$L3-b9q=xuW7kuCyl(^Ha30Jpn`~M6WIX-l2r&@rm2vl{++_e~2)=zpQ2PgK_OA
zw8cu}yTx{DRK|2$v_p5!)J8;WZDw%LyIt*kV2$#gtZ(&{md5pd#`!^Ff0EPLGBZ+H
zNlC;wtPT`>^NaH$yO%sKOCF1`W&YYtGd1TUN*NfmcXm3y+J6-tBc}a1Y6AZOs1$-?
z(Y@aL@y+ifGM_|_k5nHXSE?KxB~!A>k?-JL65Gk_dRNQ<u+8guL>1S2&D;7ihRuEI
za$l7t<!EPUpXaDx){BM~K|yi!m5u;qU*DeP;!^pQjs)xXD%RJ~F=rJTEVMIEAJAh>
zO0Q$G&+aSAvokB{VriFs?k;*ou1JqjqIL<AF0Z;PELhE{UCpO<5do3LVpkao2Q+y0
z>EhTewyKiL^s+l_y=uezd*$)m<zMS6_|<D`Q&wTj#Dw!hIgGpb8S~1A_UN{gd-0R`
z3!=h&_j5$C>SRG5wG&)#)dP0kX(I9zhYSrzhK@y{5MEBQ$zw&7?#&Ca@>U--6ZhO<
z<=LOm5DhHr^uO<ZVddq1=sA!rEb^v6<k=TV??$_aH4`qkeD*#A#LMrMW8C9NmvWF?
zNbb}`$2hLLhFs566cwdi(+Sx0aY9AL1PhTAg;PaZ?%bG<Is1-Q!^T7N)C(t(0_f88
zZTIW$*^dA%q?8SDkIpt)!QEhEsixvsEGfv!;_(^Z#-)g5ac1PUcFfMo3Lpo`Yg4XS
zzRgGT_A~6ciZFe7$?u;RKDy>RF)=YYDn+%otB*_%XZxKtEkCrjuo<ay=U&%c+E(IF
z#O=_v=}@~*0eHJTza%AKq5B6hYrm%6FUrVapB@kA82NEaRUDxTxdL0~^oaO-ynKK@
z!CS2EL&&|X+WZA!F!!`1tBLOmI{t8%0-=Z;_wiRwN2wv79MK57RbCaPVzhGyLkHIF
z8}}(m?|K!`V-lUT8L+-kn4K*=r;VqxPL_YT;%{=e!jn39xGC71;+B_fvJzi>FrQq*
zSZ?7MH|ij!v1`h<T38?eOQO4VYXC(1<>p~yFLr+3PDT9^YR%7X&k7V3O%2JfpgU|^
z#Dj}J<%P1sK52pS$k5>Wz8-G!gOA{eQe5t7cy5rLh#%P<CsPUvFKXk_NLt8M)l8@4
zu1&c8mgz@dKo;+?{E^?E&9u~zE*&AsObq<0?#vWlZ9H_XEY10_Nw39|xpy8LdS#rq
z@A7DTeB=Jw{i!b(oR>$jI~>V&j2}}x%zdpj%RYg=qKthKq+-2jVwIn9vnYVpv6x&^
zd8VzwNH=)Qu83YuYWS17B9W-0EBCEh%TkV)J8vXWyA5|B!IVAPcc~WFL(fxc=s$6&
zRa6~Wcu#c7Et8SGMIyt6=#&T*BLICAw!0CQi$HL!hZX^}Q0R0Z?AKK_7;TMmR+h}L
z!I2R%TOs%k^5m=4t>zf|+1NTQ>%dMlKhqCB$dYUwd-kBcd0>2F5Vcbgwz?=AvA!-U
z(rT{vra2cO3A*IY`%Y2=Y7I89b<VX1{FQOrKu0Yd-&;+r;SVDFU$Mf*t3N6cp6lrr
zVIGlptS;REOAP}Ge2bCMx^CA9XJ8_OFESZ%oS=Y#9kz}-yf|lu?XMAMELWdz<EIRO
z;3i}L4|dD0HWzoTue}JWyB0^43*Tt&Tkguu!6cwXK<?&9XccLyCc#S1|EDNByW#tk
zs>{i1Dfy|)!L2o3r)Srf9U1zAO->s@lAM~O0eAERW(yj$!}uqC9qNyc+&*dyJ^a~r
zM>C<<%N9*c00dDIQrxoDZT6HSW7<jNIh;!=I^LgP+{w_$*xYz~mDoY#bbtmO^$&ht
zXogdej;{PD|G}Dh;{Df8pgI+P>;-+WzoPe{pcx;_NiwW^df^eo<1zosn{@WbIrmU>
zAu@&lr<9R-?cTZPSjxT2`y;;;DD=5jL+dEe>@W;GO3+kJyBMZG`Q>SPK8=vM`Gf7t
zN^bXY<X#)HyV-@3j4aV51LXW_oTFS%@k;q82&Ovt9e-$UZ8cLqFsktPirI@67k{|t
zRZ-!z4xWy+7;Xh@(|arw1|T3N(W!3gcYTI+e;0hOpTjcCs*{7#lp(i4BRm23Jc<73
zw9t2O(l?$nrKLo&39H|j+aE@x>6#=&Co;il>{YP5chdlMh%$J)Pz9LTb2yx0)Ida=
z?4i}8(8<K@W8N&<tQT~2+?`evlq3D{!GZkj^GJUYcC>|kEftSjYW`s8;}smwIm{I{
z<#4CN&oHNusP2TefbVdtoD-)p6TdA|-fG~8$J6NJx}bA|QvQbZMIfNd(LI~gH?}VR
z$<85qPU0&XBY1~sqDU?)Yr+@BC-?^%m2O{_ru>8sb@uCyt=y_^04W)nW?W_V`2b$&
z`ZmSD9#!$XZ*iu|(u#rlFUP(M%X=3G{}`Zl8{ezmZZBCay;diS5ywCRBRfqgm?p3d
zlLE;dz@5im=}_!<@Vay=_V|dBuI;_4yKWE;3&lvQYH>6jZEpELFhgM|6lePFXE+|F
zjdMz?SOK|nP9d9#x2(T;Wf2E6^UL5|Y84aMW`~8-5?3m=`l+eS&WOSFf@knx(jynn
zJ8AvY?=SyLNP1FlkiIU}9{>|LM`h9bLbP2Dc|{8#NpO&q7xwt8jgI48d-+au>s57h
z>bd;ZFFh4zAcu<<_Kl2<xiNZpoM6dg82wQ`17ZR#qG7N*y}*C`W?Z=X6qQO@nWii(
ze>i>o9k*hA;~=+qMksxSFR7o`XOAg{9zr1JTc!r64XNJGhH1^>x<8J5#CmSq+O83m
z6lX~SkbQ)#bpHb@0W>=yF_6YRya7!SIUB)5|C0q=VZeYvCnEK3HGpoq!DAQ|t!$3!
zQv`6wBL&gi;6j|1f&5VJgG;tMcv)HRLPBUnW|;7tnFQQjsoO2%<_CRyH10Na%&KBr
zL8y9uyF{=4l>g*5vvhem^JRaeJZ;wG2aJ!NR-iwBe%EMs+_Zqp(TbCaM>U?5G{2xE
zEbyefHha5%{)1eO=)t~mij%s!o4DAqK8F6<6IH(pHjUe>;z6Xgo#7)neWBs9*wbLD
zA6I(O3BaAH>a^PDbJGt+kB+NbYwr3SG}M85?!0r4;nmgrWAm!2qk=kj-PV2!&|L_s
znIDu$9{er|`Nk#SUr<z}1gLFE72+0iYBe4;5pO@43{R4~B0ebAE0w-Eo%mr)qK9ZU
zB%wvzbY?%30A)hGH*S*10qhEkF9Y4-f6EzO(eILe`NbBb%<F$Z#XA3j%7*l9(KnN(
z^uzMZha$$F(*qm)!J(IZW6r~rkI`&js?DB2Su%gM55h@=IUMRmL=%Ogs3!t|EM#P4
zy#AZ+J+GRCy0L_W+5=Pw(Im&vPAJ*l$68;}!rP-Grk_^jSZ*+?0Ef*cy&A2CmR}!W
z4{PhNBm~RNzYObX@LIb@koc<?sz{s>6qHhtw@mdI7n$2wbJZueMSed$4ZmctF<-|$
ztu;>V-FE@!LSK?tN}%Fw0TDh?6c);_E0$KWu#hNm{>qA_ktoWR^V555?CALL=4SRl
zmC#>bd`w`MUuFF}zJq)GkMNNs3IF-++7$I$d=?I9LlK~6+!%}rdn*!^M%_R=8Pd^4
zDd4L1BnySxk>}zP;_;^C^{4kX9l4mHA4+=XZPF0S=aDea>4Nqu7i3ff`vvJP5_uaN
z`rJJDBzh}7_QtIH?W=yE=)CXw{kcp-rd&Ch7jCVVwUzrBmklpFUz&OPcaI);=m%`W
zG{j^^hiq6&tDm2qh!<50Aqo{@A@_m`i$HhvM?gqOh*f!|XciVu<M-R@X&$sk<fTLl
zgcUA9RbA5yF@_3C)9;*~;y~|r5EKAajxQZA;^GqvzTUk{?VWT^*p3Q?3fixi?Kh82
z`?nOHPutOKZn5sLS(>vJ^X*~MG;{;FuZIW54++jUz``R-8Q|eMO{F%kPNQivi&S8d
zoE}`r=QVL=&X@q*#4So68jMF7@nTpt0pp0;8>gzfTCxO8;u?23ZwP1$L1@<Z?lwFk
z+-&ipKzJ^v(v(p`z^bzU0oe^2xTQN19iLQ=q47cZV<qnbVL5)~_P*O~Q(AI>BicJS
zDR>EEy^k|AHuTGiY4=D&&<KZ#W_+93sSI<aXUgdRu5c>CLjrP*JFi>wUtA8@{*k)8
zzn}+g*;@L6G%(z2Jp+#Tu-ZI~LS$zj#Pg$P)t{bDN)OSzv5`FWD{%GZ#opT5dl-nt
z7irZ3qcCnM=<)X+?7l_yp_FJ6()40u%P#Ndp=dAS@Iq%Fg+er9ni!!TKwA=P7}*Am
zpZdI{N3rL~@70v#4W2mQWH+xlY^-nanZE6uxAmi&i)Su3aVA%x6inBS)wDZ42s5w<
z)>7;r5b;G&q{b%7u6_X5may@(%?-onH9BZ~hGB3%^;&(&-Bh`x+loIpA8iXl|0X~q
z98a`d?0)$DDJoE5=$gNGwh#y9Fz!gJ>&VK$L{MEK#=hf~vM17?+=-+hzL~pHAT05J
zu3;U!Ga2fKvGI-aIrmsPNsv?LbJ$h!g7ep$?-!Hl&xo*bN^N@{a}RwzK2F53c-lw6
zlyh*=FD99|=dj61YJCqKQa&tdU5p(j9Bp{pG0^y{N3Jsz^T(KvdYBBA(go%n1T+no
zJWU(t13L>9KJ5iJhz5>p)r&+^`FXgvFWxBrOKV6Xdjcy$U;_TX^#{5KH|((vyNf0q
zHcheR-|!)zgV5D;R4;bto%>K@YPat!)~)@eb=~!`Gy^ODu3*jg!-+Ev$lzt2K0kk2
zM);~s2cEID=vseYl||B`%<Y!j_uyY8CQa;%wRk4`69}47<rY*hn!ob;W3B+qLka;E
z#f6T=RZ}N7ktUNoEs7qPH1v2&Dgyv`n{NkCQs9LA2^;cHx66?5;~HKE*XTwKJQyF^
zq6FU;UE7j!#uWCNo@ad}Xv5C;ne2C$o_C`Q-BGDygdl}qL2QfVJ#FzdxEFS3Kfkdo
zY~}C59ZLP^1lX}jXJJ*S)4$`8Ucm(VUjBkg%S*}x?*-mY7UiAbz=kTGKKQ-1bq^18
z6|l^DgBo7<rk@wD&^-wRlr5%7wLd__fQT1d3P{=1KrNTMQVJ>j$9M+G#_Pwx#kH&B
zxS-z)<9`Z2yx^alR4#QfRl4xMjeyb+7d!Fw1ePUk$mehW*`xNBn|hTIk9|8;j^9bq
z@^#v(uT@=rSjPz=85xqbQtfIA5+DX5#e(fWc1Cgn-gkF7R2k%*HJ*@JDCneic(49w
z>l`MlU#Y&HR_y)6+Og7bPN-<Ev5H&+v#7{@PaFuZgigA1aqzgPRh4NJNe6_D17#j3
zXXnu04*28i3lVPkYG=g}debJr^RVZHY`WoMo{SksYKL-zn+wK4ui#1Li%RS26_w#g
zSfZA6^5dLy{;FBjhSU2}VToi;{L&QQ@;o#2Sf5@f3v`j5JD=}+o~&71AIekX6O{>1
z0^+RsSWmo0m7XtXV|D)Xc?Gci_zQBfGs=|UjEv|$1;9JoVqnH~i+iBT0!JEs+Te&F
zJWs>J7F2!vwkMA|utyC|1=amz4szAD8GO%U`oj}<_?N{+Y0~)5U-7~uXRK!q<nF;6
ztJ|?OUCi2YtoLhn#6ma)aMBF)-h6)byMG)jtC@Mf7c}L9rMmX}*V|O_F|sO4(!tAA
zWXrcjTT_s^sK<f|wfP3p#zM)?PD)$nk8vS8Q=b<PM%zS6lR4<LK?E6bk31!=9_~gL
zL3DeVCThEF?<pzyMupQE8UHC)&EOEs*<Q7Cs;uaqml3v^)m5-og9&Um>YR8kF}<lN
z3EDq!0v02g7}AGJ?sRn2;uQ?KL$F5BSFj46n3m?pOws6Q*f~$*U?o)G%RYb06W$(U
z&JCv;QTw;Evt(+rlIG@xJWYu*3n=S7q{qWsBy7e2=^o_QKq~7ie$>`l(lXH9B}NYF
z^0(Q<5n(4qCl-KHgslpLR#K2UdcqFp;b{B<Opdl6sk{9^z38Ojh*@Z#@|wEi9$ZW-
zDz(HSDDc<*4CiUy63ILH#Cgh-Kermk-$?~1NMy@ajJ8{Jk3a>A4Y2SJ#4*t0u*u|I
z^%3!Ewk3yuvYtcS$nZS1&HP?j0Ny*W_|`2gcs#r$+G?7e!JXrx3_U=cPT_ev?-Q7R
z5)~DkJEos$p^s*~+N8qF|J>bd!4+x&P+*bBe%AOBUhe?oyBLydrjN#klOxkc+H(y-
z|C3OEW1~~YewCOW%+LiSS*Bjan%TTPddR@kUHnJw;NwG+0n&&l_Wkjv_YqL_`1o2U
z5)L+8%uw}PDXk(1=dFMg6ISCOX?xzo)fW5>5EJ=(AOSUa4;e}L61SoqaZeJTg2Ijk
z-fK;HY~^6wnn)C;x_LPu5X}j}cymKE_Mu%{;OQTn^}0?_y1q*FcGL29V`G0Hb+W@a
z+H=8|5XZJw?|FHtXjKs<G+GR@Cea2PIEOmT<*UM%Lf?a8wE5R7pcX1cPZbeg7cwGG
zUYppWrKQrpY=c>H2ao47Mi`p!j4ycjp-G5k{?okybepeq)i%YR9S@s>>j8UCc6)vX
zSNjj*;_;=i?Y~uRe7AjcLA|$$A@w?kN#<H;()n`2HCNKJC@O`>28K%6zWOHI7*SM*
zd-AoQipK2T^HG3dN0eK)_&<cF>o(3vQhM>uMNimhRhWy3*7^S`R7tnrx#bjWTdV1?
z%mpQ0q>m#Ci``+2MlKPdZ7_zGenju#Y(^27^H2fTR$FgTtKe+IL>!({lGFerxm5PQ
zE5r;HP!QgMh@oM215KR9%^Obxf?A1zLGa6ZAl(Jj(O7BUY`D*!$IQZFdV+(0Fk`Gb
z$B#=#VVF$^eWVofj^LbQ6CP7iG8i2rHz5fC4gquP3>{oFxoNxa`K&e4G#|(6aJ*#P
z*#_lzLL3|9uz|-j<1(!0y5etb;IxehsE+sCXKE~;@MHU_r@siV09*NdhNp3@O7>SN
z!S}`!{x}4=9cG7>cjI1ZN_6!1G2;ak=Y|4WCDi93YN-Wzh)UfWYtVXr^P7cohRCje
zaLYcC$SSokOu;yNX9h2}`&7)b+F+r7sidl9(~#xQ^LcR6Td61@n;^WnrY`{W*X%G5
zV7S>^l}28@e8KA3o3?7S=NX(((*3Yd8>4KdW=4B<nuPFqdwvadA1A>mRH!eO+UL80
z-D^mWV`be@-F3)?-V>BdwE5&$;uj8+hN&p#6pXg^+R^b9KAY5zA*P^}i^$^tFk3$Q
zXBcjPhA;1se$P>5#ow*F<---?p#7s~B>OK~I*WmcLkZo<Kh`6gSZS$Xva(C8i{r@F
zq+7p?*1Z6%^ZcR$B_QSjumU}7@`#T{io@Cs1)Qb`a^nt5lboG_c`2!Hbsf9}TZ}XG
z=*Xr?va<0aLB(@#Soj3@u<eDDe*HRGZ9kIO0QxOw=K_ggFgf++Nfu?k?i!u2$xr*b
z`r+Jcldn0+puZi%2=-@1lDB;QH*3lv+9HYSpeA$4V~r~W5U;9^8#N!5cl>NaZ4U<h
z2i+yD<``O7+Gg8caz!nTzo5V(U`N;bqJahM?MOL!-nk}t?Gk-;%UAFDo6WUvJ;cfa
zdh7)Xw1EBY-lVj9{wV+UzLa6*w)hVdKX!g&PiCA|sh_|9vK71VJMRXp(c+@vBUbCJ
zS>^m%gLZ7{)(-mQD&6lTIzFQFf0}9h`>kxX!c9xfx?>(rd(~rvW=rfCVm3HdR$x`c
zwnVLLifjRFgb(^|ALmrtAp@*TFgF*l?}F(H36ASErfV}DYRy!-{;9znSkX$B;(9kx
zz1h~Y$R$@fv!JM87?^ztN6NHURACsvcpN<}GthGxfWP7zPd&W+1S|S26(;h8cWC(0
z=&S`-ed_qQjlLRa>&Jq`t(jW!B=`Ovrp$RqNN@Vq{wF<c&WrZHsKo+q436Uws8I25
zMEfwFs<MO^${N|=DOT0r(|K?5!Qw+`pNxOcC{!RVa0uV`Dz4Wlgr4Dr0%=~Jw3FP&
zMx^Uj!eyOwd=Z*Z1-U(M6Bo@zFHu>|t8Nh7xSub|nSwCfc-5jEWh<8^@QH?*iV|P6
zptkN;8Npl)NNDtVg&ba|WnIx)+~DX<AL>i37k<E{zzyMau?$93J<s+~&9nQH7dVx^
z4}2dDBUS7#0gF*nHYN)EqgrBPLZY}er<$Yob6F3&n~C<J8l+}k$6+n}XE1?Q@p3v%
z7t*U|Th8Lv3TIN-olrc<57`?bhPV~WN{jyaKxd)US5gMPOX>!u%a=;+dpFS|Q}5C9
zip%KnJKKA!moIWjo-ATUPOuCeRkW8;gk%e4Wzp1L{<^qeqi{qFQ<B|Ze(Q5}yY)&d
z>lWpKP2p_oVKwAeXxpt@!3^jromZ?7`>Jusw#~jvbE-}#xbYaT*q7Dn7$+4~z?fO{
z&@oi|Cddg_t_?fV#w$y+17{bV>9$kJy*xmor`@u4!p;E+aPv-^a}T2}r^WHHd<O4B
ziGseWKv=WOIXUxAt60qR+i7JJg+vKC=z-L&DhSwsDTHC$itz6}SaF%#ZnRVd<;uV^
zWFK;Tnr?JVN_`@H(BEBJq9MDrhfUBz*`n->7E*WpQ)~VTrQyBlw;q=K4N#9-dpIYA
z`TM3`ov1s}T})%KGN$>`gBEA>BkCT=d+k(NSzw5?*4nq5Z5w@_p9NaJ-u_(`8ON94
zEth^;Cj<o$ObP=HBBOq}t%mvzx)jOUw+YtI)Lmk8aLuVG8l$*TDR=(#tXKp2cmD~$
zU>;2aicyZvDGxpYcm|lIC|b0PBEX2z>P9NY+4+n;Cgee7$nuLmd2<v~34TE*8Tz<B
z50O{DH)^jOEIhV1wj<2*GdGh4-MuQDoM=)Qc_N50ra+Gix7CDx?GQ}M^D>W{w`}~m
ziAFI|pJs745fKCRjNUo#*Kr*}JA@T_o%`6O*IZ>vS8b_WMaP~_>F8`gjiVRIlUH1F
z?HAu?;U7N|iwM!ITm{0Gl8<xqLzVN_{}4_do@+2`{*-1asp&pE7f-EKU=gX<{)qb!
z609l{j}6KA4n}KOr-=zacqaYx6Tlh;H~DaQ3}{FmHHqS{iBNhvwhHn3!agNWUbJgm
zuCC}P$QIeTw@p~p{yn$godYmC0GLRi#ukC6Oe%O;x;>wsFbF|6xGe|n;0ryD`sJz<
zI<CC#oeGn3Ke6GdmuoNYN^mz5#u97~2H_CrZFF&r8BC6Ra3L+1MZGgmN?M94i>+nK
zcUr;((^G}_{P;x}3Gk!Qa;itDop{W!FH9_aTwj?9dWF3XzMh}8%Y*1fN6G+QF&xyt
zE>;|+6ws?~td(9j#olpvFh-C$I0W<w;FNA+z>~L}S2s@Y1|(>BU{&(gh0Ndu-{+a$
zN`8QfOr3Yd1ZE@sH`xYHeDM}R-+8DmPSH~<5zmXgA6R%@$c4Q++%S^uRB-tSXaH=s
z8WjfH3d1_=b=OH}Lq8$Yzs_LwV<+OCoSeMJ>i%``iT|zOV}=ol3^>sJRn7vO6rxnr
z>Q<B5z{K|0^+or_x~0o73CW}Ep1VHx(5d_yXYI6>qH<Og;ol{eFKiCcw93%+n4-oO
z+w06=SH6h;E5fL`Z-ry?BFpW}ni5>LIOr#=Rr#ZHrD5uVFWX5FJyjrnAG<22e<ulx
zlMd6Pre;T|=;)=_)WfeeVD5yA_RmSTMYOHFP{J-%f_FRvL&{zVzX7l2zYj6qHH@?H
zfi@~I>|$c|$ID|dM4d@c|J=MSz1id@DOmsafEp&S;ku6XrCyQ6jVmgANe%LU3JPc~
z3ZoLZe|D_x#MTOAMIOC!DnH6A^L#y4jj=WJB*_hysIkuJK<k}kc|Yf>v3qM8FD7+H
zWMDSuYQ~x`!XRofcr?uW%C*xZ?`a^9OTFnIBwO^rjW9WhtaYp=uw<F(^3%DzzUd43
z54yG@e*V1EI2+2HmsTm?8zQt$8K7jDbeSRK{LZ<p&HZ|GnlOp*Bs*rH&*zCjh;lHO
z`nI;&aB7vQjk=i_BCKPBQ5mTFZWbPNw4lutl5gZzFbAjxzxFdL7Rl4{_Cg-=1M}hO
zo|)Z#U{VP}01FRt;TKz;@-Xk5s@U&Yd@4j1L!_T+{GLx&%xg~A4sTe{?0a%Dz35L8
z{(1-6RQ(og03r7MHv%gvD#B7tO_<~rrYf_%)FEEo`bH$IR^s{$UYoPfLx@@)>-?l@
zxO26o;k0!L+A-x43u`kv_y%qTlL5;0Yd^+`O3i3@d>{e3{c49GAGEJzv~BsXyJ{H?
z_?ySOIdlX)L|t)JjTK~%omlFEuYd>#@~r(>RU4nz6=Oq;PmM9u&pE9*JBA-xQV<NZ
z0&;Q58M?@)Zj4mt1Bxt#>dKZh0(d9_Mbk)*%w6d;b-pQcKqO?rG=eSVIpvEuKg$f`
zV56fkfBS~hFLa@zU5E{*^fqfstA=6P6A0CV@(~_j_q`RD54#c^-Zf<R_1!-=$dv2E
znItFxvq+hoVX%kvF11-$VE#~mcYlw$;me3qG92A0KfDA;`0|&U$f!6=CDl4j_(^K!
z8y^P{1f<nw%us~&tVLEVo?AR~uI{UI4-|dGZ*I<%@fQ&|5?=vY$v)e4hg%MdUL)Qf
zuq1n||MaYrTb*y5E$nmV!NnlK_{KACGv<`435`!%@YVOcv^eRWx6Lh3THoY#_g2ku
zA<Ium3C;E1p*NP{e?oztZGK${{3j_-cxllBH%=Y1pVFUG8eeKRNjY4;i?()`KU38f
z{EJG6h$cJKd#^b={T)r~_bTBbk%qY=g2;|*vto>An->SdhjP7V|86?tX#@O=YO1(q
z?QJR$`(DPr5A~tULONTlZ<5RQ#Bpw-q#UJ4Nt-FNj~0i?9Q&sW79IIzN@C}Bts^+y
z*3VF68};)US?barJm<4z0653{1X;i=Q>Fe(M?YbTK?M=eb`wPuH^HA}%X~BL3y=9k
zS5)6s_oS!?_x!*d6lPAmcB>Z$11igL%+BvBHn$D^=O2;l-N=swh8O5i|AC$jxD1{)
zXa&1r-kygVFL?`v1+l~m*GQb7I?WKCb}1o1A^@a5IcWQ>rv3G|JgUTENRkoiw`cp3
zR`ZGw9E>xO4DmJOalr7rrakN8nf;*JG0`~W3}k`}t_@9}5WMjI+QqRVHSCb}hqr5i
z&$~O3tTuAd`!q*#WXxGk?FUAKy6^)iMcBs%5q{$m=>Q%I#pP|iFF23|$(KrgG>Sl_
zG?Sv<3L$(Je>Z{6BqG$qRnhyrS9_GwhPZ=)AdYTa$Eupe=u5e7+DYbg&r<BtMzV{q
zPOg@cQi-?gswC_pXZGpf<>nt!A<=?tLsEG4vVWvU)h!aqv^xP*M;*u`S|PHgA3X@e
z&t}wT>D^03VY|eiUa{PJxB4xU*?T5!=W5Q*^B{GH^4L@CJ<y6WBJ&IFtHi@ogDgBi
zZySJPn@P)b{rf%6Nq;;GpOOcD9=}CoRSr#53T#<i==v8Ct}AEZ)){eN#<C}y21#j6
z%2#=Gc^aay91%v$*thMTT@`hIC`s@v8Txx6T=34&Qtaawd|eNRR!{>x6u>V2R7tso
zYlZ~s11OQ;(3DUhTPvOX?H#c6=tkbg9<xX;Cza6otFN(`11<A>s70@{4s6k@`s)=F
ziz9Fd1q%z4*Pk;gDwOa&7s7Mhbc{(4?WGitnrX<ZZ_L1|UFo~m)w(fJNq@abgRg|m
zzF!|6|5t$BvOlGBYEWw3u+<H8S{DmDL|iPa)<$%uQQtySbHfr&mVSQi2BP8{_Minv
zcPi~0IV4?e`wKR1P{+dGJ`xq9^u}3aq-}PXmR9Z}EqqeoZ6ihd9^p|fs=<562oU;4
zL%O+K`eb?$tg2ic8;%!Z$yXQW&Q`8@yf6Fd)abJfNyZ$=Gj1v$5CU01<z0CqHKumJ
zU=RA#U#ISP@_5_VcpcOcw;XHCc$R$JX;9^-pNTbkuR^+AApEiIGq&!<SG??dSU#(`
z<aj0#{hpCSnVV);<BO{sTr(~QxZ--aPy_M$=`;{>olT8z*cU9%J&aj_ux_I@AQXV4
zs97H!Hh8irG>u=$FRc%LZSj=>;%K_ZQ}=)vW_6?LM{Y|qcQ^^qPlAfSr-pOZHgF2G
zUi_s!h|dRw&jw*L-6oH^jbmlbV}e#BG+VSlcnT3Kfo2**#NMs4t}S)yta`(ygjIDn
z^gorAe~2t&H{FF4)h~lgCA7sIKewy`h}!`!Z(w*9gh1Jz_><|M?r<Sl>44a^U}fLo
z1<ZBI2Kz>ei`bpPT`!rg9<HsW7oI53Js#pFSM&}>V)1uXwJob{mMsq`LO<W?+KRyx
z{A{Dj!aUMOtbm;FPcCRMuHM<5@%;z1L(*GDCiwh0RE!Lz_x8N}m22qay>&$k`lcu@
z_Afab{!3Jy$=NLYl!}6BStCwjw>TgDyZN|LdzsYv#@LK;p~I$m(r?Bq%j<okJO`Mk
zKXm&Z9q1_|XCjeH*=gvk1`^&M9#I%<7U{X27{@4^^kSI79`$KP1J9d7h14qby2m6c
z`klgAe6}GthBE%sZJRtB{dPvQb9;Rl=g{S`5IMUEG3SE;)6p_TejiWhqR3`X!h?2Z
zdjNeuyqci?Q3Ne%cq592Um)p{U{-pjUeHUat1q`?ObLPJe;Y<EZ)731{ZR-O1(od|
z=y_tlkfmA&Xtq}d`NU$=-J8`VKgXIt@3Q~6F(|B{%EYyTyrFVKSRr#mxHPFr?-4KF
zj!@?hMhLIyOR%R_IE%Y;=zK#nAl)FWcOEP@ANG4+a{;|$(~UkTMyLbul5Cn!AW6P}
zDIH)7I!Bbyie6@G5!2Sfw2T1RF|oeBaKSep3!bt&5SEeY+9l&f4|0tjcA4_O`{*8-
z;J`V_%Ib3bH2V5l(!#-y%8~aGIc(D%-(s2f9tDTP{?Qz<_d1X5#hD9B**z-sXj7e&
z;1&gjMAOT%?=0E6e5JQdA{D&afr||OwrIBw=?E;?8JhLj)@xDE@53Q~9D2vc26Xei
z#^4~+;9`*dsezdP6@a9}b$xp+*m$*6!oVS<)aYfs6=#MP&^{jl%-ZGP+rt|Vd2hPA
z6?!cJKOxX<ZguCtdVYUGb7!b0>C@%PwQzc0abK?WNdeJpVf461d%25m)6GUbB!s~#
zRI!;O|1FoP)YSE!z<)i7eZ0PRefr<kfk{|yW<BTnq`R?PgLT8P*YIS>8|EX~$-Q+l
z46vIAxXdVc=vsqlN9Ma*I7R2CZ<=i1r$*&npU1*0&U%^8&p718#7iX4GjTli*R*Oa
z^%P!@mk58%N-n8yeyMzuS*>!j8AOoxf$T4-58|(K1d}*ABWBhr{uP9Mlz3!Op*I}#
zaH3tEl=OU~vG)D=C-qEx;d`6h?z3L<S;(0M$X%Z_KfIu?5)dD$D86YA(`XrX@l*>(
z7++sB$<BahYJ)saNwvC#j#|OrBJa?EN-dRYF_)>I(!|6`uO5YkM4!u;>+&P{%MV6*
zK7w5L6nP&aiUT@{AY$|xFuXdgpKbBu7S**vdL=8Yp3Hgiu(<=B;T)TW_ZB>bqp4M2
zMLY~;eh)xFwICtuYeG^y!`dddBmH~X-Ub`@IRs*|ZcE5t>1O)0ORn0|C*l`H)E9h{
zT(pqx9l3MjC3`aM))-jzq`(zP1QmAXH4LlLm1}rF{Dje4uE9QMg;DsOwA9a2OOdjH
zH*+^GCzvlZ$`Is$Kz5Ek0UoODVu(}39!an>5RzK0&g1phcr>+eIP}CN_ps#=R9GeN
zJo2aon=_I<ij6_(%wfMmSMIZY&eHF2SJ-dl=UX;*h{2cD_y21@5u!GT0Ga+=6Nb+`
zpr2&lew`T~C){PLV;|wRy6S-1x&I$%2#g1NVthwX!g7$zLLc<WdmcqZ3G@n7Y<=N7
z6E1PE7Kp2mwU2oBJ)T?qsKcC(^_K1_FaQK*^oAtxP(RlLSg5e7;iv;n$Hl~%$>n(J
zYn>8FMemZw21f`Huo2Pv@x$93ihM6_au0(b1tEB&HXZ}NziLQ!gEqq}W7D*jml!}H
z9ptUi!Cva}QunAFt4&2Xwkg8&t%zEVkJ?NTk8d_DOOH`_SkstikAgip5-oUJG@BXn
z=x^_rIa**{GH=}+f3V-wbad`rsk(f}Yj4LV;bGFNs~pxD)zxWOZ~h%4w0CilyZO~{
zbmz1X#X8@`ssmY78uOSSjzo8P4ac%f1kFTtpL12Hhtv)Z+Fs3(8;f_du`LUcrrh#Z
zJ;R0GS+<HJU~xJTTd_z4(Nn|KANwqMVJ+Vw+jP<Evr+wDH!9$BoSOAJDWRES*JX-F
z$F6X-<|K6i4P4_&cCuq4hR+Li@-yEtIwlNShn_!QL%*?^MzN!17H)PE_$kAxPV#}`
zpy)ay0gwBjciL*o-`EKnzIn{T%+F$rBW>FXBnO%Qw%pYn0aa><!n2v}MyaU<Jy&Ha
z%oaEcw=V!`|JyWkV5y@w5kuV!%|gK7Qz#qTmFm+S1HGoEw;euqny{A6vkliDDp+Wv
zrrX1skTANiNBQD>s$7Q(6EhgeKK3-ZByV1<L;ddJ3cvmL|9B{xa?^lLV!9vA%(YYQ
z_&rMwgP@_*g{$4N6Pc67i$sJ+03`S+ASzHvV<?uq5t8(=GGnj!q5h(D!pgqxS((7v
zkqE`eMK}FM0+~r_<4%?@>@p0?ZQ&+<8xo7;;_vatNOpssnvBI5Tk%pGD2lNVoDSPG
z<c;eH=2}>%6akbYUu32j{T5^=yV-Y0rU&%Wa3NIsaYYgo_h9_Dt#aq5d!FggEr(}W
zj^B??CS*U=#Md1`3%o!E9nv>}Mit!nK`uk@WCZukZeYPk!lhg0{J#cc%BgQgV(RHP
z&bbxUQxc}(Wz3P7JMC8Qmj5kO9f~u`bAz-vL4r!x$Vx-7#S(htri?=&#w8C7p%3D!
zGA4HO0qum7;>J<b#uwds*vStDeuVbaU~gE$IIU>B?GM*KLu<i?q7(9&S5{$4Yf0s;
zOLfl7xd&E)k9Ut$SZUY7o{p59tfX$w<ltz>2{r_Hrro;_s62*pX!GV>v2fXNiiNw3
zxf(;cLKE;By-zKd5pN{YipoM3h#>w<{(!gjYJ7@QQ^a%0S<7MA@@b2o!nBXc>m0Zm
zsb%Tdu*HWTXETK=*ITRaRhhtw_74Kh7r&O<`(J&do!*T<Lq8ZZf;+%BNT<d)d9CiA
zQt}(6Ww)?cB)JLHo&$~tnu?&Xp?OkY*zf6CnsVNs%-PObjbh%%V0C8fdsS0w#?m6<
z!F@n&DuGHMi+e>3@u%cJeS`Hn&e0icdSZiEy2P3l@=qX>JKtO**~J(OdPw+Q3$9Le
zFz)Y(iE`Jn4%LK^IHLo*#~BHsSD%}HiCL117Rn&o<;jl8Hg__?R0M{DRfQyZ>KN<K
zuwGCs=DC@q&c%`AVLZkoP##4u;o#%}J$rj3lBMmO^e-V;=GmWnI343QEsAsg=lc?I
z$y0cJ31ppJ6$L?+f{|R?8BQ`X#Ren8fEYoB=MKyrn9=JvDRb=;Rx4W$C+|yd75;ck
z%;LoHboJ%^y(@Um5#H&xgt?h%`aeTt@czAM<WNqEh_7;LNBZYmfS<pImsj!GS&%2-
zOmn3*Hy{bHE72eqTMmFB`v(Sh?t5S|1zn^XhCScIJ4nF`qs=%+#lXN)LIZII!3u0{
zjkj4IRS9Gkt4u0JZ2lL~ra$BC88OdK{u1YglR@Ip<E6fHBvpC~17EX#WKc#E&mXTb
z=(a|%D3%cPe@=Gw=l(*Z!MicYTgiIgJO}v-@rdin)u6p(-lzE%X0Ornvgyyr2d#~|
zVo@Tu+fsxvBsRON)|9hbrt(pR;I_rAIm-i|*+WR&R(}j&LI}b&f&;q@Xyt8mPaeu^
z!5<}G!Bue8g2#7Ec~zLMRBkujyIFYQc~@#h#yW!6_1#z|>Vfxljq_U#^CsB6OiBa)
z3;%m3ZzX`sol?%0^+w{P-F%fbZ{r8J70mnY=_7n{?gEb@Xzvo#2CwsJJWWvh?}jtS
z>U>l?1;%{H?{MVc_(+pE&<RV0E@hRx5zrO+jRdXNX()m?b&n7wpF!mqeP?Rpwwr$a
z18lm{n1WaGxpZAIRBf%&o`{8lEz7-`@okqU`@9RDT<}nPf`8Y+ol%R|rTKw^Q1_dy
zT!b72rH)lBXR|jmoTurGLSuBpUa9|I#Dy})QzlJ)*`aQ@hHDw1>=EH2zWw=XZ_t`e
zg@KLkdngrdD=C)njSp&nx67NqsXpwP^0EU%O~$&^b%SiOqwCk?JHk5~OS^vzs~^;;
z&jB%7K1Ws*FGS2>^_%#5SoF(Va>a{rFDke~FOR{HkrUodr2k{^QzN=6#kVmWLXZij
zNx<fS0-agjPBM4U;sbCQmYb3s>J`CT$I>Z_xD;L;D(bXh)4aB<%CG*}E!IT-af4Vv
zQ8iy0K3Q|hmf@B5R#&*n-EtEBFEairY!*)-7)PjhdazTVi>^!j4wT47>x&81k6!bm
zV`mK5r71Fk9=4%+yQcVWufK`{7>j1~POW0MhN)HV6S>t2-kObdh!|nR#Qtrde>;_4
zRi#V+0I|{8Ac|A;Z*7WzGN0a?8anN#0pXA59IMCF7}(k}`eI5)CEn#l(6v94hnz9d
z|M&0tK|GRh$a?g-NCYSEG_tJF22IMt+GUWf?eE?Zz665lQa@?W8|n*+d|{vq1z2?8
zg~%sd00%9MZUQXAyY<N$g8dxa+$IU)KQWFcqfIZycXk^@$xXo)YG`oqaUP%JM~>xw
zei6r3=@<;N?@YU>gl~EZCI!#eRT;uulJGu!W+l^bGTeECcLV7)ojT7UJcUK!wCc%3
zM=lt`hQIaqh_tJ?#at3)I`4U?Da(9$OlU*C3c^v|&YP9Ip!wc260EgoVXp3#`xW}M
z@;Y-Tu@S}!l4X*fh`|Ypt~|vg*;{bDg5m1eg*kT=Z_~~9zGZ^k^$Z6Z@i@^uyujJ?
z?q9;Pm-!`u4e9%FBsOm@UVm>}u#4d8I%z1b#2ck7Sem=-^TE?(7z09}6}l;q`^s1E
zbt%LCD-vG6XO`~ik5eCewk_l-z5LmV;dNR4t{p+{K0DL$`QH|v@jb@sfyumw(e+AY
zFMqy(sZfNuxK_O`u_=|dV`xAYfZArb=i_g8{%!Z0KJa-O<v8DV@YqDeTir@CUwm64
zOi(l~`nP^~#PCb=Vo<zR0UAl)9-Bhpv=c+Y?tFOls_nNxW%O!08|<ERj#K<$o8z@w
zR`p04zN&P}iwVN^nIDYr3m@|gRzvYOvwd#XJ0$fOaoI30?4BS_5#(R4JJ;mHX=iVU
zU-pz-g)3^@u%C5jiB-e)A%sA%ln6Tnc>CM}gs9|iJhOH|%AmU%bST<9_W(k6^`e<k
zMB>IXn>c05sR6jMIw7rQ{*EV@iFgfF@)uAHA65@Idf*VhXS`-j0Bm)N6I8naS3y#P
ziI%nPoL3<9Q+uP;EC;T9myr!=sfA{yQGG%ykSi3H^&*k;L2Zn59wQvAixY+Pnueuf
za!@$ORt7ARy53(6{y28CZW`pFP+hhggA2K>WUPn`|F)*}*e16E`co?MC-Xyv4!s}|
z#J#x>+#Q_Y=x8T!??KrN-aF|8?)qI_`EN;)5<IqQv{|?`7qo^_rT;Y`Gr-LMpM~O|
zzqxgS>s?co1A~*|+Nec}S1Ke)@Ccch4llq2XBsU-^S~2FRqmt#EC{$zpR{$$je$3j
z;@c4>INrG*HI7$hG7=Mv6q2k~s~q}%ylB@=h>G#2SE0NKZ*{Bj>Z|&9i7$BJQM_)e
z6;R(J=-M!|-qyU7qxAj0G?DRY!<_*}8h7p4uFtp8aYB<Vu+@_X=K}ty$Q;eb2GNV8
z=R_tV2nh+^2OUb!HT{nSmFz>{%Fq(te1C%q@)u}-1qp5q_rw|<8dyYOi>TNyYxs{M
z*;wbc+@x%!@1zV^l{)Vfs<*g#y&KM|rj2}k{1kAh(O<*(IzjMEGRDv$w6O0N5oK+B
zKE3RjspmK9nKAQ7MdLX6aOA{TbMuYme$C2BUNE{BnBk9lzNDT>f?L;NF!VS`->SK2
z{)bxTq1nv5PK%pdo?H9pjI6YGsLICv&$l2MFUC;FM-bhYZYB#V)4StUjD6Mu*Fhq0
zq*LfCKH}{(Ftg22e{hPXut{?xkV!CBD7?&Iuz`2-X$7X5*3W9L{F>#5kjMg~(?l||
zVQ(>eECkNqSN@`JKHNmtHF0!Z;hgiX5##iK>JiLduKhH9^Mjdu%PskU^>Bj@iQzS<
zX8W5j5N;pdWorR_BD)Guar5I&e`VRuh({6dYw{stl55fp^9@#9?VH$@>fUj^vEbL@
zX@;y`=*&pDZ=z5$Qi*Mf0uSzR8kWr8{j6^Iw4$-hjEN}>&5VW+m^0(bGIE?%c>lUf
zH1XVAOo-xs*9=9F?Xm5j=hAs)q$)SY;<ebHD$lU_NuZ?eq!9d)Eh5MJR8v2KlbYrS
zMd*FfnGO7t(wA(C$5}W9HzuDdy}r(_V7{SRjKLz@NDKkZfeEr-9@-j)7Qzj5U;l2H
zN{{1R7_Z%GYh*2aa5Fh=4|sYQ-F}KQ3^UVc+qArN1ro*KQ{I!Gf*uVA!<D1Y)<$ok
z9U6qX+y+H4JW<Gw{qpDYFpmdQeh&T`>a<zLZY-2tm-KQGL$XA-EOU#E0CNKU`HZdU
zkaiA!^@YsMZhga2^H$NKzmb_yI1KIU$tvS9ygyN8?eB++S+632tG7S~dC%iwqK99%
z+^N!Oby~Ll2)aj@*@Z319kM+a6Zg`n@7rHXnmS60LQVs-;6h_3a_`L0e+w)?!C^Hw
zGz!W-C9-!rNYNy${)eEN=Gfbyzt2e;Q+{r_#{r)3vrmOzxj|`q#dmyWu=Vg`R%Xum
zRH|pGIJAPoi6?CPKql2f!MxZFDmig1^w)+IBE}5@L|yWAryAJ}0a~-MeUdgh^HvTG
zTo(tqiWjIy3%rA)V`)`+3;(8oeFZ1yn(z25+mubkJK|4Jn)jBc@Q)KpnMrSh%uHd4
zNB<C~01wGy=uq>?Z=h$BEv>{-8f;pzpJr_bK=o+0pOe9<Cs-woEiiHjfw;aIC|A!4
zyIw+NJEfG*M_#6)hK)5xR$@Z8cl|DE)U1Yp+$C11?@sg@@cQ+3;446b0<yYAe4P#)
zRm-LN0doRp_oIFO(E1I7DBiA9H<f58JM<AII$(o5`$)z0h@+(P1)swrQw*6^P4~-e
z0KBKYbJwP^y@{p>DnLLeLyQ-diLKiDLQj7eyTbu|{_-uri?y#?Bp!6!q`v{q9r#c#
zXv1TR*yY*B8LcC8xOoXqA>yPCae4nHnH_MpM)~aOrGjIxdaqoA3rlGz6`h)&5E=Dw
z;gj23=+SWe!wgx+&=WXRm7Hs8M=Fx2Fi;^_`ROX<OpI5WxY8?jo%cz3b~ooFS!m7}
zUGx)S&|*|0q_LP9aOY)T*5J(P6tvx(ERX)*Pj#aq$t!q>mv4u76>NO;Ub#OFM}K+^
z)4hMzY%X|CPo*_E>J@W6mjs*Ll}TPg*)Q<l_y6a=ljipP8|T8QnQNy#a+PPKgXsHt
z@X3vkCj|eVCP^3=p$p8gMVz(20-pF4zw7$ayRduiNGeZIM_bK`8r-b**SoCv6tPpJ
z8F6YmILd6Lip`8c*{Ao(v1XZu>&U8xI>ENc>f4_Vnec($^t}<k!;e~?s0u(i!6_M@
zX55<H94s^<qBBXDrQ{-qupXoLxhIKu4HJB%m?>TbkW91_czw?oF7gj$gb+l`f#ix1
zZ2O$_Uv%4BCJ4lzSnz4$QM*H;W1B3cQaT62_ohAYZe(bH_Ua03!~F(Cmb!+`8ENk{
zy$&MQelJCgjE>pygJ}R97z9Tg0Mz5D$V~rr{#2Bv$OHQSIT36695@V_va*WZ*pjl*
zlga(WSc#90Hwgj6_IF)k<+?A=Of;?MZhIZfg)r#qR+B67dqN20%NCdr{9dcMAb2yy
zfj~eG<ugF_Kd1Y5(*J!$I~~Z4>w$n_YSS>igMLqqj)lPwFc|;uE86NnZfwv0zM?%l
z<i@}M?<;z!z|a4EMXv?O&58iOfNlQ&yrKu-f3M}=-~acD{{8*$GJH%QGO3&1MSq-H
i^#AYW=?b1+-+>5Y(rtI!cZQ>n@lIS$toW_&m;VPy1TGr@

literal 0
HcmV?d00001

diff --git a/src/assets/images/square_pattern_cosmic.svg b/src/assets/images/square_pattern_cosmic.svg
index fa11141ddc..4164957678 100644
--- a/src/assets/images/square_pattern_cosmic.svg
+++ b/src/assets/images/square_pattern_cosmic.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:none;stroke:#342e73;stroke-miterlimit:10;}</style></defs><title>Asset 2_svg</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><line class="cls-1" x1="75" x2="75" y2="150"/><line class="cls-1" x1="150" y1="75" y2="75"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:none;stroke:#1b1b38;stroke-miterlimit:10;}</style></defs><title>Asset 2_svg</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><line class="cls-1" x1="75" x2="75" y2="150"/><line class="cls-1" x1="150" y1="75" y2="75"/></g></g></svg>
diff --git a/src/index.html b/src/index.html
index 71e6750377..25af9b91a5 100644
--- a/src/index.html
+++ b/src/index.html
@@ -4,6 +4,8 @@
   <meta charset="utf-8">
   <title>ngx-admin Demo Application</title>
 
+  <base href="/">
+
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/png" href="favicon.png">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
diff --git a/src/polyfills.ts b/src/polyfills.ts
index 2ac9a6d3af..4ed2f7143c 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -1,8 +1,3 @@
-/**
- * @license
- * Copyright Akveo. All Rights Reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
- */
 /**
  * This file includes polyfills needed by Angular and is loaded before the app.
  * You can add your own extra polyfills to this file.
@@ -16,27 +11,13 @@
  * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
  * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
  *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ * Learn more in https://angular.io/guide/browser-support
  */
 
 /***************************************************************************************************
- * BROWSER POLYFILLS
- */
+* BROWSER POLYFILLS
+*/
 
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-import 'core-js/es6/symbol';
-import 'core-js/es6/object';
-import 'core-js/es6/function';
-import 'core-js/es6/parse-int';
-import 'core-js/es6/parse-float';
-import 'core-js/es6/number';
-import 'core-js/es6/math';
-import 'core-js/es6/string';
-import 'core-js/es6/date';
-import 'core-js/es6/array';
-import 'core-js/es6/regexp';
-import 'core-js/es6/map';
-import 'core-js/es6/set';
 
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 import 'classlist.js';  // Run `npm install --save classlist.js`.
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index ccb7240350..5d3e364993 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
-    "module": "es2015",
     "baseUrl": "./",
     "paths": {
       "@angular/*": [
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index 18bad40ed4..c89454bef9 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -3,8 +3,6 @@
   "compilerOptions": {
     "outDir": "../out-tsc/spec",
     "baseUrl": "./",
-    "module": "commonjs",
-    "target": "es5",
     "types": [
       "jasmine",
       "node"
diff --git a/tsconfig.json b/tsconfig.json
index 6353cdce4d..4a2135716d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,13 +2,14 @@
   "compileOnSave": false,
   "compilerOptions": {
     "importHelpers": true,
+    "module": "esnext",
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es5",
+    "target": "es2015",
     "typeRoots": [
       "node_modules/@types"
     ],
diff --git a/tslint.json b/tslint.json
index eaffd1aa29..2ffea28a19 100644
--- a/tslint.json
+++ b/tslint.json
@@ -124,10 +124,10 @@
         "message": "please don't"
       }
     ],
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
+    "no-inputs-metadata-property": true,
+    "no-outputs-metadata-property": true,
     "no-output-rename": true,
-    "use-life-cycle-interface": true,
+    "use-lifecycle-interface": true,
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
     "directive-class-suffix": true,