From a4afc2e37a16b06a701c7cf888909906ea2dfeef Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Tue, 15 May 2018 13:31:47 -0400
Subject: [PATCH] Polymer 3 modulize (#1154)

* Version bump to 20180510.1

* Fix hass util

* Fix translations

* Bye paper-time-input

* Add webpack config

* Add webpack to package.json

* Fix translation import

* Disable web animations polyfill bad import

* Disable importHref import

* Update webpack config to build authorize.js

* Build translations json

* Build frontend correctly

* Run eslint --fix

* Load markdown JS on demand (#1155)

* Add HTML imports (#1160)

* Fix localize (#1161)

* Fix Roboto in build (#1162)

* Load web animations polyfill (#1163)

* P3: Fix chart js (#1164)

* P3: Fix Chart JS

* Update timeline package

* P3: panel resolver (#1165)

* WIP

* Initial importing of panels

* Fix panel resolver

* Fix automation and script editor (#1166)

* Expose Polymer and Polymer.Element on window (#1167)

* Remove unused import

* eslint --fix

* Es5 build (#1168)

* Build for ES5

* Fix build_frontend

* Remove stale comment

* Migrate to use paper-material-styles (#1170)

* Send parsed date to history/logbook (#1171)

* Fork app storage behavior (#1172)

* Add paper input with type time (#1173)

* Fix authorize

* Lint

* Sort imports

* Lint

* Remove eslint-html

* Do not lint authorize.html

* Fix polymer lint

* Try chrome 62 for wct

* P3: Add patched iconset (#1175)

* Add patched iconset

* Lint

* Test with latest Chrome again

* Use less window.hassUtil

* Teporarily use my fecha fork

* Import correct intl.messageFormat

* Update wct-browser-legacy to 1.0.0

* Include polyfill in right place

* Fix IntlMessageFormat

* Fix test not having a global scope

* Rollup <_<

* Fork app-localize-behavior

* Disable wct tests

* Lint
---
 .eslintrc.json                                |    2 +-
 .travis.yml                                   |   15 +-
 gulp/tasks/auth.js                            |    9 +-
 gulp/tasks/build.js                           |    1 +
 gulp/tasks/gen-index-html.js                  |    3 +-
 gulp/tasks/gen-service-worker.js              |   13 +-
 gulp/tasks/translations.js                    |    3 +-
 ...sitory.html => hassio-addon-repository.js} |   48 +-
 ...addon-store.html => hassio-addon-store.js} |   34 +-
 .../hassio-repositories-editor.html           |  108 -
 .../addon-store/hassio-repositories-editor.js |   93 +
 ...addon-audio.html => hassio-addon-audio.js} |   52 +-
 ...don-config.html => hassio-addon-config.js} |   43 +-
 hassio/addon-view/hassio-addon-info.html      |  275 -
 hassio/addon-view/hassio-addon-info.js        |  225 +
 ...o-addon-logs.html => hassio-addon-logs.js} |   25 +-
 ...n-network.html => hassio-addon-network.js} |   57 +-
 hassio/addon-view/hassio-addon-view.html      |  165 -
 hassio/addon-view/hassio-addon-view.js        |  134 +
 .../{hassio-addons.html => hassio-addons.js}  |   49 +-
 hassio/dashboard/hassio-dashboard.html        |   40 -
 hassio/dashboard/hassio-dashboard.js          |   33 +
 hassio/dashboard/hassio-hass-update.html      |   93 -
 hassio/dashboard/hassio-hass-update.js        |   81 +
 hassio/{hassio-app.html => hassio-app.js}     |   27 +-
 hassio/{hassio-data.html => hassio-data.js}   |    6 +-
 hassio/hassio-main.html                       |  132 -
 hassio/hassio-main.js                         |  104 +
 ...-dialog.html => hassio-markdown-dialog.js} |   43 +-
 hassio/hassio-pages-with-tabs.html            |  163 -
 hassio/hassio-pages-with-tabs.js              |  131 +
 hassio/index.html                             |   27 +-
 ...assio-snapshot.html => hassio-snapshot.js} |   93 +-
 ...sio-snapshots.html => hassio-snapshots.js} |  100 +-
 ...sio-host-info.html => hassio-host-info.js} |   62 +-
 ...or-info.html => hassio-supervisor-info.js} |   63 +-
 ...isor-log.html => hassio-supervisor-log.js} |   25 +-
 hassio/system/hassio-system.html              |   54 -
 hassio/system/hassio-system.js                |   45 +
 index.html                                    |   12 +-
 package.json                                  |   91 +-
 ...on-editor.html => ha-automation-editor.js} |  100 +-
 ...on-picker.html => ha-automation-picker.js} |   87 +-
 ...utomation.html => ha-config-automation.js} |   53 +-
 ...ccount.html => ha-config-cloud-account.js} |   91 +-
 ...tml => ha-config-cloud-forgot-password.js} |   50 +-
 ...ud-login.html => ha-config-cloud-login.js} |  110 +-
 ...ister.html => ha-config-cloud-register.js} |   86 +-
 panels/config/cloud/ha-config-cloud.html      |  133 -
 panels/config/cloud/ha-config-cloud.js        |  109 +
 ...nfig-entries.html => ha-config-entries.js} |  102 +-
 ...{ha-config-flow.html => ha-config-flow.js} |   90 +-
 panels/config/core/ha-config-core.html        |  121 -
 panels/config/core/ha-config-core.js          |  103 +
 ...on-core.html => ha-config-section-core.js} |  122 +-
 .../ha-config-section-push-notifications.html |   59 -
 .../ha-config-section-push-notifications.js   |   54 +
 ...hemes.html => ha-config-section-themes.js} |   54 +-
 ....html => ha-config-section-translation.js} |   65 +-
 .../config/customize/ha-config-customize.html |   93 -
 .../config/customize/ha-config-customize.js   |   84 +
 ...tribute.html => ha-customize-attribute.js} |   34 +-
 .../ha-form-customize-attributes.html         |   36 -
 .../customize/ha-form-customize-attributes.js |   33 +
 ...rm-customize.html => ha-form-customize.js} |   53 +-
 ...omize-array.html => ha-customize-array.js} |   38 +-
 .../customize/types/ha-customize-boolean.html |   29 -
 .../customize/types/ha-customize-boolean.js   |   25 +
 .../customize/types/ha-customize-icon.html    |   42 -
 .../customize/types/ha-customize-icon.js      |   37 +
 .../types/ha-customize-key-value.html         |   45 -
 .../customize/types/ha-customize-key-value.js |   37 +
 .../customize/types/ha-customize-string.html  |   32 -
 .../customize/types/ha-customize-string.js    |   28 +
 .../dashboard/ha-config-cloud-menu.html       |   54 -
 .../config/dashboard/ha-config-cloud-menu.js  |   53 +
 .../config/dashboard/ha-config-dashboard.html |   83 -
 .../config/dashboard/ha-config-dashboard.js   |   71 +
 .../dashboard/ha-config-entries-menu.html     |   49 -
 .../dashboard/ha-config-entries-menu.js       |   48 +
 ...avigation.html => ha-config-navigation.js} |   69 +-
 panels/config/ha-config-js.html               |    1 -
 panels/config/ha-config-js.js                 |    1 +
 ...nfig-section.html => ha-config-section.js} |   28 +-
 ...entity-config.html => ha-entity-config.js} |   74 +-
 .../{ha-form-style.html => ha-form-style.js}  |    9 +-
 ...a-panel-config.html => ha-panel-config.js} |   40 +-
 ...config-script.html => ha-config-script.js} |   53 +-
 ...script-editor.html => ha-script-editor.js} |   93 +-
 panels/config/script/ha-script-picker.html    |  150 -
 panels/config/script/ha-script-picker.js      |  137 +
 panels/config/zwave/ha-config-zwave.html      |  618 --
 panels/config/zwave/ha-config-zwave.js        |  477 ++
 .../{zwave-groups.html => zwave-groups.js}    |   77 +-
 .../zwave/{zwave-log.html => zwave-log.js}    |   43 +-
 panels/config/zwave/zwave-network.html        |  204 -
 panels/config/zwave/zwave-network.js          |  120 +
 ...-node-config.html => zwave-node-config.js} |  108 +-
 ...rmation.html => zwave-node-information.js} |   34 +-
 ...wave-usercodes.html => zwave-usercodes.js} |   69 +-
 .../{zwave-values.html => zwave-values.js}    |   56 +-
 .../{events-list.html => events-list.js}      |   21 +-
 ...l-dev-event.html => ha-panel-dev-event.js} |   46 +-
 ...nel-dev-info.html => ha-panel-dev-info.js} |   44 +-
 ...nel-dev-mqtt.html => ha-panel-dev-mqtt.js} |   37 +-
 ...v-service.html => ha-panel-dev-service.js} |   42 +-
 ...l-dev-state.html => ha-panel-dev-state.js} |   41 +-
 ...template.html => ha-panel-dev-template.js} |   39 +-
 ...a-panel-hassio.html => ha-panel-hassio.js} |   21 +-
 ...panel-history.html => ha-panel-history.js} |   64 +-
 ...a-panel-iframe.html => ha-panel-iframe.js} |   23 +-
 panels/kiosk/ha-panel-kiosk.html              |   30 -
 panels/kiosk/ha-panel-kiosk.js                |   28 +
 ...a-logbook-data.html => ha-logbook-data.js} |    6 +-
 .../{ha-logbook.html => ha-logbook.js}        |   42 +-
 ...panel-logbook.html => ha-panel-logbook.js} |   61 +-
 ...panel-mailbox.html => ha-panel-mailbox.js} |   55 +-
 ...entity-marker.html => ha-entity-marker.js} |   29 +-
 .../{ha-panel-map.html => ha-panel-map.js}    |   36 +-
 ...ng-list.html => ha-panel-shopping-list.js} |   52 +-
 polymer.json                                  |   41 +-
 script/build_frontend                         |   38 +-
 script/build_markdown                         |   45 -
 script/fingerprint_frontend.py                |   39 -
 script/update_mdi.py                          |    2 +-
 .../{ha-auth-flow.html => ha-auth-flow.js}    |   64 +-
 .../{ha-authorize.html => ha-authorize.js}    |   48 +-
 ...provider.html => ha-pick-auth-provider.js} |   37 +-
 src/authorize.html                            |   26 +-
 src/cards/ha-badges-card.html                 |   30 -
 src/cards/ha-badges-card.js                   |   29 +
 ...{ha-camera-card.html => ha-camera-card.js} |   54 +-
 ...a-card-chooser.html => ha-card-chooser.js} |   20 +-
 ...entities-card.html => ha-entities-card.js} |   51 +-
 ...aph-card.html => ha-history_graph-card.js} |   46 +-
 ...ayer-card.html => ha-media_player-card.js} |  104 +-
 ...tml => ha-persistent_notification-card.js} |   36 +-
 .../{ha-plant-card.html => ha-plant-card.js}  |   28 +-
 ...a-weather-card.html => ha-weather-card.js} |   35 +-
 ...-api-button.html => ha-call-api-button.js} |   27 +-
 ...-button.html => ha-call-service-button.js} |   25 +-
 ...ress-button.html => ha-progress-button.js} |   33 +-
 .../{domain-icon.html => domain-icon.js}      |   20 +-
 src/components/entity/ha-chart-base.html      |  542 --
 src/components/entity/ha-chart-base.js        |  540 ++
 ...entity-picker.html => ha-entity-picker.js} |   74 +-
 ...entity-toggle.html => ha-entity-toggle.js} |   31 +-
 src/components/entity/ha-state-icon.html      |   29 -
 src/components/entity/ha-state-icon.js        |   29 +
 ...bel-badge.html => ha-state-label-badge.js} |   40 +-
 .../{state-badge.html => state-badge.js}      |   27 +-
 .../entity/{state-info.html => state-info.js} |   41 +-
 .../{ha-attributes.html => ha-attributes.js}  |   32 +-
 src/components/{ha-card.html => ha-card.js}   |   33 +-
 src/components/{ha-cards.html => ha-cards.js} |  164 +-
 ...ate-control.html => ha-climate-control.js} |   22 +-
 ...climate-state.html => ha-climate-state.js} |   21 +-
 ...a-color-picker.html => ha-color-picker.js} |   37 +-
 .../{ha-combo-box.html => ha-combo-box.js}    |   53 +-
 ...ver-controls.html => ha-cover-controls.js} |   32 +-
 ...ontrols.html => ha-cover-tilt-controls.js} |   36 +-
 src/components/ha-demo-badge.html             |   27 -
 src/components/ha-demo-badge.js               |   22 +
 src/components/ha-form.html                   |  153 -
 src/components/ha-form.js                     |  121 +
 src/components/ha-iconset-svg.js              |   35 +
 ...{ha-label-badge.html => ha-label-badge.js} |   31 +-
 ...beled-slider.html => ha-labeled-slider.js} |   28 +-
 .../{ha-markdown.html => ha-markdown.js}      |   21 +-
 ...{ha-menu-button.html => ha-menu-button.js} |   25 +-
 ...a-paper-slider.html => ha-paper-slider.js} |   67 +-
 ...e.html => ha-push-notifications-toggle.js} |   25 +-
 ...relative-time.html => ha-relative-time.js} |   13 +-
 ...ription.html => ha-service-description.js} |   15 +-
 ...rvice-picker.html => ha-service-picker.js} |   29 +-
 .../{ha-sidebar.html => ha-sidebar.js}        |  133 +-
 ...e-button.html => ha-start-voice-button.js} |   25 +-
 ...rd-content.html => hassio-card-content.js} |   33 +-
 ...-line.html => state-history-chart-line.js} |   28 +-
 ...e.html => state-history-chart-timeline.js} |   27 +-
 ...ry-charts.html => state-history-charts.js} |   45 +-
 ...ory-data.html => ha-state-history-data.js} |   18 +-
 ...nfo-dialog.html => ha-more-info-dialog.js} |   48 +-
 ...dialog.html => ha-voice-command-dialog.js} |   47 +-
 ....html => more-info-alarm_control_panel.js} |   53 +-
 ...utomation.html => more-info-automation.js} |   26 +-
 ...e-info-camera.html => more-info-camera.js} |   20 +-
 ...info-climate.html => more-info-climate.js} |  164 +-
 ...gurator.html => more-info-configurator.js} |   57 +-
 ...info-content.html => more-info-content.js} |   44 +-
 ...ore-info-cover.html => more-info-cover.js} |   58 +-
 .../more-info/controls/more-info-default.html |   25 -
 .../more-info/controls/more-info-default.js   |   24 +
 .../{more-info-fan.html => more-info-fan.js}  |   66 +-
 ...ore-info-group.html => more-info-group.js} |   26 +-
 .../controls/more-info-history_graph.html     |   35 -
 .../controls/more-info-history_graph.js       |   30 +
 ...etime.html => more-info-input_datetime.js} |   87 +-
 ...ore-info-light.html => more-info-light.js} |   92 +-
 ...{more-info-lock.html => more-info-lock.js} |   31 +-
 ..._player.html => more-info-media_player.js} |  105 +-
 .../more-info/controls/more-info-script.html  |   32 -
 .../more-info/controls/more-info-script.js    |   30 +
 .../{more-info-sun.html => more-info-sun.js}  |   34 +-
 ...info-updater.html => more-info-updater.js} |   17 +-
 ...e-info-vacuum.html => more-info-vacuum.js} |   78 +-
 ...info-weather.html => more-info-weather.js} |   27 +-
 ...fo-controls.html => more-info-controls.js} |   92 +-
 ...fo-settings.html => more-info-settings.js} |   41 +-
 src/entrypoint.html                           |    1 -
 ...{home-assistant.html => home-assistant.js} |  111 +-
 .../{ha-app-layout.html => ha-app-layout.js}  |   34 +-
 src/layouts/hass-error-screen.html            |   61 -
 src/layouts/hass-error-screen.js              |   58 +
 src/layouts/hass-loading-screen.html          |   59 -
 src/layouts/hass-loading-screen.js            |   56 +
 src/layouts/hass-subpage.html                 |   42 -
 src/layouts/hass-subpage.js                   |   38 +
 src/layouts/home-assistant-main.html          |  174 -
 src/layouts/home-assistant-main.js            |  133 +
 .../{login-form.html => login-form.js}        |   59 +-
 .../{partial-cards.html => partial-cards.js}  |  146 +-
 src/layouts/partial-panel-resolver.html       |  135 -
 src/layouts/partial-panel-resolver.js         |  216 +
 ...n-manager.html => notification-manager.js} |   31 +-
 ...chart-scripts.html => ha-chart-scripts.js} |   12 +-
 ...ker-style.html => ha-date-picker-style.js} |   21 +-
 src/resources/{ha-style.html => ha-style.js}  |   27 +-
 .../{hassio-style.html => hassio-style.js}    |    9 +-
 src/resources/html-import/import-href.js      |   96 +
 src/resources/html-import/polyfill.js         |   25 +
 src/resources/load_markdown.js                |    5 +
 src/resources/panel-imports.html              |    3 -
 src/resources/panel-imports.js                |    4 +
 ...ard-climate.html => state-card-climate.js} |   26 +-
 .../state-card-configurator.html              |   49 -
 src/state-summary/state-card-configurator.js  |   46 +
 ...ard-content.html => state-card-content.js} |   35 +-
 src/state-summary/state-card-cover.html       |   54 -
 src/state-summary/state-card-cover.js         |   51 +
 ...ard-display.html => state-card-display.js} |   38 +-
 ...number.html => state-card-input_number.js} |   62 +-
 ...select.html => state-card-input_select.js} |   32 +-
 src/state-summary/state-card-input_text.html  |   89 -
 src/state-summary/state-card-input_text.js    |   73 +
 ...player.html => state-card-media_player.js} |   38 +-
 ...te-card-scene.html => state-card-scene.js} |   37 +-
 src/state-summary/state-card-script.html      |   67 -
 src/state-summary/state-card-script.js        |   64 +
 ...te-card-timer.html => state-card-timer.js} |   30 +-
 src/state-summary/state-card-toggle.html      |   42 -
 src/state-summary/state-card-toggle.js        |   39 +
 ...ard-weblink.html => state-card-weblink.js} |   21 +-
 src/util/app-localize-behavior.js             |  333 +
 src/util/app-localstorage-document.js         |  193 +
 src/util/cover-model.html                     |  121 -
 src/util/cover-model.js                       |  117 +
 ...a-pref-storage.html => ha-pref-storage.js} |    6 +-
 src/util/{ha-url-sync.html => ha-url-sync.js} |    8 +-
 ...utes-util.html => hass-attributes-util.js} |    2 -
 .../{hass-call-api.html => hass-call-api.js}  |    2 -
 src/util/hass-media-player-model.html         |  214 -
 src/util/hass-media-player-model.js           |  210 +
 src/util/{hass-mixins.html => hass-mixins.js} |   27 +-
 ...s-translation.html => hass-translation.js} |    8 +-
 src/util/hass-util.html                       |    1 -
 src/util/hass-util.js                         |    2 +
 src/util/legacy-support.js                    |    9 +
 src/util/{roboto.html => roboto.js}           |   34 +-
 test/index.html                               |    2 +-
 test/state-card-display-test.html             |   83 +-
 test/state-info-test.html                     |  137 +-
 webpack.config.js                             |   60 +
 yarn.lock                                     | 5470 ++++++++++++++---
 274 files changed, 12972 insertions(+), 10037 deletions(-)
 rename hassio/addon-store/{hassio-addon-repository.html => hassio-addon-repository.js} (52%)
 rename hassio/addon-store/{hassio-addon-store.html => hassio-addon-store.js} (65%)
 delete mode 100644 hassio/addon-store/hassio-repositories-editor.html
 create mode 100644 hassio/addon-store/hassio-repositories-editor.js
 rename hassio/addon-view/{hassio-addon-audio.html => hassio-addon-audio.js} (66%)
 rename hassio/addon-view/{hassio-addon-config.html => hassio-addon-config.js} (61%)
 delete mode 100644 hassio/addon-view/hassio-addon-info.html
 create mode 100644 hassio/addon-view/hassio-addon-info.js
 rename hassio/addon-view/{hassio-addon-logs.html => hassio-addon-logs.js} (61%)
 rename hassio/addon-view/{hassio-addon-network.html => hassio-addon-network.js} (61%)
 delete mode 100644 hassio/addon-view/hassio-addon-view.html
 create mode 100644 hassio/addon-view/hassio-addon-view.js
 rename hassio/dashboard/{hassio-addons.html => hassio-addons.js} (50%)
 delete mode 100644 hassio/dashboard/hassio-dashboard.html
 create mode 100644 hassio/dashboard/hassio-dashboard.js
 delete mode 100644 hassio/dashboard/hassio-hass-update.html
 create mode 100644 hassio/dashboard/hassio-hass-update.js
 rename hassio/{hassio-app.html => hassio-app.js} (65%)
 rename hassio/{hassio-data.html => hassio-data.js} (88%)
 delete mode 100644 hassio/hassio-main.html
 create mode 100644 hassio/hassio-main.js
 rename hassio/{hassio-markdown-dialog.html => hassio-markdown-dialog.js} (57%)
 delete mode 100644 hassio/hassio-pages-with-tabs.html
 create mode 100644 hassio/hassio-pages-with-tabs.js
 rename hassio/snapshots/{hassio-snapshot.html => hassio-snapshot.js} (69%)
 rename hassio/snapshots/{hassio-snapshots.html => hassio-snapshots.js} (65%)
 rename hassio/system/{hassio-host-info.html => hassio-host-info.js} (68%)
 rename hassio/system/{hassio-supervisor-info.html => hassio-supervisor-info.js} (64%)
 rename hassio/system/{hassio-supervisor-log.html => hassio-supervisor-log.js} (57%)
 delete mode 100644 hassio/system/hassio-system.html
 create mode 100644 hassio/system/hassio-system.js
 rename panels/config/automation/{ha-automation-editor.html => ha-automation-editor.js} (67%)
 rename panels/config/automation/{ha-automation-picker.html => ha-automation-picker.js} (51%)
 rename panels/config/automation/{ha-config-automation.html => ha-config-automation.js} (62%)
 rename panels/config/cloud/{ha-config-cloud-account.html => ha-config-cloud-account.js} (62%)
 rename panels/config/cloud/{ha-config-cloud-forgot-password.html => ha-config-cloud-forgot-password.js} (64%)
 rename panels/config/cloud/{ha-config-cloud-login.html => ha-config-cloud-login.js} (59%)
 rename panels/config/cloud/{ha-config-cloud-register.html => ha-config-cloud-register.js} (60%)
 delete mode 100644 panels/config/cloud/ha-config-cloud.html
 create mode 100644 panels/config/cloud/ha-config-cloud.js
 rename panels/config/config-entries/{ha-config-entries.html => ha-config-entries.js} (64%)
 rename panels/config/config-entries/{ha-config-flow.html => ha-config-flow.js} (63%)
 delete mode 100644 panels/config/core/ha-config-core.html
 create mode 100644 panels/config/core/ha-config-core.js
 rename panels/config/core/{ha-config-section-core.html => ha-config-section-core.js} (51%)
 delete mode 100644 panels/config/core/ha-config-section-push-notifications.html
 create mode 100644 panels/config/core/ha-config-section-push-notifications.js
 rename panels/config/core/{ha-config-section-themes.html => ha-config-section-themes.js} (63%)
 rename panels/config/core/{ha-config-section-translation.html => ha-config-section-translation.js} (62%)
 delete mode 100644 panels/config/customize/ha-config-customize.html
 create mode 100644 panels/config/customize/ha-config-customize.js
 rename panels/config/customize/{ha-customize-attribute.html => ha-customize-attribute.js} (69%)
 delete mode 100644 panels/config/customize/ha-form-customize-attributes.html
 create mode 100644 panels/config/customize/ha-form-customize-attributes.js
 rename panels/config/customize/{ha-form-customize.html => ha-form-customize.js} (86%)
 rename panels/config/customize/types/{ha-customize-array.html => ha-customize-array.js} (50%)
 delete mode 100644 panels/config/customize/types/ha-customize-boolean.html
 create mode 100644 panels/config/customize/types/ha-customize-boolean.js
 delete mode 100644 panels/config/customize/types/ha-customize-icon.html
 create mode 100644 panels/config/customize/types/ha-customize-icon.js
 delete mode 100644 panels/config/customize/types/ha-customize-key-value.html
 create mode 100644 panels/config/customize/types/ha-customize-key-value.js
 delete mode 100644 panels/config/customize/types/ha-customize-string.html
 create mode 100644 panels/config/customize/types/ha-customize-string.js
 delete mode 100644 panels/config/dashboard/ha-config-cloud-menu.html
 create mode 100644 panels/config/dashboard/ha-config-cloud-menu.js
 delete mode 100644 panels/config/dashboard/ha-config-dashboard.html
 create mode 100644 panels/config/dashboard/ha-config-dashboard.js
 delete mode 100644 panels/config/dashboard/ha-config-entries-menu.html
 create mode 100644 panels/config/dashboard/ha-config-entries-menu.js
 rename panels/config/dashboard/{ha-config-navigation.html => ha-config-navigation.js} (61%)
 delete mode 100644 panels/config/ha-config-js.html
 create mode 100644 panels/config/ha-config-js.js
 rename panels/config/{ha-config-section.html => ha-config-section.js} (77%)
 rename panels/config/{ha-entity-config.html => ha-entity-config.js} (64%)
 rename panels/config/{ha-form-style.html => ha-form-style.js} (65%)
 rename panels/config/{ha-panel-config.html => ha-panel-config.js} (78%)
 rename panels/config/script/{ha-config-script.html => ha-config-script.js} (61%)
 rename panels/config/script/{ha-script-editor.html => ha-script-editor.js} (68%)
 delete mode 100644 panels/config/script/ha-script-picker.html
 create mode 100644 panels/config/script/ha-script-picker.js
 delete mode 100644 panels/config/zwave/ha-config-zwave.html
 create mode 100644 panels/config/zwave/ha-config-zwave.js
 rename panels/config/zwave/{zwave-groups.html => zwave-groups.js} (71%)
 rename panels/config/zwave/{zwave-log.html => zwave-log.js} (53%)
 delete mode 100644 panels/config/zwave/zwave-network.html
 create mode 100644 panels/config/zwave/zwave-network.js
 rename panels/config/zwave/{zwave-node-config.html => zwave-node-config.js} (70%)
 rename panels/config/zwave/{zwave-node-information.html => zwave-node-information.js} (62%)
 rename panels/config/zwave/{zwave-usercodes.html => zwave-usercodes.js} (66%)
 rename panels/config/zwave/{zwave-values.html => zwave-values.js} (65%)
 rename panels/dev-event/{events-list.html => events-list.js} (67%)
 rename panels/dev-event/{ha-panel-dev-event.html => ha-panel-dev-event.js} (70%)
 rename panels/dev-info/{ha-panel-dev-info.html => ha-panel-dev-info.js} (86%)
 rename panels/dev-mqtt/{ha-panel-dev-mqtt.html => ha-panel-dev-mqtt.js} (64%)
 rename panels/dev-service/{ha-panel-dev-service.html => ha-panel-dev-service.js} (87%)
 rename panels/dev-state/{ha-panel-dev-state.html => ha-panel-dev-state.js} (88%)
 rename panels/dev-template/{ha-panel-dev-template.html => ha-panel-dev-template.js} (81%)
 rename panels/hassio/{ha-panel-hassio.html => ha-panel-hassio.js} (86%)
 rename panels/history/{ha-panel-history.html => ha-panel-history.js} (71%)
 rename panels/iframe/{ha-panel-iframe.html => ha-panel-iframe.js} (65%)
 delete mode 100644 panels/kiosk/ha-panel-kiosk.html
 create mode 100644 panels/kiosk/ha-panel-kiosk.js
 rename panels/logbook/{ha-logbook-data.html => ha-logbook-data.js} (91%)
 rename panels/logbook/{ha-logbook.html => ha-logbook.js} (55%)
 rename panels/logbook/{ha-panel-logbook.html => ha-panel-logbook.js} (68%)
 rename panels/mailbox/{ha-panel-mailbox.html => ha-panel-mailbox.js} (83%)
 rename panels/map/{ha-entity-marker.html => ha-entity-marker.js} (67%)
 rename panels/map/{ha-panel-map.html => ha-panel-map.js} (89%)
 rename panels/shopping-list/{ha-panel-shopping-list.html => ha-panel-shopping-list.js} (78%)
 delete mode 100755 script/build_markdown
 delete mode 100755 script/fingerprint_frontend.py
 rename src/auth/{ha-auth-flow.html => ha-auth-flow.js} (74%)
 rename src/auth/{ha-authorize.html => ha-authorize.js} (51%)
 rename src/auth/{ha-pick-auth-provider.html => ha-pick-auth-provider.js} (69%)
 delete mode 100644 src/cards/ha-badges-card.html
 create mode 100644 src/cards/ha-badges-card.js
 rename src/cards/{ha-camera-card.html => ha-camera-card.js} (76%)
 rename src/cards/{ha-card-chooser.html => ha-card-chooser.js} (79%)
 rename src/cards/{ha-entities-card.html => ha-entities-card.js} (72%)
 rename src/cards/{ha-history_graph-card.html => ha-history_graph-card.js} (68%)
 rename src/cards/{ha-media_player-card.html => ha-media_player-card.js} (73%)
 rename src/cards/{ha-persistent_notification-card.html => ha-persistent_notification-card.js} (66%)
 rename src/cards/{ha-plant-card.html => ha-plant-card.js} (79%)
 rename src/cards/{ha-weather-card.html => ha-weather-card.js} (92%)
 rename src/components/buttons/{ha-call-api-button.html => ha-call-api-button.js} (71%)
 rename src/components/buttons/{ha-call-service-button.html => ha-call-service-button.js} (71%)
 rename src/components/buttons/{ha-progress-button.html => ha-progress-button.js} (70%)
 rename src/components/{domain-icon.html => domain-icon.js} (51%)
 delete mode 100644 src/components/entity/ha-chart-base.html
 create mode 100644 src/components/entity/ha-chart-base.js
 rename src/components/entity/{ha-entity-picker.html => ha-entity-picker.js} (59%)
 rename src/components/entity/{ha-entity-toggle.html => ha-entity-toggle.js} (81%)
 delete mode 100644 src/components/entity/ha-state-icon.html
 create mode 100644 src/components/entity/ha-state-icon.js
 rename src/components/entity/{ha-state-label-badge.html => ha-state-label-badge.js} (88%)
 rename src/components/entity/{state-badge.html => state-badge.js} (80%)
 rename src/components/entity/{state-info.html => state-info.js} (53%)
 rename src/components/{ha-attributes.html => ha-attributes.js} (67%)
 rename src/components/{ha-card.html => ha-card.js} (52%)
 rename src/components/{ha-cards.html => ha-cards.js} (86%)
 rename src/components/{ha-climate-control.html => ha-climate-control.js} (86%)
 rename src/components/{ha-climate-state.html => ha-climate-state.js} (87%)
 rename src/components/{ha-color-picker.html => ha-color-picker.js} (97%)
 rename src/components/{ha-combo-box.html => ha-combo-box.js} (52%)
 rename src/components/{ha-cover-controls.html => ha-cover-controls.js} (56%)
 rename src/components/{ha-cover-tilt-controls.html => ha-cover-tilt-controls.js} (54%)
 delete mode 100644 src/components/ha-demo-badge.html
 create mode 100644 src/components/ha-demo-badge.js
 delete mode 100644 src/components/ha-form.html
 create mode 100644 src/components/ha-form.js
 create mode 100644 src/components/ha-iconset-svg.js
 rename src/components/{ha-label-badge.html => ha-label-badge.js} (81%)
 rename src/components/{ha-labeled-slider.html => ha-labeled-slider.js} (59%)
 rename src/components/{ha-markdown.html => ha-markdown.js} (77%)
 rename src/components/{ha-menu-button.html => ha-menu-button.js} (56%)
 rename src/components/{ha-paper-slider.html => ha-paper-slider.js} (52%)
 rename src/components/{ha-push-notifications-toggle.html => ha-push-notifications-toggle.js} (86%)
 rename src/components/{ha-relative-time.html => ha-relative-time.js} (76%)
 rename src/components/{ha-service-description.html => ha-service-description.js} (70%)
 rename src/components/{ha-service-picker.html => ha-service-picker.js} (66%)
 rename src/components/{ha-sidebar.html => ha-sidebar.js} (54%)
 rename src/components/{ha-start-voice-button.html => ha-start-voice-button.js} (57%)
 rename src/components/{hassio-card-content.html => hassio-card-content.js} (63%)
 rename src/components/{state-history-chart-line.html => state-history-chart-line.js} (93%)
 rename src/components/{state-history-chart-timeline.html => state-history-chart-timeline.js} (89%)
 rename src/components/{state-history-charts.html => state-history-charts.js} (53%)
 rename src/data/{ha-state-history-data.html => ha-state-history-data.js} (97%)
 rename src/dialogs/{ha-more-info-dialog.html => ha-more-info-dialog.js} (76%)
 rename src/dialogs/{ha-voice-command-dialog.html => ha-voice-command-dialog.js} (83%)
 rename src/dialogs/more-info/controls/{more-info-alarm_control_panel.html => more-info-alarm_control_panel.js} (65%)
 rename src/dialogs/more-info/controls/{more-info-automation.html => more-info-automation.js} (55%)
 rename src/dialogs/more-info/controls/{more-info-camera.html => more-info-camera.js} (75%)
 rename src/dialogs/more-info/controls/{more-info-climate.html => more-info-climate.js} (68%)
 rename src/dialogs/more-info/controls/{more-info-configurator.html => more-info-configurator.js} (54%)
 rename src/dialogs/more-info/controls/{more-info-content.html => more-info-content.js} (50%)
 rename src/dialogs/more-info/controls/{more-info-cover.html => more-info-cover.js} (59%)
 delete mode 100644 src/dialogs/more-info/controls/more-info-default.html
 create mode 100644 src/dialogs/more-info/controls/more-info-default.js
 rename src/dialogs/more-info/controls/{more-info-fan.html => more-info-fan.js} (60%)
 rename src/dialogs/more-info/controls/{more-info-group.html => more-info-group.js} (78%)
 delete mode 100644 src/dialogs/more-info/controls/more-info-history_graph.html
 create mode 100644 src/dialogs/more-info/controls/more-info-history_graph.js
 rename src/dialogs/more-info/controls/{more-info-input_datetime.html => more-info-input_datetime.js} (65%)
 rename src/dialogs/more-info/controls/{more-info-light.html => more-info-light.js} (73%)
 rename src/dialogs/more-info/controls/{more-info-lock.html => more-info-lock.js} (50%)
 rename src/dialogs/more-info/controls/{more-info-media_player.html => more-info-media_player.js} (62%)
 delete mode 100644 src/dialogs/more-info/controls/more-info-script.html
 create mode 100644 src/dialogs/more-info/controls/more-info-script.js
 rename src/dialogs/more-info/controls/{more-info-sun.html => more-info-sun.js} (60%)
 rename src/dialogs/more-info/controls/{more-info-updater.html => more-info-updater.js} (56%)
 rename src/dialogs/more-info/controls/{more-info-vacuum.html => more-info-vacuum.js} (63%)
 rename src/dialogs/more-info/controls/{more-info-weather.html => more-info-weather.js} (93%)
 rename src/dialogs/more-info/{more-info-controls.html => more-info-controls.js} (56%)
 rename src/dialogs/more-info/{more-info-settings.html => more-info-settings.js} (64%)
 delete mode 100644 src/entrypoint.html
 rename src/{home-assistant.html => home-assistant.js} (78%)
 rename src/layouts/{ha-app-layout.html => ha-app-layout.js} (84%)
 delete mode 100644 src/layouts/hass-error-screen.html
 create mode 100644 src/layouts/hass-error-screen.js
 delete mode 100644 src/layouts/hass-loading-screen.html
 create mode 100644 src/layouts/hass-loading-screen.js
 delete mode 100644 src/layouts/hass-subpage.html
 create mode 100644 src/layouts/hass-subpage.js
 delete mode 100644 src/layouts/home-assistant-main.html
 create mode 100644 src/layouts/home-assistant-main.js
 rename src/layouts/{login-form.html => login-form.js} (70%)
 rename src/layouts/{partial-cards.html => partial-cards.js} (68%)
 delete mode 100644 src/layouts/partial-panel-resolver.html
 create mode 100644 src/layouts/partial-panel-resolver.js
 rename src/managers/{notification-manager.html => notification-manager.js} (75%)
 rename src/resources/{ha-chart-scripts.html => ha-chart-scripts.js} (80%)
 rename src/resources/{ha-date-picker-style.html => ha-date-picker-style.js} (81%)
 rename src/resources/{ha-style.html => ha-style.js} (93%)
 rename src/resources/{hassio-style.html => hassio-style.js} (83%)
 create mode 100644 src/resources/html-import/import-href.js
 create mode 100644 src/resources/html-import/polyfill.js
 create mode 100644 src/resources/load_markdown.js
 delete mode 100644 src/resources/panel-imports.html
 create mode 100644 src/resources/panel-imports.js
 rename src/state-summary/{state-card-climate.html => state-card-climate.js} (51%)
 delete mode 100644 src/state-summary/state-card-configurator.html
 create mode 100644 src/state-summary/state-card-configurator.js
 rename src/state-summary/{state-card-content.html => state-card-content.js} (51%)
 delete mode 100644 src/state-summary/state-card-cover.html
 create mode 100644 src/state-summary/state-card-cover.js
 rename src/state-summary/{state-card-display.html => state-card-display.js} (56%)
 rename src/state-summary/{state-card-input_number.html => state-card-input_number.js} (63%)
 rename src/state-summary/{state-card-input_select.html => state-card-input_select.js} (63%)
 delete mode 100644 src/state-summary/state-card-input_text.html
 create mode 100644 src/state-summary/state-card-input_text.js
 rename src/state-summary/{state-card-media_player.html => state-card-media_player.js} (67%)
 rename src/state-summary/{state-card-scene.html => state-card-scene.js} (56%)
 delete mode 100644 src/state-summary/state-card-script.html
 create mode 100644 src/state-summary/state-card-script.js
 rename src/state-summary/{state-card-timer.html => state-card-timer.js} (70%)
 delete mode 100644 src/state-summary/state-card-toggle.html
 create mode 100644 src/state-summary/state-card-toggle.js
 rename src/state-summary/{state-card-weblink.html => state-card-weblink.js} (65%)
 create mode 100644 src/util/app-localize-behavior.js
 create mode 100644 src/util/app-localstorage-document.js
 delete mode 100644 src/util/cover-model.html
 create mode 100644 src/util/cover-model.js
 rename src/util/{ha-pref-storage.html => ha-pref-storage.js} (87%)
 rename src/util/{ha-url-sync.html => ha-url-sync.js} (89%)
 rename src/util/{hass-attributes-util.html => hass-attributes-util.js} (99%)
 rename src/util/{hass-call-api.html => hass-call-api.js} (99%)
 delete mode 100644 src/util/hass-media-player-model.html
 create mode 100644 src/util/hass-media-player-model.js
 rename src/util/{hass-mixins.html => hass-mixins.js} (81%)
 rename src/util/{hass-translation.html => hass-translation.js} (92%)
 delete mode 100644 src/util/hass-util.html
 create mode 100644 src/util/hass-util.js
 create mode 100644 src/util/legacy-support.js
 rename src/util/{roboto.html => roboto.js} (90%)
 create mode 100644 webpack.config.js

diff --git a/.eslintrc.json b/.eslintrc.json
index 9954ffbaba..45fe93f1fd 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,12 +1,12 @@
 {
   "extends": "./.eslintrc-hound.json",
   "plugins": [
-    "html",
     "react"
   ],
   "env": {
     "browser": true
   },
+  "parser": "babel-eslint",
   "rules": {
     "import/no-unresolved": 2,
     "linebreak-style": 0
diff --git a/.travis.yml b/.travis.yml
index 9f62314db4..03eee93e5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,24 +3,23 @@ language: node_js
 cache:
   yarn: true
   directories:
-  - bower_components
-install:
-  - yarn install
-  - ./node_modules/.bin/bower install
+    - bower_components
+install: yarn install
 script:
   - npm run build
   - npm run test
-  - xvfb-run wct
-  - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct --plugin sauce; fi
+  # - xvfb-run wct --module-resolution=node --npm
+  # - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct --module-resolution=node --npm --plugin sauce; fi'
 services:
   - docker
 before_deploy:
-  - docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21
+  - 'docker pull lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21'
 deploy:
   provider: script
   script: script/travis_deploy
-  on:
+  'on':
     branch: master
 dist: trusty
 addons:
   sauce_connect: true
+
diff --git a/gulp/tasks/auth.js b/gulp/tasks/auth.js
index 4fd417ee0e..6fa32e4289 100644
--- a/gulp/tasks/auth.js
+++ b/gulp/tasks/auth.js
@@ -1,4 +1,5 @@
 const gulp = require('gulp');
+const path = require('path');
 const replace = require('gulp-batch-replace');
 const rename = require('gulp-rename');
 
@@ -11,8 +12,12 @@ const {
 const es5Extra = "<script src='/frontend_es5/custom-elements-es5-adapter.js'></script>";
 
 async function buildAuth(es6) {
-  let stream = await bundledStreamFromHTML('src/authorize.html');
-  stream = stream.pipe(replace([['<!--EXTRA_SCRIPTS-->', es6 ? '' : es5Extra]]));
+  const frontendPath = es6 ? 'hass_frontend_latest' : 'hass_frontend_es5';
+  const stream = gulp.src(path.resolve(config.polymer_dir, 'src/authorize.html'))
+    .pipe(replace([
+      ['<!--EXTRA_SCRIPTS-->', es6 ? '' : es5Extra],
+      ['/home-assistant-polymer/build/webpack/ha-authorize.js', `/${frontendPath}/authorize.js`],
+    ]));
 
   return minifyStream(stream, /* es6= */ es6)
     .pipe(rename('authorize.html'))
diff --git a/gulp/tasks/build.js b/gulp/tasks/build.js
index cbd546755c..a2a27754ca 100644
--- a/gulp/tasks/build.js
+++ b/gulp/tasks/build.js
@@ -31,6 +31,7 @@ function renamePanel(path) {
 }
 
 function build(es6) {
+  return;
   const strategy = composeStrategies([
     generateShellMergeStrategy(polymerConfig.shell),
     stripImportsStrategy([
diff --git a/gulp/tasks/gen-index-html.js b/gulp/tasks/gen-index-html.js
index 4b91a9ac8f..c1e019a89c 100644
--- a/gulp/tasks/gen-index-html.js
+++ b/gulp/tasks/gen-index-html.js
@@ -8,8 +8,7 @@ const { minifyStream } = require('../common/transform');
 
 const buildReplaces = {
   '/home-assistant-polymer/build/core.js': 'core.js',
-  '/home-assistant-polymer/src/home-assistant.html': 'frontend.html',
-  '/home-assistant-polymer/src/resources/ha-chart-scripts.html': 'ha-chart-scripts.html',
+  '/home-assistant-polymer/build/webpack/app.js': 'app.js',
 };
 
 function generateIndex(es6) {
diff --git a/gulp/tasks/gen-service-worker.js b/gulp/tasks/gen-service-worker.js
index 241637e10f..2d3c3ba850 100755
--- a/gulp/tasks/gen-service-worker.js
+++ b/gulp/tasks/gen-service-worker.js
@@ -29,22 +29,13 @@ const staticFingerprinted = [
 
 const staticFingerprintedEs6 = [
   'core.js',
-  'frontend.html',
-  'ha-chart-scripts.html',
+  'app.js',
 ];
 
 const staticFingerprintedEs5 = [
   'compatibility.js',
   'core.js',
-  'frontend.html',
-  'ha-chart-scripts.html',
-];
-
-// These panels will always be registered inside HA and thus can
-// be safely assumed to be able to preload.
-const panelsFingerprinted = [
-  'dev-event', 'dev-info', 'dev-service', 'dev-state', 'dev-template',
-  'dev-mqtt', 'kiosk',
+  'app.js',
 ];
 
 function processStatic(fn, rootDir, urlDir) {
diff --git a/gulp/tasks/translations.js b/gulp/tasks/translations.js
index 5c09e80f7a..8399cacb71 100755
--- a/gulp/tasks/translations.js
+++ b/gulp/tasks/translations.js
@@ -248,8 +248,7 @@ gulp.task(taskName, ['build-translation-fingerprints'], function () {
       fragments: TRANSLATION_FRAGMENTS,
       translations: data,
     })))
-    .pipe(insert.wrap('<script>\nwindow.translationMetadata = ', ';\n</script>'))
-    .pipe(rename('translationMetadata.html'))
+    .pipe(rename('translationMetadata.json'))
     .pipe(gulp.dest(workDir));
 });
 tasks.push(taskName);
diff --git a/hassio/addon-store/hassio-addon-repository.html b/hassio/addon-store/hassio-addon-repository.js
similarity index 52%
rename from hassio/addon-store/hassio-addon-repository.html
rename to hassio/addon-store/hassio-addon-repository.js
index 36b9c87c3c..8e868735ad 100644
--- a/hassio/addon-store/hassio-addon-repository.html
+++ b/hassio/addon-store/hassio-addon-repository.js
@@ -1,13 +1,14 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../../src/components/hassio-card-content.js';
+import '../../src/resources/hassio-style.js';
+import '../../src/util/hass-mixins.js';
 
-<link rel='import' href='../../src/components/hassio-card-content.html'>
-<link rel='import' href='../../src/resources/hassio-style.html'>
-
-<dom-module id="hassio-addon-repository">
-  <template>
+class HassioAddonRepository extends window.hassMixins.NavigateMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style hassio-style">
       paper-card {
         cursor: pointer;
@@ -17,35 +18,27 @@
         color: var(--primary-text-color);
       }
     </style>
-    <template is='dom-if' if='[[addons.length]]'>
-      <div class='card-group'>
-        <div class='title'>
+    <template is="dom-if" if="[[addons.length]]">
+      <div class="card-group">
+        <div class="title">
           [[repo.name]]
-          <div class='description'>
+          <div class="description">
             Maintained by [[repo.maintainer]]
-            <a class='repo' href='[[repo.url]]' target='_blank'>[[repo.url]]</a>
+            <a class="repo" href="[[repo.url]]" target="_blank">[[repo.url]]</a>
           </div>
         </div>
-        <template is='dom-repeat' items='[[addons]]' as='addon' sort='sortAddons'>
-          <paper-card on-click='addonTapped'>
-            <div class='card-content'>
-              <hassio-card-content
-                title='[[addon.name]]'
-                description='[[addon.description]]'
-                icon='[[computeIcon(addon)]]'
-                icon-title='[[computeIconTitle(addon)]]'
-                icon-class='[[computeIconClass(addon)]]'
-              ></hassio-card-content>
+        <template is="dom-repeat" items="[[addons]]" as="addon" sort="sortAddons">
+          <paper-card on-click="addonTapped">
+            <div class="card-content">
+              <hassio-card-content title="[[addon.name]]" description="[[addon.description]]" icon="[[computeIcon(addon)]]" icon-title="[[computeIconTitle(addon)]]" icon-class="[[computeIconClass(addon)]]"></hassio-card-content>
             </div>
           </paper-card>
         </template>
       </div>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioAddonRepository extends window.hassMixins.NavigateMixin(Polymer.Element) {
   static get is() { return 'hassio-addon-repository'; }
 
   static get properties() {
@@ -79,4 +72,3 @@ class HassioAddonRepository extends window.hassMixins.NavigateMixin(Polymer.Elem
 }
 
 customElements.define(HassioAddonRepository.is, HassioAddonRepository);
-</script>
diff --git a/hassio/addon-store/hassio-addon-store.html b/hassio/addon-store/hassio-addon-store.js
similarity index 65%
rename from hassio/addon-store/hassio-addon-store.html
rename to hassio/addon-store/hassio-addon-store.js
index af16f17be2..4ba6738e2c 100644
--- a/hassio/addon-store/hassio-addon-store.html
+++ b/hassio/addon-store/hassio-addon-store.js
@@ -1,33 +1,26 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../../src/util/hass-mixins.js';
+import './hassio-addon-repository.js';
+import './hassio-repositories-editor.js';
 
-<link rel="import" href="./hassio-repositories-editor.html">
-<link rel="import" href="./hassio-addon-repository.html">
-
-<dom-module id="hassio-addon-store">
-  <template>
+class HassioAddonStore extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       hassio-addon-repository {
         margin-top: 24px;
       }
     </style>
-    <hassio-repositories-editor
-      hass='[[hass]]'
-      repos='[[repos]]'
-    ></hassio-repositories-editor>
+    <hassio-repositories-editor hass="[[hass]]" repos="[[repos]]"></hassio-repositories-editor>
 
-    <template is='dom-repeat' items='[[repos]]' as='repo' sort='sortRepos'>
-      <hassio-addon-repository
-        repo='[[repo]]'
-        addons='[[computeAddons(repo.slug)]]'
-      ></hassio-addon-repository>
+    <template is="dom-repeat" items="[[repos]]" as="repo" sort="sortRepos">
+      <hassio-addon-repository repo="[[repo]]" addons="[[computeAddons(repo.slug)]]"></hassio-addon-repository>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioAddonStore extends Polymer.Element {
   static get is() { return 'hassio-addon-store'; }
 
   static get properties() {
@@ -90,4 +83,3 @@ class HassioAddonStore extends Polymer.Element {
 }
 
 customElements.define(HassioAddonStore.is, HassioAddonStore);
-</script>
diff --git a/hassio/addon-store/hassio-repositories-editor.html b/hassio/addon-store/hassio-repositories-editor.html
deleted file mode 100644
index 887d4fcbdc..0000000000
--- a/hassio/addon-store/hassio-repositories-editor.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel='import' href='../../bower_components/paper-input/paper-input.html'>
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
-
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
-
-<link rel='import' href='../../src/components/hassio-card-content.html'>
-<link rel='import' href='../../src/resources/hassio-style.html'>
-
-<dom-module id="hassio-repositories-editor">
-  <template>
-    <style include="ha-style hassio-style">
-      .add {
-        padding: 12px 16px;
-      }
-      iron-icon {
-        color: var(--secondary-text-color);
-        margin-right: 16px;
-        display: inline-block;
-      }
-      paper-input {
-        width: calc(100% - 49px);
-        display: inline-block;
-      }
-    </style>
-    <div class='card-group'>
-      <div class='title'>
-        Repositories
-        <div class='description'>
-          Configure which add-on repositories to fetch data from:
-        </div>
-      </div>
-      <template id='list' is='dom-repeat' items='[[repoList]]' as='repo' sort='sortRepos'>
-        <paper-card>
-          <div class='card-content'>
-            <hassio-card-content
-              title='[[repo.name]]'
-              description='[[repo.url]]'
-              icon='mdi:github-circle'
-            ></hassio-card-content>
-          </div>
-          <div class='card-actions'>
-            <ha-call-api-button
-              hass='[[hass]]'
-              path='hassio/supervisor/options'
-              data='[[computeRemoveRepoData(repoList, repo.url)]]'
-              class='warning'
-            >Remove</ha-call-api-button>
-          </div>
-        </paper-card>
-      </template>
-      <paper-card>
-        <div class='card-content add'>
-          <iron-icon icon='mdi:github-circle'></iron-icon>
-          <paper-input label='Add new repository by URL' value='{{repoUrl}}'></paper-input>
-        </div>
-        <div class='card-actions'>
-          <ha-call-api-button
-            hass='[[hass]]'
-            path='hassio/supervisor/options'
-            data='[[computeAddRepoData(repoList, repoUrl)]]'
-          >Add</ha-call-api-button>
-        </div>
-      </paper-card>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-class HassioRepositoriesEditor extends Polymer.Element {
-  static get is() { return 'hassio-repositories-editor'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      repos: {
-        type: Array,
-        observer: 'reposChanged',
-      },
-      repoList: Array,
-      repoUrl: String,
-    };
-  }
-
-  reposChanged(repos) {
-    this.repoList = repos.filter(repo => repo.slug !== 'core' && repo.slug !== 'local');
-    this.repoUrl = '';
-  }
-
-  sortRepos(a, b) {
-    return a.name < b.name ? -1 : 1;
-  }
-
-  computeRemoveRepoData(repoList, url) {
-    const list = repoList.filter(repo => repo.url !== url).map(repo => repo.url);
-    return { addons_repositories: list };
-  }
-
-  computeAddRepoData(repoList, url) {
-    const list = repoList.map(repo => repo.url);
-    list.push(url);
-    return { addons_repositories: list };
-  }
-}
-
-customElements.define(HassioRepositoriesEditor.is, HassioRepositoriesEditor);
-</script>
diff --git a/hassio/addon-store/hassio-repositories-editor.js b/hassio/addon-store/hassio-repositories-editor.js
new file mode 100644
index 0000000000..caf902abd5
--- /dev/null
+++ b/hassio/addon-store/hassio-repositories-editor.js
@@ -0,0 +1,93 @@
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../src/components/buttons/ha-call-api-button.js';
+import '../../src/components/hassio-card-content.js';
+import '../../src/resources/hassio-style.js';
+
+class HassioRepositoriesEditor extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="ha-style hassio-style">
+      .add {
+        padding: 12px 16px;
+      }
+      iron-icon {
+        color: var(--secondary-text-color);
+        margin-right: 16px;
+        display: inline-block;
+      }
+      paper-input {
+        width: calc(100% - 49px);
+        display: inline-block;
+      }
+    </style>
+    <div class="card-group">
+      <div class="title">
+        Repositories
+        <div class="description">
+          Configure which add-on repositories to fetch data from:
+        </div>
+      </div>
+      <template id="list" is="dom-repeat" items="[[repoList]]" as="repo" sort="sortRepos">
+        <paper-card>
+          <div class="card-content">
+            <hassio-card-content title="[[repo.name]]" description="[[repo.url]]" icon="mdi:github-circle"></hassio-card-content>
+          </div>
+          <div class="card-actions">
+            <ha-call-api-button hass="[[hass]]" path="hassio/supervisor/options" data="[[computeRemoveRepoData(repoList, repo.url)]]" class="warning">Remove</ha-call-api-button>
+          </div>
+        </paper-card>
+      </template>
+      <paper-card>
+        <div class="card-content add">
+          <iron-icon icon="mdi:github-circle"></iron-icon>
+          <paper-input label="Add new repository by URL" value="{{repoUrl}}"></paper-input>
+        </div>
+        <div class="card-actions">
+          <ha-call-api-button hass="[[hass]]" path="hassio/supervisor/options" data="[[computeAddRepoData(repoList, repoUrl)]]">Add</ha-call-api-button>
+        </div>
+      </paper-card>
+    </div>
+`;
+  }
+
+  static get is() { return 'hassio-repositories-editor'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      repos: {
+        type: Array,
+        observer: 'reposChanged',
+      },
+      repoList: Array,
+      repoUrl: String,
+    };
+  }
+
+  reposChanged(repos) {
+    this.repoList = repos.filter(repo => repo.slug !== 'core' && repo.slug !== 'local');
+    this.repoUrl = '';
+  }
+
+  sortRepos(a, b) {
+    return a.name < b.name ? -1 : 1;
+  }
+
+  computeRemoveRepoData(repoList, url) {
+    const list = repoList.filter(repo => repo.url !== url).map(repo => repo.url);
+    return { addons_repositories: list };
+  }
+
+  computeAddRepoData(repoList, url) {
+    const list = repoList.map(repo => repo.url);
+    list.push(url);
+    return { addons_repositories: list };
+  }
+}
+
+customElements.define(HassioRepositoriesEditor.is, HassioRepositoriesEditor);
diff --git a/hassio/addon-view/hassio-addon-audio.html b/hassio/addon-view/hassio-addon-audio.js
similarity index 66%
rename from hassio/addon-view/hassio-addon-audio.html
rename to hassio/addon-view/hassio-addon-audio.js
index ca1d7a1d5c..892aa4e290 100644
--- a/hassio/addon-view/hassio-addon-audio.html
+++ b/hassio/addon-view/hassio-addon-audio.js
@@ -1,16 +1,19 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href='../../bower_components/neon-animation/web-animations.html'>
+import 'web-animations-js/web-animations-next-lite.min.js';
 
-<link rel='import' href='../../src/resources/ha-style.html'>
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="hassio-addon-audio">
-  <template>
+import '../../src/resources/ha-style.js';
+import '../../src/util/hass-mixins.js';
+
+class HassioAddonAudio extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="ha-style">
       :host,
       paper-card,
@@ -28,38 +31,34 @@
         text-align: right;
       }
     </style>
-    <paper-card heading='Audio'>
+    <paper-card heading="Audio">
       <div class="card-content">
-        <template is='dom-if' if='[[error]]'>
-          <div class='errors'>[[error]]</div>
+        <template is="dom-if" if="[[error]]">
+          <div class="errors">[[error]]</div>
         </template>
-        
+
         <paper-dropdown-menu label="Input">
           <paper-listbox slot="dropdown-content" attr-for-selected="device" selected="{{selectedInput}}">
-            <template is='dom-repeat' items='[[inputDevices]]'>
-              <paper-item device$="[[item.device]]">[[item.name]]</paper-item>
+            <template is="dom-repeat" items="[[inputDevices]]">
+              <paper-item device\$="[[item.device]]">[[item.name]]</paper-item>
             </template>
           </paper-listbox>
         </paper-dropdown-menu>
         <paper-dropdown-menu label="Output">
           <paper-listbox slot="dropdown-content" attr-for-selected="device" selected="{{selectedOutput}}">
-            <template is='dom-repeat' items='[[outputDevices]]'>
-              <paper-item device$="[[item.device]]">[[item.name]]</paper-item>
+            <template is="dom-repeat" items="[[outputDevices]]">
+              <paper-item device\$="[[item.device]]">[[item.name]]</paper-item>
             </template>
           </paper-listbox>
         </paper-dropdown-menu>
       </div>
       <div class="card-actions">
-        <paper-button
-          on-click='_saveSettings'
-        >Save</paper-button>
+        <paper-button on-click="_saveSettings">Save</paper-button>
       </div>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioAddonAudio extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'hassio-addon-audio'; }
 
   static get properties() {
@@ -116,4 +115,3 @@ class HassioAddonAudio extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HassioAddonAudio.is, HassioAddonAudio);
-</script>
diff --git a/hassio/addon-view/hassio-addon-config.html b/hassio/addon-view/hassio-addon-config.js
similarity index 61%
rename from hassio/addon-view/hassio-addon-config.html
rename to hassio/addon-view/hassio-addon-config.js
index a168ae48a6..943ea18de3 100644
--- a/hassio/addon-view/hassio-addon-config.html
+++ b/hassio/addon-view/hassio-addon-config.js
@@ -1,12 +1,14 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
+import '@polymer/iron-autogrow-textarea/iron-autogrow-textarea.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
+import '../../src/components/buttons/ha-call-api-button.js';
 
-<dom-module id="hassio-addon-config">
-  <template>
+class HassioAddonConfig extends PolymerElement {
+  static get template() {
+    return html`
     <style include="ha-style">
       :host {
         display: block;
@@ -30,31 +32,21 @@
         color: var(--google-red-500);
       }
     </style>
-    <paper-card heading='Config'>
+    <paper-card heading="Config">
       <div class="card-content">
-        <template is='dom-if' if='[[error]]'>
-          <div class='errors'>[[error]]</div>
+        <template is="dom-if" if="[[error]]">
+          <div class="errors">[[error]]</div>
         </template>
-        <iron-autogrow-textarea id='config' value="{{config}}"></iron-autogrow-textarea>
+        <iron-autogrow-textarea id="config" value="{{config}}"></iron-autogrow-textarea>
       </div>
       <div class="card-actions">
-        <ha-call-api-button
-          class='warning'
-          hass='[[hass]]'
-          path="hassio/addons/[[addonSlug]]/options"
-          data='[[resetData]]'
-        >Reset to defaults</ha-call-api-button>
-        <paper-button
-          on-click='saveTapped'
-          disabled='[[!configParsed]]'
-        >Save</paper-button>
+        <ha-call-api-button class="warning" hass="[[hass]]" path="hassio/addons/[[addonSlug]]/options" data="[[resetData]]">Reset to defaults</ha-call-api-button>
+        <paper-button on-click="saveTapped" disabled="[[!configParsed]]">Save</paper-button>
       </div>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioAddonConfig extends Polymer.Element {
   static get is() { return 'hassio-addon-config'; }
 
   static get properties() {
@@ -106,4 +98,3 @@ class HassioAddonConfig extends Polymer.Element {
 }
 
 customElements.define(HassioAddonConfig.is, HassioAddonConfig);
-</script>
diff --git a/hassio/addon-view/hassio-addon-info.html b/hassio/addon-view/hassio-addon-info.html
deleted file mode 100644
index bfb8b9e4ba..0000000000
--- a/hassio/addon-view/hassio-addon-info.html
+++ /dev/null
@@ -1,275 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel='import' href='../../bower_components/paper-card/paper-card.html'>
-<link rel='import' href='../../bower_components/paper-toggle-button/paper-toggle-button.html'>
-
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
-<link rel='import' href='../../src/components/ha-markdown.html'>
-<link rel='import' href='../../src/resources/ha-style.html'>
-<link rel='import' href='../../src/components/hassio-card-content.html'>
-<link rel='import' href='../../src/util/hass-mixins.html'>
-
-<dom-module id="hassio-addon-info">
-  <template>
-    <style include='ha-style'>
-      :host {
-        display: block;
-      }
-      paper-card {
-        display: block;
-        margin-bottom: 16px;
-      }
-      .addon-header {
-        @apply --paper-font-headline;
-      }
-      .light-color {
-        color: var(--secondary-text-color);
-      }
-      .addon-version {
-        float: right;
-        font-size: 15px;
-        vertical-align: middle;
-      }
-      .description {
-        margin-bottom: 16px;
-      }
-      .logo img {
-        max-height: 60px;
-        margin: 16px 0;
-        display: block;
-      }
-      .state div{
-        width: 150px;
-        display: inline-block;
-      }
-      paper-toggle-button {
-        display: inline;
-      }
-      iron-icon.running {
-        color: var(--paper-green-400);
-      }
-      iron-icon.stopped {
-        color: var(--google-red-300);
-      }      
-      ha-call-api-button {
-        font-weight: 500;
-        color: var(--primary-color);
-      }      
-      .right {
-        float: right;
-      }
-    </style>
-    <template is='dom-if' if='[[computeUpdateAvailable(addon)]]'>
-      <paper-card heading='Update available! 🎉'>
-        <div class='card-content'>
-          <hassio-card-content
-            title='[[addon.name]] [[addon.last_version]] is available'
-            description='You are currently running version [[addon.version]]'
-            icon='mdi:arrow-up-bold-circle'
-            icon-class='update'
-          ></hassio-card-content>
-        </div>
-        <div class='card-actions'>
-          <ha-call-api-button
-            hass='[[hass]]'
-            path='hassio/addons/[[addonSlug]]/update'
-          >Update</ha-call-api-button>
-          <template is='dom-if' if='[[addon.changelog]]'>
-            <paper-button on-click='openChangelog'>Changelog</paper-button>
-          </template>
-        </div>
-      </paper-card>
-    </template>
-
-    <paper-card>
-      <div class='card-content'>
-        <div class='addon-header'>[[addon.name]]
-          <div class='addon-version light-color'>
-            <template is='dom-if' if='[[addon.version]]'>
-              [[addon.version]]
-              <template is='dom-if' if='[[isRunning]]'>
-                <iron-icon
-                  title='Add-on is running'
-                  class='running'
-                  icon='mdi:circle'
-                ></iron-icon>
-              </template>
-              <template is='dom-if' if='[[!isRunning]]'>
-                <iron-icon
-                  title='Add-on is stopped'
-                  class='stopped'
-                  icon='mdi:circle'
-                ></iron-icon>
-              </template>
-            </template>
-            <template is='dom-if' if='[[!addon.version]]'>
-              [[addon.last_version]]
-            </template>
-          </div>
-        </div>
-        <div class='description light-color'>
-          [[addon.description]].<br/>
-          Visit <a href='[[addon.url]]' target='_blank'>[[addon.name]] page</a> for details.
-        </div>
-        <template is='dom-if' if='[[addon.logo]]'>
-          <a href='[[addon.url]]' target='_blank' class='logo'>
-            <img src='/api/hassio/addons/[[addonSlug]]/logo'/>
-          </a>
-        </template>
-        <template is='dom-if' if='[[addon.version]]'>
-          <div class='state'>
-            <div>Start on boot</div>
-            <paper-toggle-button
-              on-change='startOnBootToggled'
-              checked='[[computeStartOnBoot(addon.boot)]]'
-            ></paper-toggle-button>
-          </div>
-          <div class='state'>
-            <div>Auto update</div>
-            <paper-toggle-button
-              on-change='autoUpdateToggled'
-              checked='[[addon.auto_update]]'
-            ></paper-toggle-button>
-          </div>
-        </template>
-      </div>
-      <div class='card-actions'>
-        <template is='dom-if' if='[[addon.version]]'>
-          <paper-button
-            class='warning'
-            on-click='_unistallClicked'
-          >Uninstall</paper-button>
-          <template is='dom-if' if='[[addon.build]]'>
-            <ha-call-api-button
-              class='warning'
-              hass='[[hass]]'
-              path='hassio/addons/[[addonSlug]]/rebuild'
-            >Rebuild</ha-call-api-button>
-          </template>
-          <template is='dom-if' if='[[isRunning]]'>
-            <ha-call-api-button
-              class='warning'
-              hass='[[hass]]'
-              path='hassio/addons/[[addonSlug]]/restart'
-            >Restart</ha-call-api-button>
-            <ha-call-api-button
-              class='warning'
-              hass='[[hass]]'
-              path='hassio/addons/[[addonSlug]]/stop'
-            >Stop</ha-call-api-button>
-          </template>
-          <template is='dom-if' if='[[!isRunning]]'>
-            <ha-call-api-button
-              hass='[[hass]]'
-              path='hassio/addons/[[addonSlug]]/start'
-            >Start</ha-call-api-button>
-          </template>
-          <template is='dom-if' if='[[computeShowWebUI(addon.webui, isRunning)]]'>
-            <a
-              href='[[pathWebui(addon.webui)]]'
-              tabindex='-1'
-              target='_blank'
-              class='right'
-            ><paper-button>Open web UI</paper-button></a>
-          </template>
-        </template>
-        <template is='dom-if' if='[[!addon.version]]'>
-          <ha-call-api-button
-            hass='[[hass]]'
-            path='hassio/addons/[[addonSlug]]/install'
-          >Install</ha-call-api-button>
-        </template>
-      </div>
-    </paper-card>
-    <template is='dom-if' if='[[addon.long_description]]'>
-      <paper-card>
-        <div class='card-content'>
-          <ha-markdown content='[[addon.long_description]]'></ha-markdown>
-        </div>
-      </paper-card>
-    </template>
-  </template>
-</dom-module>
-
-<script>
-class HassioAddonInfo extends window.hassMixins.EventsMixin(Polymer.Element) {
-  static get is() { return 'hassio-addon-info'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      addon: Object,
-      addonSlug: String,
-      isRunning: {
-        type: Boolean,
-        computed: 'computeIsRunning(addon)',
-      },
-    };
-  }
-
-  computeIsRunning(addon) {
-    return addon && addon.state === 'started';
-  }
-
-  computeUpdateAvailable(addon) {
-    return addon && !addon.detached && addon.version && addon.version !== addon.last_version;
-  }
-
-  pathWebui(webui) {
-    return webui && webui.replace('[HOST]', document.location.hostname);
-  }
-
-  computeShowWebUI(webui, isRunning) {
-    return webui && isRunning;
-  }
-
-  computeStartOnBoot(state) {
-    return state === 'auto';
-  }
-
-  startOnBootToggled() {
-    const data = { boot: this.addon.boot === 'auto' ? 'manual' : 'auto' };
-    this.hass.callApi('POST', `hassio/addons/${this.addonSlug}/options`, data);
-  }
-
-  autoUpdateToggled() {
-    const data = { auto_update: !this.addon.auto_update };
-    this.hass.callApi('POST', `hassio/addons/${this.addonSlug}/options`, data);
-  }
-
-  openChangelog() {
-    this.hass.callApi('get', `hassio/addons/${this.addonSlug}/changelog`)
-      .then(
-        resp => resp
-        , () => 'Error getting changelog'
-      ).then((content) => {
-        this.fire('hassio-markdown-dialog', {
-          title: 'Changelog',
-          content: content,
-        });
-      });
-  }
-
-  _unistallClicked() {
-    if (!confirm('Are you sure you want to uninstall this add-on?')) {
-      return;
-    }
-    const path = `hassio/addons/${this.addonSlug}/uninstall`;
-    const eventData = {
-      path: path,
-    };
-    this.hass.callApi('post', path).then((resp) => {
-      eventData.success = true;
-      eventData.response = resp;
-    }, (resp) => {
-      eventData.success = false;
-      eventData.response = resp;
-    }).then(() => {
-      this.fire('hass-api-called', eventData);
-    });
-  }
-}
-customElements.define(HassioAddonInfo.is, HassioAddonInfo);
-</script>
diff --git a/hassio/addon-view/hassio-addon-info.js b/hassio/addon-view/hassio-addon-info.js
new file mode 100644
index 0000000000..2e185f9f3c
--- /dev/null
+++ b/hassio/addon-view/hassio-addon-info.js
@@ -0,0 +1,225 @@
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-toggle-button/paper-toggle-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../src/components/buttons/ha-call-api-button.js';
+import '../../src/components/ha-markdown.js';
+import '../../src/components/hassio-card-content.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/hass-mixins.js';
+
+class HassioAddonInfo extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="ha-style">
+      :host {
+        display: block;
+      }
+      paper-card {
+        display: block;
+        margin-bottom: 16px;
+      }
+      .addon-header {
+        @apply --paper-font-headline;
+      }
+      .light-color {
+        color: var(--secondary-text-color);
+      }
+      .addon-version {
+        float: right;
+        font-size: 15px;
+        vertical-align: middle;
+      }
+      .description {
+        margin-bottom: 16px;
+      }
+      .logo img {
+        max-height: 60px;
+        margin: 16px 0;
+        display: block;
+      }
+      .state div{
+        width: 150px;
+        display: inline-block;
+      }
+      paper-toggle-button {
+        display: inline;
+      }
+      iron-icon.running {
+        color: var(--paper-green-400);
+      }
+      iron-icon.stopped {
+        color: var(--google-red-300);
+      }
+      ha-call-api-button {
+        font-weight: 500;
+        color: var(--primary-color);
+      }
+      .right {
+        float: right;
+      }
+    </style>
+    <template is="dom-if" if="[[computeUpdateAvailable(addon)]]">
+      <paper-card heading="Update available! 🎉">
+        <div class="card-content">
+          <hassio-card-content title="[[addon.name]] [[addon.last_version]] is available" description="You are currently running version [[addon.version]]" icon="mdi:arrow-up-bold-circle" icon-class="update"></hassio-card-content>
+        </div>
+        <div class="card-actions">
+          <ha-call-api-button hass="[[hass]]" path="hassio/addons/[[addonSlug]]/update">Update</ha-call-api-button>
+          <template is="dom-if" if="[[addon.changelog]]">
+            <paper-button on-click="openChangelog">Changelog</paper-button>
+          </template>
+        </div>
+      </paper-card>
+    </template>
+
+    <paper-card>
+      <div class="card-content">
+        <div class="addon-header">[[addon.name]]
+          <div class="addon-version light-color">
+            <template is="dom-if" if="[[addon.version]]">
+              [[addon.version]]
+              <template is="dom-if" if="[[isRunning]]">
+                <iron-icon title="Add-on is running" class="running" icon="mdi:circle"></iron-icon>
+              </template>
+              <template is="dom-if" if="[[!isRunning]]">
+                <iron-icon title="Add-on is stopped" class="stopped" icon="mdi:circle"></iron-icon>
+              </template>
+            </template>
+            <template is="dom-if" if="[[!addon.version]]">
+              [[addon.last_version]]
+            </template>
+          </div>
+        </div>
+        <div class="description light-color">
+          [[addon.description]].<br>
+          Visit <a href="[[addon.url]]" target="_blank">[[addon.name]] page</a> for details.
+        </div>
+        <template is="dom-if" if="[[addon.logo]]">
+          <a href="[[addon.url]]" target="_blank" class="logo">
+            <img src="/api/hassio/addons/[[addonSlug]]/logo">
+          </a>
+        </template>
+        <template is="dom-if" if="[[addon.version]]">
+          <div class="state">
+            <div>Start on boot</div>
+            <paper-toggle-button on-change="startOnBootToggled" checked="[[computeStartOnBoot(addon.boot)]]"></paper-toggle-button>
+          </div>
+          <div class="state">
+            <div>Auto update</div>
+            <paper-toggle-button on-change="autoUpdateToggled" checked="[[addon.auto_update]]"></paper-toggle-button>
+          </div>
+        </template>
+      </div>
+      <div class="card-actions">
+        <template is="dom-if" if="[[addon.version]]">
+          <paper-button class="warning" on-click="_unistallClicked">Uninstall</paper-button>
+          <template is="dom-if" if="[[addon.build]]">
+            <ha-call-api-button class="warning" hass="[[hass]]" path="hassio/addons/[[addonSlug]]/rebuild">Rebuild</ha-call-api-button>
+          </template>
+          <template is="dom-if" if="[[isRunning]]">
+            <ha-call-api-button class="warning" hass="[[hass]]" path="hassio/addons/[[addonSlug]]/restart">Restart</ha-call-api-button>
+            <ha-call-api-button class="warning" hass="[[hass]]" path="hassio/addons/[[addonSlug]]/stop">Stop</ha-call-api-button>
+          </template>
+          <template is="dom-if" if="[[!isRunning]]">
+            <ha-call-api-button hass="[[hass]]" path="hassio/addons/[[addonSlug]]/start">Start</ha-call-api-button>
+          </template>
+          <template is="dom-if" if="[[computeShowWebUI(addon.webui, isRunning)]]">
+            <a href="[[pathWebui(addon.webui)]]" tabindex="-1" target="_blank" class="right"><paper-button>Open web UI</paper-button></a>
+          </template>
+        </template>
+        <template is="dom-if" if="[[!addon.version]]">
+          <ha-call-api-button hass="[[hass]]" path="hassio/addons/[[addonSlug]]/install">Install</ha-call-api-button>
+        </template>
+      </div>
+    </paper-card>
+    <template is="dom-if" if="[[addon.long_description]]">
+      <paper-card>
+        <div class="card-content">
+          <ha-markdown content="[[addon.long_description]]"></ha-markdown>
+        </div>
+      </paper-card>
+    </template>
+`;
+  }
+
+  static get is() { return 'hassio-addon-info'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      addon: Object,
+      addonSlug: String,
+      isRunning: {
+        type: Boolean,
+        computed: 'computeIsRunning(addon)',
+      },
+    };
+  }
+
+  computeIsRunning(addon) {
+    return addon && addon.state === 'started';
+  }
+
+  computeUpdateAvailable(addon) {
+    return addon && !addon.detached && addon.version && addon.version !== addon.last_version;
+  }
+
+  pathWebui(webui) {
+    return webui && webui.replace('[HOST]', document.location.hostname);
+  }
+
+  computeShowWebUI(webui, isRunning) {
+    return webui && isRunning;
+  }
+
+  computeStartOnBoot(state) {
+    return state === 'auto';
+  }
+
+  startOnBootToggled() {
+    const data = { boot: this.addon.boot === 'auto' ? 'manual' : 'auto' };
+    this.hass.callApi('POST', `hassio/addons/${this.addonSlug}/options`, data);
+  }
+
+  autoUpdateToggled() {
+    const data = { auto_update: !this.addon.auto_update };
+    this.hass.callApi('POST', `hassio/addons/${this.addonSlug}/options`, data);
+  }
+
+  openChangelog() {
+    this.hass.callApi('get', `hassio/addons/${this.addonSlug}/changelog`)
+      .then(
+        resp => resp
+        , () => 'Error getting changelog'
+      ).then((content) => {
+        this.fire('hassio-markdown-dialog', {
+          title: 'Changelog',
+          content: content,
+        });
+      });
+  }
+
+  _unistallClicked() {
+    if (!confirm('Are you sure you want to uninstall this add-on?')) {
+      return;
+    }
+    const path = `hassio/addons/${this.addonSlug}/uninstall`;
+    const eventData = {
+      path: path,
+    };
+    this.hass.callApi('post', path).then((resp) => {
+      eventData.success = true;
+      eventData.response = resp;
+    }, (resp) => {
+      eventData.success = false;
+      eventData.response = resp;
+    }).then(() => {
+      this.fire('hass-api-called', eventData);
+    });
+  }
+}
+customElements.define(HassioAddonInfo.is, HassioAddonInfo);
diff --git a/hassio/addon-view/hassio-addon-logs.html b/hassio/addon-view/hassio-addon-logs.js
similarity index 61%
rename from hassio/addon-view/hassio-addon-logs.html
rename to hassio/addon-view/hassio-addon-logs.js
index 40d8473dfe..c670237427 100644
--- a/hassio/addon-view/hassio-addon-logs.html
+++ b/hassio/addon-view/hassio-addon-logs.js
@@ -1,30 +1,30 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/resources/ha-style.html'>
+import '../../src/resources/ha-style.js';
 
-<dom-module id="hassio-addon-logs">
-  <template>
+class HassioAddonLogs extends PolymerElement {
+  static get template() {
+    return html`
     <style include="ha-style">
       :host,
       paper-card {
         display: block;
       }
     </style>
-    <paper-card heading='Log'>
+    <paper-card heading="Log">
       <div class="card-content">
         <pre>[[log]]</pre>
       </div>
       <div class="card-actions">
-        <paper-button on-click='refresh'>Refresh</paper-button>
+        <paper-button on-click="refresh">Refresh</paper-button>
       </div>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioAddonLogs extends Polymer.Element {
   static get is() { return 'hassio-addon-logs'; }
 
   static get properties() {
@@ -56,4 +56,3 @@ class HassioAddonLogs extends Polymer.Element {
 }
 
 customElements.define(HassioAddonLogs.is, HassioAddonLogs);
-</script>
diff --git a/hassio/addon-view/hassio-addon-network.html b/hassio/addon-view/hassio-addon-network.js
similarity index 61%
rename from hassio/addon-view/hassio-addon-network.html
rename to hassio/addon-view/hassio-addon-network.js
index 43afede6a4..37579a87db 100644
--- a/hassio/addon-view/hassio-addon-network.html
+++ b/hassio/addon-view/hassio-addon-network.js
@@ -1,14 +1,15 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
-<link rel='import' href='../../src/resources/ha-style.html'>
+import '../../src/components/buttons/ha-call-api-button.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/hass-mixins.js';
 
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
-
-<dom-module id="hassio-addon-network">
-  <template>
+class HassioAddonNetwork extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="ha-style">
       :host {
         display: block;
@@ -25,52 +26,37 @@
         @apply --layout-justified;
       }
     </style>
-    <paper-card heading='Network'>
+    <paper-card heading="Network">
       <div class="card-content">
-        <template is='dom-if' if='[[error]]'>
-          <div class='errors'>[[error]]</div>
+        <template is="dom-if" if="[[error]]">
+          <div class="errors">[[error]]</div>
         </template>
 
         <table>
-          <tr>
+          <tbody><tr>
             <th>Container</th>
             <th>Host</th>
           </tr>
-          <template
-            is='dom-repeat'
-            items='[[config]]'
-          >
+          <template is="dom-repeat" items="[[config]]">
             <tr>
               <td>
                 [[item.container]]
               </td>
               <td>
-                <paper-input
-                  value='{{item.host}}'
-                  no-label-float
-                ></paper-input>
+                <paper-input value="{{item.host}}" no-label-float=""></paper-input>
               </td>
             </tr>
           </template>
-        </table>
+        </tbody></table>
       </div>
       <div class="card-actions">
-        <ha-call-api-button
-          class='warning'
-          hass='[[hass]]'
-          path="hassio/addons/[[addonSlug]]/options"
-          data="[[resetData]]"
-        >Reset to defaults</ha-call-api-button>
-        <paper-button
-          on-click='saveTapped'
-        >Save</paper-button>
+        <ha-call-api-button class="warning" hass="[[hass]]" path="hassio/addons/[[addonSlug]]/options" data="[[resetData]]">Reset to defaults</ha-call-api-button>
+        <paper-button on-click="saveTapped">Save</paper-button>
       </div>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioAddonNetwork extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'hassio-addon-network'; }
 
   static get properties() {
@@ -122,4 +108,3 @@ class HassioAddonNetwork extends window.hassMixins.EventsMixin(Polymer.Element)
 }
 
 customElements.define(HassioAddonNetwork.is, HassioAddonNetwork);
-</script>
diff --git a/hassio/addon-view/hassio-addon-view.html b/hassio/addon-view/hassio-addon-view.html
deleted file mode 100644
index 75cc8a028c..0000000000
--- a/hassio/addon-view/hassio-addon-view.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/app-route/app-route.html'>
-<link rel='import' href='../../bower_components/app-layout/app-header-layout/app-header-layout.html'>
-<link rel='import' href='../../bower_components/app-layout/app-header/app-header.html'>
-<link rel='import' href='../../bower_components/app-layout/app-toolbar/app-toolbar.html'>
-<link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
-
-<link rel='import' href='../../src/components/ha-menu-button.html'>
-<link rel='import' href='../../src/resources/ha-style.html'>
-
-<link rel="import" href="./hassio-addon-info.html">
-<link rel="import" href="./hassio-addon-config.html">
-<link rel="import" href="./hassio-addon-audio.html">
-<link rel="import" href="./hassio-addon-network.html">
-<link rel="import" href="./hassio-addon-logs.html">
-<link rel='import' href='../hassio-markdown-dialog.html'>
-
-<dom-module id="hassio-addon-view">
-  <template>
-    <style include="iron-flex ha-style">
-      :host {
-        color: var(--primary-text-color);
-        --paper-card-header-color: var(--primary-text-color);
-      }      
-      .content {
-        padding: 24px 0 32px;
-        max-width: 600px;
-        margin: 0 auto;
-      }
-      hassio-addon-info,
-      hassio-addon-network,
-      hassio-addon-audio,
-      hassio-addon-config {
-        margin-bottom: 24px;
-      }
-    </style>
-    <app-route
-      route='[[route]]'
-      pattern='/addon/:slug'
-      data="{{routeData}}"
-      active='{{routeMatches}}'
-    ></app-route>
-    <app-header-layout has-scrolling-region>
-      <app-header fixed slot='header'>
-        <app-toolbar>            
-          <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='backTapped'
-          ></paper-icon-button>
-          <div main-title>Hass.io: add-on details</div>
-        </app-toolbar>
-      </app-header>
-      <div class='content'>
-        <hassio-addon-info
-          hass='[[hass]]'
-          addon='[[addon]]'
-          addon-slug='[[routeData.slug]]'
-        ></hassio-addon-info>
-
-        <template is='dom-if' if='[[addon.version]]'>
-          <hassio-addon-config
-            hass='[[hass]]'
-            addon='[[addon]]'
-            addon-slug='[[routeData.slug]]'
-          ></hassio-addon-config>
-
-          <template is='dom-if' if='[[addon.audio]]'>
-            <hassio-addon-audio
-              hass='[[hass]]'
-              addon='[[addon]]'
-            ></hassio-addon-audio>
-          </template>
-
-          <template is='dom-if' if='[[addon.network]]'>
-            <hassio-addon-network
-              hass='[[hass]]'
-              addon='[[addon]]'
-              addon-slug='[[routeData.slug]]'
-            ></hassio-addon-network>
-          </template>
-
-          <hassio-addon-logs
-            hass='[[hass]]'
-            addon-slug='[[routeData.slug]]'
-          ></hassio-addon-logs>
-        </template>
-      </div>
-    </app-header-layout>
-
-    <hassio-markdown-dialog
-      title='[[markdownTitle]]'
-      content='[[markdownContent]]'
-    ></hassio-markdown-dialog>
-  </template>
-</dom-module>
-
-<script>
-class HassioAddonView extends Polymer.Element {
-  static get is() { return 'hassio-addon-view'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      showMenu: Boolean,
-      narrow: Boolean,
-      route: Object,
-      routeData: {
-        type: Object,
-        observer: 'routeDataChanged',
-      },
-      routeMatches: Boolean,
-      addon: Object,
-
-      markdownTitle: String,
-      markdownContent: {
-        type: String,
-        value: '',
-      },
-    };
-  }
-
-  ready() {
-    super.ready();
-    this.addEventListener('hass-api-called', ev => this.apiCalled(ev));
-    this.addEventListener('hassio-markdown-dialog', ev => this.openMarkdown(ev));
-  }
-
-  apiCalled(ev) {
-    const path = ev.detail.path;
-
-    if (!path) return;
-
-    if (path.substr(path.lastIndexOf('/') + 1) === 'uninstall') {
-      this.backTapped();
-    } else {
-      this.routeDataChanged(this.routeData);
-    }
-  }
-
-  routeDataChanged(routeData) {
-    if (!this.routeMatches || !routeData || !routeData.slug) return;
-    this.hass.callApi('get', `hassio/addons/${routeData.slug}/info`)
-      .then((info) => {
-        this.addon = info.data;
-      }, () => {
-        this.addon = null;
-      });
-  }
-
-  backTapped() {
-    history.back();
-  }
-
-  openMarkdown(ev) {
-    this.setProperties({
-      markdownTitle: ev.detail.title,
-      markdownContent: ev.detail.content,
-    });
-    this.shadowRoot.querySelector('hassio-markdown-dialog').openDialog();
-  }
-}
-
-customElements.define(HassioAddonView.is, HassioAddonView);
-</script>
diff --git a/hassio/addon-view/hassio-addon-view.js b/hassio/addon-view/hassio-addon-view.js
new file mode 100644
index 0000000000..68e6792c94
--- /dev/null
+++ b/hassio/addon-view/hassio-addon-view.js
@@ -0,0 +1,134 @@
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/app-route/app-route.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-style.js';
+import '../hassio-markdown-dialog.js';
+import './hassio-addon-audio.js';
+import './hassio-addon-config.js';
+import './hassio-addon-info.js';
+import './hassio-addon-logs.js';
+import './hassio-addon-network.js';
+
+class HassioAddonView extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style">
+      :host {
+        color: var(--primary-text-color);
+        --paper-card-header-color: var(--primary-text-color);
+      }
+      .content {
+        padding: 24px 0 32px;
+        max-width: 600px;
+        margin: 0 auto;
+      }
+      hassio-addon-info,
+      hassio-addon-network,
+      hassio-addon-audio,
+      hassio-addon-config {
+        margin-bottom: 24px;
+      }
+    </style>
+    <app-route route="[[route]]" pattern="/addon/:slug" data="{{routeData}}" active="{{routeMatches}}"></app-route>
+    <app-header-layout has-scrolling-region="">
+      <app-header fixed="" slot="header">
+        <app-toolbar>
+          <ha-menu-button narrow="[[narrow]]" show-menu="[[showMenu]]"></ha-menu-button>
+          <paper-icon-button icon="mdi:arrow-left" on-click="backTapped"></paper-icon-button>
+          <div main-title="">Hass.io: add-on details</div>
+        </app-toolbar>
+      </app-header>
+      <div class="content">
+        <hassio-addon-info hass="[[hass]]" addon="[[addon]]" addon-slug="[[routeData.slug]]"></hassio-addon-info>
+
+        <template is="dom-if" if="[[addon.version]]">
+          <hassio-addon-config hass="[[hass]]" addon="[[addon]]" addon-slug="[[routeData.slug]]"></hassio-addon-config>
+
+          <template is="dom-if" if="[[addon.audio]]">
+            <hassio-addon-audio hass="[[hass]]" addon="[[addon]]"></hassio-addon-audio>
+          </template>
+
+          <template is="dom-if" if="[[addon.network]]">
+            <hassio-addon-network hass="[[hass]]" addon="[[addon]]" addon-slug="[[routeData.slug]]"></hassio-addon-network>
+          </template>
+
+          <hassio-addon-logs hass="[[hass]]" addon-slug="[[routeData.slug]]"></hassio-addon-logs>
+        </template>
+      </div>
+    </app-header-layout>
+
+    <hassio-markdown-dialog title="[[markdownTitle]]" content="[[markdownContent]]"></hassio-markdown-dialog>
+`;
+  }
+
+  static get is() { return 'hassio-addon-view'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      showMenu: Boolean,
+      narrow: Boolean,
+      route: Object,
+      routeData: {
+        type: Object,
+        observer: 'routeDataChanged',
+      },
+      routeMatches: Boolean,
+      addon: Object,
+
+      markdownTitle: String,
+      markdownContent: {
+        type: String,
+        value: '',
+      },
+    };
+  }
+
+  ready() {
+    super.ready();
+    this.addEventListener('hass-api-called', ev => this.apiCalled(ev));
+    this.addEventListener('hassio-markdown-dialog', ev => this.openMarkdown(ev));
+  }
+
+  apiCalled(ev) {
+    const path = ev.detail.path;
+
+    if (!path) return;
+
+    if (path.substr(path.lastIndexOf('/') + 1) === 'uninstall') {
+      this.backTapped();
+    } else {
+      this.routeDataChanged(this.routeData);
+    }
+  }
+
+  routeDataChanged(routeData) {
+    if (!this.routeMatches || !routeData || !routeData.slug) return;
+    this.hass.callApi('get', `hassio/addons/${routeData.slug}/info`)
+      .then((info) => {
+        this.addon = info.data;
+      }, () => {
+        this.addon = null;
+      });
+  }
+
+  backTapped() {
+    history.back();
+  }
+
+  openMarkdown(ev) {
+    this.setProperties({
+      markdownTitle: ev.detail.title,
+      markdownContent: ev.detail.content,
+    });
+    this.shadowRoot.querySelector('hassio-markdown-dialog').openDialog();
+  }
+}
+
+customElements.define(HassioAddonView.is, HassioAddonView);
diff --git a/hassio/dashboard/hassio-addons.html b/hassio/dashboard/hassio-addons.js
similarity index 50%
rename from hassio/dashboard/hassio-addons.html
rename to hassio/dashboard/hassio-addons.js
index 51ae65ceb5..c120d7c30e 100644
--- a/hassio/dashboard/hassio-addons.html
+++ b/hassio/dashboard/hassio-addons.js
@@ -1,45 +1,39 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/paper-card/paper-card.html'>
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
-<link rel='import' href='../../src/components/hassio-card-content.html'>
-<link rel='import' href='../../src/resources/hassio-style.html'>
+import '../../src/components/hassio-card-content.js';
+import '../../src/resources/hassio-style.js';
+import '../../src/util/hass-mixins.js';
 
-<dom-module id='hassio-addons'>
-  <template>
-    <style include='ha-style hassio-style'>
+class HassioAddons extends window.hassMixins.NavigateMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="ha-style hassio-style">
       paper-card {
         cursor: pointer;
       }
     </style>
-    <div class='content card-group'>
-      <div class='title'>Add-ons</div>
-      <template is='dom-if' if='[[!addons.length]]'>
+    <div class="content card-group">
+      <div class="title">Add-ons</div>
+      <template is="dom-if" if="[[!addons.length]]">
         <paper-card>
-          <div class='card-content'>
-            You don't have any add-ons installed yet. Head over to <a href='#' on-click='openStore'>the add-on store</a> to get started!
+          <div class="card-content">
+            You don't have any add-ons installed yet. Head over to <a href="#" on-click="openStore">the add-on store</a> to get started!
           </div>
         </paper-card>
       </template>
-      <template is='dom-repeat' items='[[addons]]' as='addon' sort='sortAddons'>
-        <paper-card on-click='addonTapped'>
-          <div class='card-content'>
-            <hassio-card-content
-              title='[[addon.name]]'
-              description='[[addon.description]]'
-              icon='[[computeIcon(addon)]]'
-              icon-title='[[computeIconTitle(addon)]]'
-              icon-class='[[computeIconClass(addon)]]'
-            ></hassio-card-content>
+      <template is="dom-repeat" items="[[addons]]" as="addon" sort="sortAddons">
+        <paper-card on-click="addonTapped">
+          <div class="card-content">
+            <hassio-card-content title="[[addon.name]]" description="[[addon.description]]" icon="[[computeIcon(addon)]]" icon-title="[[computeIconTitle(addon)]]" icon-class="[[computeIconClass(addon)]]"></hassio-card-content>
           </div>
         </paper-card>
       </template>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioAddons extends window.hassMixins.NavigateMixin(Polymer.Element) {
   static get is() { return 'hassio-addons'; }
 
   static get properties() {
@@ -79,4 +73,3 @@ class HassioAddons extends window.hassMixins.NavigateMixin(Polymer.Element) {
 }
 
 customElements.define(HassioAddons.is, HassioAddons);
-</script>
diff --git a/hassio/dashboard/hassio-dashboard.html b/hassio/dashboard/hassio-dashboard.html
deleted file mode 100644
index 4aee9948ed..0000000000
--- a/hassio/dashboard/hassio-dashboard.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="./hassio-addons.html">
-<link rel="import" href="./hassio-hass-update.html">
-
-<dom-module id="hassio-dashboard">
-  <template>
-    <style include="iron-flex ha-style">
-      .content {
-        margin: 0 auto;
-      }
-    </style>
-    <div class='content'>
-      <hassio-hass-update
-        hass='[[hass]]'
-        hass-info='[[hassInfo]]'
-      ></hassio-hass-update>
-      <hassio-addons
-        hass='[[hass]]'
-        addons='[[supervisorInfo.addons]]'
-      ></hassio-addons>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-class HassioDashboard extends window.hassMixins.EventsMixin(Polymer.Element) {
-  static get is() { return 'hassio-dashboard'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      supervisorInfo: Object,
-      hassInfo: Object,
-    };
-  }
-}
-
-customElements.define(HassioDashboard.is, HassioDashboard);
-</script>
diff --git a/hassio/dashboard/hassio-dashboard.js b/hassio/dashboard/hassio-dashboard.js
new file mode 100644
index 0000000000..0496d76266
--- /dev/null
+++ b/hassio/dashboard/hassio-dashboard.js
@@ -0,0 +1,33 @@
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import './hassio-addons.js';
+import './hassio-hass-update.js';
+
+class HassioDashboard extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style">
+      .content {
+        margin: 0 auto;
+      }
+    </style>
+    <div class="content">
+      <hassio-hass-update hass="[[hass]]" hass-info="[[hassInfo]]"></hassio-hass-update>
+      <hassio-addons hass="[[hass]]" addons="[[supervisorInfo.addons]]"></hassio-addons>
+    </div>
+`;
+  }
+
+  static get is() { return 'hassio-dashboard'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      supervisorInfo: Object,
+      hassInfo: Object,
+    };
+  }
+}
+
+customElements.define(HassioDashboard.is, HassioDashboard);
diff --git a/hassio/dashboard/hassio-hass-update.html b/hassio/dashboard/hassio-hass-update.html
deleted file mode 100644
index 9fb6874907..0000000000
--- a/hassio/dashboard/hassio-hass-update.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
-<link rel='import' href='../../src/components/hassio-card-content.html'>
-<link rel='import' href='../../src/resources/hassio-style.html'>
-
-<dom-module id="hassio-hass-update">
-  <template>
-    <style include="ha-style hassio-style">
-      paper-card {
-        display: block;
-        height: 100%;
-        margin-bottom: 32px;
-      }
-      .errors {
-        color: var(--google-red-500);
-        margin-top: 16px;
-      }
-    </style>
-    <template is='dom-if' if='[[computeUpdateAvailable(hassInfo)]]'>
-      <div class='content'> 
-        <div class='card-group'>
-          <div class='title'>Update available! 🎉</div>     
-          <paper-card>
-            <div class='card-content'>
-              <hassio-card-content
-                title='Home Assistant [[hassInfo.last_version]] is available'
-                description='You are currently running version [[hassInfo.version]]'
-                icon='mdi:home-assistant'
-                icon-class='hassupdate'
-              ></hassio-card-content>
-              <template is='dom-if' if='[[error]]'>
-                <div class='error'>Error: [[error]]</div>
-              </template>
-            </div>
-            <div class='card-actions'>
-              <ha-call-api-button
-                hass='[[hass]]'
-                path='hassio/homeassistant/update'
-              >Update</ha-call-api-button>
-              <a
-                href='https://github.com/home-assistant/home-assistant/releases'
-                target='_blank'
-              ><paper-button>Release notes</paper-button></a>
-            </div>
-          </paper-card>
-        </div>
-      </div>
-    </template>
-  </template>
-</dom-module>
-
-<script>
-class HassioHassUpdate extends Polymer.Element {
-  static get is() { return 'hassio-hass-update'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      hassInfo: Object,
-      error: String,
-    };
-  }
-
-  ready() {
-    super.ready();
-    this.addEventListener('hass-api-called', ev => this.apiCalled(ev));
-  }
-
-  apiCalled(ev) {
-    if (ev.detail.success) {
-      this.errors = null;
-      return;
-    }
-
-    const response = ev.detail.response;
-
-    if (typeof response.body === 'object') {
-      this.errors = response.body.message || 'Unknown error';
-    } else {
-      this.errors = response.body;
-    }
-  }
-
-  computeUpdateAvailable(hassInfo) {
-    return hassInfo.version !== hassInfo.last_version;
-  }
-}
-
-customElements.define(HassioHassUpdate.is, HassioHassUpdate);
-</script>
diff --git a/hassio/dashboard/hassio-hass-update.js b/hassio/dashboard/hassio-hass-update.js
new file mode 100644
index 0000000000..a2ec355f0d
--- /dev/null
+++ b/hassio/dashboard/hassio-hass-update.js
@@ -0,0 +1,81 @@
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../src/components/buttons/ha-call-api-button.js';
+import '../../src/components/hassio-card-content.js';
+import '../../src/resources/hassio-style.js';
+
+class HassioHassUpdate extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="ha-style hassio-style">
+      paper-card {
+        display: block;
+        height: 100%;
+        margin-bottom: 32px;
+      }
+      .errors {
+        color: var(--google-red-500);
+        margin-top: 16px;
+      }
+    </style>
+    <template is="dom-if" if="[[computeUpdateAvailable(hassInfo)]]">
+      <div class="content">
+        <div class="card-group">
+          <div class="title">Update available! 🎉</div>
+          <paper-card>
+            <div class="card-content">
+              <hassio-card-content title="Home Assistant [[hassInfo.last_version]] is available" description="You are currently running version [[hassInfo.version]]" icon="mdi:home-assistant" icon-class="hassupdate"></hassio-card-content>
+              <template is="dom-if" if="[[error]]">
+                <div class="error">Error: [[error]]</div>
+              </template>
+            </div>
+            <div class="card-actions">
+              <ha-call-api-button hass="[[hass]]" path="hassio/homeassistant/update">Update</ha-call-api-button>
+              <a href="https://github.com/home-assistant/home-assistant/releases" target="_blank"><paper-button>Release notes</paper-button></a>
+            </div>
+          </paper-card>
+        </div>
+      </div>
+    </template>
+`;
+  }
+
+  static get is() { return 'hassio-hass-update'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      hassInfo: Object,
+      error: String,
+    };
+  }
+
+  ready() {
+    super.ready();
+    this.addEventListener('hass-api-called', ev => this.apiCalled(ev));
+  }
+
+  apiCalled(ev) {
+    if (ev.detail.success) {
+      this.errors = null;
+      return;
+    }
+
+    const response = ev.detail.response;
+
+    if (typeof response.body === 'object') {
+      this.errors = response.body.message || 'Unknown error';
+    } else {
+      this.errors = response.body;
+    }
+  }
+
+  computeUpdateAvailable(hassInfo) {
+    return hassInfo.version !== hassInfo.last_version;
+  }
+}
+
+customElements.define(HassioHassUpdate.is, HassioHassUpdate);
diff --git a/hassio/hassio-app.html b/hassio/hassio-app.js
similarity index 65%
rename from hassio/hassio-app.html
rename to hassio/hassio-app.js
index 0d8c0e632d..b01ee3431c 100644
--- a/hassio/hassio-app.html
+++ b/hassio/hassio-app.js
@@ -1,21 +1,17 @@
-<link rel="import" href="../bower_components/polymer/polymer-element.html">
-<link rel="import" href="./hassio-main.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="hassio-app">
-  <template>
-    <template is='dom-if' if='[[hass]]'>
-      <hassio-main
-        hass='[[hass]]'
-        narrow='[[narrow]]'
-        show-menu='[[showMenu]]'
-        route='[[route]]'
-      ></hassio-main>
+import './hassio-main.js';
+
+class HassioApp extends PolymerElement {
+  static get template() {
+    return html`
+    <template is="dom-if" if="[[hass]]">
+      <hassio-main hass="[[hass]]" narrow="[[narrow]]" show-menu="[[showMenu]]" route="[[route]]"></hassio-main>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioApp extends Polymer.Element {
   static get is() { return 'hassio-app'; }
 
   static get properties() {
@@ -49,4 +45,3 @@ class HassioApp extends Polymer.Element {
 }
 
 customElements.define(HassioApp.is, HassioApp);
-</script>
diff --git a/hassio/hassio-data.html b/hassio/hassio-data.js
similarity index 88%
rename from hassio/hassio-data.html
rename to hassio/hassio-data.js
index ab34405aa9..a324292f05 100644
--- a/hassio/hassio-data.html
+++ b/hassio/hassio-data.js
@@ -1,7 +1,6 @@
-<link rel="import" href="../bower_components/polymer/polymer-element.html">
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<script>
-class HassioData extends Polymer.Element {
+class HassioData extends PolymerElement {
   static get is() { return 'hassio-data'; }
 
   static get properties() {
@@ -61,4 +60,3 @@ class HassioData extends Polymer.Element {
 }
 
 customElements.define(HassioData.is, HassioData);
-</script>
diff --git a/hassio/hassio-main.html b/hassio/hassio-main.html
deleted file mode 100644
index 746a0b44cf..0000000000
--- a/hassio/hassio-main.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<link rel="import" href="../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../bower_components/app-route/app-route.html">
-
-<link rel="import" href="../src/layouts/hass-loading-screen.html">
-<link rel='import' href='../src/util/hass-util.html'>
-
-<link rel='import' href='./hassio-data.html'>
-<link rel='import' href='./hassio-pages-with-tabs.html'>
-<link rel='import' href='./addon-view/hassio-addon-view.html'>
-
-<dom-module id="hassio-main">
-  <template>  
-    <app-route
-      route='[[route]]'
-      pattern='/:page'
-      data="{{routeData}}"
-    ></app-route>
-    <hassio-data
-      id='data'
-      hass='[[hass]]'
-      supervisor='{{supervisorInfo}}'
-      homeassistant='{{hassInfo}}'
-      host='{{hostInfo}}'
-    ></hassio-data>
-
-    <template is='dom-if' if='[[!loaded]]'>
-      <hass-loading-screen
-        narrow='[[narrow]]'
-        show-menu='[[showMenu]]'
-      ></hass-loading-screen>
-    </template>
-
-    <template is='dom-if' if='[[loaded]]'>
-      <template is='dom-if' if='[[!equalsAddon(routeData.page)]]'>
-        <hassio-pages-with-tabs
-          hass='[[hass]]'
-          narrow='[[narrow]]'
-          show-menu='[[showMenu]]'
-          page='[[routeData.page]]'
-          supervisor-info='[[supervisorInfo]]'
-          hass-info='[[hassInfo]]'
-          host-info='[[hostInfo]]'        
-        ></hassio-pages-with-tabs>
-      </template>
-      <template is='dom-if' if='[[equalsAddon(routeData.page)]]'>
-        <hassio-addon-view
-          hass='[[hass]]'
-          narrow='[[narrow]]'
-          show-menu='[[showMenu]]'
-          route='[[route]]'          
-        ></hassio-addon-view>
-      </template>        
-    </template>
-  </template>
-</dom-module>
-
-<script>
-class HassioMain extends window.hassMixins.EventsMixin(Polymer.Element) {
-  static get is() { return 'hassio-main'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      narrow: Boolean,
-      showMenu: Boolean,
-      route: {
-        type: Object,
-        // Fake route object
-        value: {
-          prefix: '/hassio',
-          path: '/dashboard',
-          __queryParams: {}
-        },
-        observer: 'routeChanged',
-      },
-      routeData: Object,
-      supervisorInfo: Object,
-      hostInfo: Object,
-      hassInfo: Object,
-      loaded: {
-        type: Boolean,
-        computed: 'computeIsLoaded(supervisorInfo, hostInfo, hassInfo)',
-      },
-    };
-  }
-
-  ready() {
-    super.ready();
-    window.hassUtil.applyThemesOnElement(this, this.hass.themes, this.hass.selectedTheme, true);
-    this.addEventListener('hass-api-called', ev => this.apiCalled(ev));
-  }
-
-  connectedCallback() {
-    super.connectedCallback();
-    this.routeChanged(this.route);
-  }
-
-  apiCalled(ev) {
-    if (ev.detail.success) {
-      let tries = 1;
-
-      const tryUpdate = () => {
-        this.$.data.refresh().catch(function () {
-          tries += 1;
-          setTimeout(tryUpdate, Math.min(tries, 5) * 1000);
-        });
-      };
-
-      tryUpdate();
-    }
-  }
-
-  computeIsLoaded(supervisorInfo, hostInfo, hassInfo) {
-    return (supervisorInfo !== null &&
-            hostInfo !== null &&
-            hassInfo !== null);
-  }
-
-  routeChanged(route) {
-    if (route.path === '' && route.prefix === '/hassio') {
-      history.replaceState(null, null, '/hassio/dashboard');
-      this.fire('location-changed');
-    }
-  }
-
-  equalsAddon(page) {
-    return page && page === 'addon';
-  }
-}
-
-customElements.define(HassioMain.is, HassioMain);
-</script>
diff --git a/hassio/hassio-main.js b/hassio/hassio-main.js
new file mode 100644
index 0000000000..760dc0f3fd
--- /dev/null
+++ b/hassio/hassio-main.js
@@ -0,0 +1,104 @@
+import '@polymer/app-route/app-route.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../src/layouts/hass-loading-screen.js';
+import '../src/util/hass-util.js';
+import './addon-view/hassio-addon-view.js';
+import './hassio-data.js';
+import './hassio-pages-with-tabs.js';
+
+class HassioMain extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <app-route route="[[route]]" pattern="/:page" data="{{routeData}}"></app-route>
+    <hassio-data id="data" hass="[[hass]]" supervisor="{{supervisorInfo}}" homeassistant="{{hassInfo}}" host="{{hostInfo}}"></hassio-data>
+
+    <template is="dom-if" if="[[!loaded]]">
+      <hass-loading-screen narrow="[[narrow]]" show-menu="[[showMenu]]"></hass-loading-screen>
+    </template>
+
+    <template is="dom-if" if="[[loaded]]">
+      <template is="dom-if" if="[[!equalsAddon(routeData.page)]]">
+        <hassio-pages-with-tabs hass="[[hass]]" narrow="[[narrow]]" show-menu="[[showMenu]]" page="[[routeData.page]]" supervisor-info="[[supervisorInfo]]" hass-info="[[hassInfo]]" host-info="[[hostInfo]]"></hassio-pages-with-tabs>
+      </template>
+      <template is="dom-if" if="[[equalsAddon(routeData.page)]]">
+        <hassio-addon-view hass="[[hass]]" narrow="[[narrow]]" show-menu="[[showMenu]]" route="[[route]]"></hassio-addon-view>
+      </template>
+    </template>
+`;
+  }
+
+  static get is() { return 'hassio-main'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      narrow: Boolean,
+      showMenu: Boolean,
+      route: {
+        type: Object,
+        // Fake route object
+        value: {
+          prefix: '/hassio',
+          path: '/dashboard',
+          __queryParams: {}
+        },
+        observer: 'routeChanged',
+      },
+      routeData: Object,
+      supervisorInfo: Object,
+      hostInfo: Object,
+      hassInfo: Object,
+      loaded: {
+        type: Boolean,
+        computed: 'computeIsLoaded(supervisorInfo, hostInfo, hassInfo)',
+      },
+    };
+  }
+
+  ready() {
+    super.ready();
+    window.hassUtil.applyThemesOnElement(this, this.hass.themes, this.hass.selectedTheme, true);
+    this.addEventListener('hass-api-called', ev => this.apiCalled(ev));
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+    this.routeChanged(this.route);
+  }
+
+  apiCalled(ev) {
+    if (ev.detail.success) {
+      let tries = 1;
+
+      const tryUpdate = () => {
+        this.$.data.refresh().catch(function () {
+          tries += 1;
+          setTimeout(tryUpdate, Math.min(tries, 5) * 1000);
+        });
+      };
+
+      tryUpdate();
+    }
+  }
+
+  computeIsLoaded(supervisorInfo, hostInfo, hassInfo) {
+    return (supervisorInfo !== null &&
+            hostInfo !== null &&
+            hassInfo !== null);
+  }
+
+  routeChanged(route) {
+    if (route.path === '' && route.prefix === '/hassio') {
+      history.replaceState(null, null, '/hassio/dashboard');
+      this.fire('location-changed');
+    }
+  }
+
+  equalsAddon(page) {
+    return page && page === 'addon';
+  }
+}
+
+customElements.define(HassioMain.is, HassioMain);
diff --git a/hassio/hassio-markdown-dialog.html b/hassio/hassio-markdown-dialog.js
similarity index 57%
rename from hassio/hassio-markdown-dialog.html
rename to hassio/hassio-markdown-dialog.js
index 92b3b0c8ff..396219c2ea 100644
--- a/hassio/hassio-markdown-dialog.html
+++ b/hassio/hassio-markdown-dialog.js
@@ -1,15 +1,17 @@
-<link rel='import' href='../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../bower_components/paper-dialog/paper-dialog.html'>
-<link rel='import' href='../bower_components/app-layout/app-toolbar/app-toolbar.html'>
-<link rel='import' href='../bower_components/paper-icon-button/paper-icon-button.html'>
-<link rel='import' href='../bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html'>
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-dialog-scrollable/paper-dialog-scrollable.js';
+import '@polymer/paper-dialog/paper-dialog.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../src/components/ha-markdown.html'>
-<link rel='import' href='../src/resources/ha-style.html'>
+import '../src/components/ha-markdown.js';
+import '../src/resources/ha-style.js';
 
-<dom-module id='hassio-markdown-dialog'>
-  <template>
-    <style include='ha-style-dialog'>
+class HassioMarkdownDialog extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="ha-style-dialog">
       paper-dialog {
         min-width: 350px;
         font-size: 14px;
@@ -48,26 +50,18 @@
         }
       }
     </style>
-    <paper-dialog
-      id='dialog'
-      with-backdrop
-    >
+    <paper-dialog id="dialog" with-backdrop="">
       <app-toolbar>
-        <paper-icon-button
-          icon='mdi:close'
-          dialog-dismiss
-        ></paper-icon-button>
-        <div main-title>[[title]]</div>
+        <paper-icon-button icon="mdi:close" dialog-dismiss=""></paper-icon-button>
+        <div main-title="">[[title]]</div>
       </app-toolbar>
       <paper-dialog-scrollable>
-        <ha-markdown content='[[content]]'></ha-markdown>
+        <ha-markdown content="[[content]]"></ha-markdown>
       </paper-dialog-scrollable>
     </paper-dialog>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioMarkdownDialog extends Polymer.Element {
   static get is() { return 'hassio-markdown-dialog'; }
 
   static get properties() {
@@ -82,4 +76,3 @@ class HassioMarkdownDialog extends Polymer.Element {
   }
 }
 customElements.define(HassioMarkdownDialog.is, HassioMarkdownDialog);
-</script>
diff --git a/hassio/hassio-pages-with-tabs.html b/hassio/hassio-pages-with-tabs.html
deleted file mode 100644
index 1b929df534..0000000000
--- a/hassio/hassio-pages-with-tabs.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<link rel='import' href='../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../bower_components/app-layout/app-header-layout/app-header-layout.html'>
-<link rel='import' href='../bower_components/app-layout/app-header/app-header.html'>
-<link rel='import' href='../bower_components/app-layout/app-toolbar/app-toolbar.html'>
-<link rel='import' href='../bower_components/paper-tabs/paper-tabs.html'>
-<link rel='import' href='../bower_components/paper-tabs/paper-tab.html'>
-<link rel='import' href='../bower_components/paper-icon-button/paper-icon-button.html'>
-
-<link rel='import' href='../src/components/ha-menu-button.html'>
-<link rel='import' href='../src/util/hass-mixins.html'>
-<link rel='import' href='../src/resources/ha-style.html'>
-
-<link rel='import' href='./dashboard/hassio-dashboard.html'>
-<link rel='import' href='./snapshots/hassio-snapshots.html'>
-<link rel='import' href='./snapshots/hassio-snapshot.html'>
-<link rel='import' href='./addon-store/hassio-addon-store.html'>
-<link rel='import' href='./system/hassio-system.html'>
-<link rel='import' href='./hassio-markdown-dialog.html'>
-
-<dom-module id='hassio-pages-with-tabs'>
-  <template>
-    <style include='iron-flex iron-positioning ha-style'>
-      :host {
-        color: var(--primary-text-color);
-        --paper-card-header-color: var(--primary-text-color);
-      }
-      paper-tabs {
-        margin-left: 12px;
-        --paper-tabs-selection-bar-color: #FFF;
-        text-transform: uppercase;
-      }
-    </style>
-    <app-header-layout has-scrolling-region>
-      <app-header fixed slot='header'>
-        <app-toolbar>            
-          <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
-          <div main-title>Hass.io</div>
-          <template is='dom-if' if='[[showRefreshButton(page)]]'>
-            <paper-icon-button
-              icon='mdi:refresh'
-              on-click='refreshClicked'
-            ></paper-icon-button>
-          </template>
-        </app-toolbar>
-        <paper-tabs
-          scrollable
-          selected='[[page]]'
-          attr-for-selected='page-name'
-          on-iron-activate='handlePageSelected'
-        >
-          <paper-tab page-name='dashboard'>Dashboard</paper-tab>
-          <paper-tab page-name='snapshots'>Snapshots</paper-tab>
-          <paper-tab page-name='store'>Add-on store</paper-tab>
-          <paper-tab page-name='system'>System</paper-tab>
-        </paper-tabs>
-      </app-header>
-      <template is='dom-if' if='[[equals(page, "dashboard")]]'>
-        <hassio-dashboard
-          hass='[[hass]]'
-          supervisor-info='[[supervisorInfo]]'
-          hass-info='[[hassInfo]]'
-        ></hassio-dashboard>
-      </template>
-      <template is='dom-if' if='[[equals(page, "snapshots")]]'>
-        <hassio-snapshots
-          hass='[[hass]]'
-          installed-addons='[[supervisorInfo.addons]]'
-          snapshot-slug='{{snapshotSlug}}'
-          snapshot-deleted='{{snapshotDeleted}}'
-        ></hassio-snapshots>
-      </template>
-      <template is='dom-if' if='[[equals(page, "store")]]'>
-        <hassio-addon-store
-          hass='[[hass]]'
-        ></hassio-addon-store>
-      </template>
-      <template is='dom-if' if='[[equals(page, "system")]]'>
-        <hassio-system
-          hass='[[hass]]'
-          supervisor-info='[[supervisorInfo]]'
-          host-info='[[hostInfo]]'
-        ></hassio-system>
-      </template>
-    </app-header-layout>
-
-    <hassio-markdown-dialog
-      title='[[markdownTitle]]'
-      content='[[markdownContent]]'
-    ></hassio-markdown-dialog>
-
-    <template is='dom-if' if='[[equals(page, "snapshots")]]'>
-      <hassio-snapshot      
-        hass='[[hass]]'
-        snapshot-slug='{{snapshotSlug}}'
-        snapshot-deleted='{{snapshotDeleted}}'
-      ></hassio-snapshot>
-    </template>
-  </template>
-</dom-module>
-
-<script>
-class HassioPagesWithTabs extends window.hassMixins.NavigateMixin(Polymer.Element) {
-  static get is() { return 'hassio-pages-with-tabs'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      showMenu: Boolean,
-      narrow: Boolean,
-      page: String,
-      supervisorInfo: Object,
-      hostInfo: Object,
-      hassInfo: Object,
-      snapshotSlug: String,
-      snapshotDeleted: Boolean,
-
-      markdownTitle: String,
-      markdownContent: {
-        type: String,
-        value: '',
-      },
-    };
-  }
-
-  ready() {
-    super.ready();
-    this.addEventListener('hassio-markdown-dialog', ev => this.openMarkdown(ev));
-  }
-
-  handlePageSelected(ev) {
-    const newPage = ev.detail.item.getAttribute('page-name');
-    if (newPage !== this.page) {
-      this.navigate(`/hassio/${newPage}`);
-    }
-  }
-
-  equals(a, b) {
-    return a === b;
-  }
-
-  showRefreshButton(page) {
-    return page === 'store' || page === 'snapshots';
-  }
-
-  refreshClicked() {
-    if (this.page === 'snapshots') {
-      this.shadowRoot.querySelector('hassio-snapshots').refreshData();
-    } else {
-      this.shadowRoot.querySelector('hassio-addon-store').refreshData();
-    }
-  }
-
-  openMarkdown(ev) {
-    this.setProperties({
-      markdownTitle: ev.detail.title,
-      markdownContent: ev.detail.content,
-    });
-    this.shadowRoot.querySelector('hassio-markdown-dialog').openDialog();
-  }
-}
-
-customElements.define(HassioPagesWithTabs.is, HassioPagesWithTabs);
-</script>
diff --git a/hassio/hassio-pages-with-tabs.js b/hassio/hassio-pages-with-tabs.js
new file mode 100644
index 0000000000..68080bba62
--- /dev/null
+++ b/hassio/hassio-pages-with-tabs.js
@@ -0,0 +1,131 @@
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-tabs/paper-tab.js';
+import '@polymer/paper-tabs/paper-tabs.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../src/components/ha-menu-button.js';
+import '../src/resources/ha-style.js';
+import '../src/util/hass-mixins.js';
+import './addon-store/hassio-addon-store.js';
+import './dashboard/hassio-dashboard.js';
+import './hassio-markdown-dialog.js';
+import './snapshots/hassio-snapshot.js';
+import './snapshots/hassio-snapshots.js';
+import './system/hassio-system.js';
+
+class HassioPagesWithTabs extends window.hassMixins.NavigateMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="iron-flex iron-positioning ha-style">
+      :host {
+        color: var(--primary-text-color);
+        --paper-card-header-color: var(--primary-text-color);
+      }
+      paper-tabs {
+        margin-left: 12px;
+        --paper-tabs-selection-bar-color: #FFF;
+        text-transform: uppercase;
+      }
+    </style>
+    <app-header-layout has-scrolling-region="">
+      <app-header fixed="" slot="header">
+        <app-toolbar>
+          <ha-menu-button narrow="[[narrow]]" show-menu="[[showMenu]]"></ha-menu-button>
+          <div main-title="">Hass.io</div>
+          <template is="dom-if" if="[[showRefreshButton(page)]]">
+            <paper-icon-button icon="mdi:refresh" on-click="refreshClicked"></paper-icon-button>
+          </template>
+        </app-toolbar>
+        <paper-tabs scrollable="" selected="[[page]]" attr-for-selected="page-name" on-iron-activate="handlePageSelected">
+          <paper-tab page-name="dashboard">Dashboard</paper-tab>
+          <paper-tab page-name="snapshots">Snapshots</paper-tab>
+          <paper-tab page-name="store">Add-on store</paper-tab>
+          <paper-tab page-name="system">System</paper-tab>
+        </paper-tabs>
+      </app-header>
+      <template is="dom-if" if="[[equals(page, &quot;dashboard&quot;)]]">
+        <hassio-dashboard hass="[[hass]]" supervisor-info="[[supervisorInfo]]" hass-info="[[hassInfo]]"></hassio-dashboard>
+      </template>
+      <template is="dom-if" if="[[equals(page, &quot;snapshots&quot;)]]">
+        <hassio-snapshots hass="[[hass]]" installed-addons="[[supervisorInfo.addons]]" snapshot-slug="{{snapshotSlug}}" snapshot-deleted="{{snapshotDeleted}}"></hassio-snapshots>
+      </template>
+      <template is="dom-if" if="[[equals(page, &quot;store&quot;)]]">
+        <hassio-addon-store hass="[[hass]]"></hassio-addon-store>
+      </template>
+      <template is="dom-if" if="[[equals(page, &quot;system&quot;)]]">
+        <hassio-system hass="[[hass]]" supervisor-info="[[supervisorInfo]]" host-info="[[hostInfo]]"></hassio-system>
+      </template>
+    </app-header-layout>
+
+    <hassio-markdown-dialog title="[[markdownTitle]]" content="[[markdownContent]]"></hassio-markdown-dialog>
+
+    <template is="dom-if" if="[[equals(page, &quot;snapshots&quot;)]]">
+      <hassio-snapshot hass="[[hass]]" snapshot-slug="{{snapshotSlug}}" snapshot-deleted="{{snapshotDeleted}}"></hassio-snapshot>
+    </template>
+`;
+  }
+
+  static get is() { return 'hassio-pages-with-tabs'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      showMenu: Boolean,
+      narrow: Boolean,
+      page: String,
+      supervisorInfo: Object,
+      hostInfo: Object,
+      hassInfo: Object,
+      snapshotSlug: String,
+      snapshotDeleted: Boolean,
+
+      markdownTitle: String,
+      markdownContent: {
+        type: String,
+        value: '',
+      },
+    };
+  }
+
+  ready() {
+    super.ready();
+    this.addEventListener('hassio-markdown-dialog', ev => this.openMarkdown(ev));
+  }
+
+  handlePageSelected(ev) {
+    const newPage = ev.detail.item.getAttribute('page-name');
+    if (newPage !== this.page) {
+      this.navigate(`/hassio/${newPage}`);
+    }
+  }
+
+  equals(a, b) {
+    return a === b;
+  }
+
+  showRefreshButton(page) {
+    return page === 'store' || page === 'snapshots';
+  }
+
+  refreshClicked() {
+    if (this.page === 'snapshots') {
+      this.shadowRoot.querySelector('hassio-snapshots').refreshData();
+    } else {
+      this.shadowRoot.querySelector('hassio-addon-store').refreshData();
+    }
+  }
+
+  openMarkdown(ev) {
+    this.setProperties({
+      markdownTitle: ev.detail.title,
+      markdownContent: ev.detail.content,
+    });
+    this.shadowRoot.querySelector('hassio-markdown-dialog').openDialog();
+  }
+}
+
+customElements.define(HassioPagesWithTabs.is, HassioPagesWithTabs);
diff --git a/hassio/index.html b/hassio/index.html
index 8e21a64064..d5a816c12a 100644
--- a/hassio/index.html
+++ b/hassio/index.html
@@ -16,20 +16,21 @@
   <body>
     <hassio-app></hassio-app>
     <script>
-      function addScript(src) {
-        var e = document.createElement('script');
-        e.src = src;
-        document.head.appendChild(e);
-      }
-      var webComponentsSupported = (
-        'customElements' in window &&
-        'import' in document.createElement('link') &&
-        'content' in document.createElement('template'));
-      if (!webComponentsSupported) {
-        addScript('/static/webcomponents-lite.js');
-      }
+    function addScript(src) {
+      var e = document.createElement('script');
+      e.src = src;
+      document.head.appendChild(e);
+    }
+    var webComponentsSupported = (
+      'customElements' in window &&
+      'import' in document.createElement('link') &&
+      'content' in document.createElement('template'));
+    if (!webComponentsSupported) {
+      addScript('/static/webcomponents-bundle.js');
+    }
     </script>
-    <link rel='import' href='./hassio-app.html'>
+    <!-- This is broken. -->
+    <script src="./hassio-app.js"></script>
     <link rel='import' href='/static/mdi.html' async>
   </body>
 </html>
diff --git a/hassio/snapshots/hassio-snapshot.html b/hassio/snapshots/hassio-snapshot.js
similarity index 69%
rename from hassio/snapshots/hassio-snapshot.html
rename to hassio/snapshots/hassio-snapshot.js
index 483c9167db..5c3801d444 100644
--- a/hassio/snapshots/hassio-snapshot.html
+++ b/hassio/snapshots/hassio-snapshot.js
@@ -1,17 +1,19 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/paper-dialog/paper-dialog.html'>
-<link rel='import' href='../../bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html'>
-<link rel='import' href='../../bower_components/app-layout/app-toolbar/app-toolbar.html'>
-<link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
-<link rel='import' href='../../bower_components/paper-checkbox/paper-checkbox.html'>
-<link rel='import' href='../../bower_components/paper-button/paper-button.html'>
-<link rel="import" href='../../bower_components/paper-input/paper-input.html'>
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-checkbox/paper-checkbox.js';
+import '@polymer/paper-dialog-scrollable/paper-dialog-scrollable.js';
+import '@polymer/paper-dialog/paper-dialog.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/resources/ha-style.html'>
+import '../../src/resources/ha-style.js';
 
-<dom-module id='hassio-snapshot'>
-  <template>
-    <style include='ha-style-dialog'>
+class HassioSnapshot extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="ha-style-dialog">
       paper-dialog {
         min-width: 350px;
         font-size: 14px;
@@ -54,72 +56,58 @@
         color: var(--google-red-500);
       }
     </style>
-    <paper-dialog id='dialog' with-backdrop on-iron-overlay-closed='_dialogClosed'>
+    <paper-dialog id="dialog" with-backdrop="" on-iron-overlay-closed="_dialogClosed">
       <app-toolbar>
-        <paper-icon-button
-          icon='mdi:close'
-          dialog-dismiss
-        ></paper-icon-button>
-        <div main-title>[[_computeName(snapshot)]]</div>
+        <paper-icon-button icon="mdi:close" dialog-dismiss=""></paper-icon-button>
+        <div main-title="">[[_computeName(snapshot)]]</div>
       </app-toolbar>
-      <div class='details'>
-        [[_computeType(snapshot.type)]] ([[_computeSize(snapshot.size)]])<br/>
+      <div class="details">
+        [[_computeType(snapshot.type)]] ([[_computeSize(snapshot.size)]])<br>
         [[_formatDatetime(snapshot.date)]]
       </div>
       <div>Home Assistant:</div>
-      <paper-checkbox checked='{{restoreHass}}'>
+      <paper-checkbox checked="{{restoreHass}}">
         Home Assistant [[snapshot.homeassistant]]
       </paper-checkbox>
-      <template is='dom-if' if='[[snapshot.addons.length]]'>
+      <template is="dom-if" if="[[snapshot.addons.length]]">
         <div>Folders:</div>
-        <template is='dom-repeat' items='[[snapshot.folders]]'>
-          <paper-checkbox checked='{{item.checked}}'>
+        <template is="dom-repeat" items="[[snapshot.folders]]">
+          <paper-checkbox checked="{{item.checked}}">
             [[item.name]]
           </paper-checkbox>
         </template>
       </template>
-      <template is='dom-if' if='[[snapshot.addons.length]]'>
+      <template is="dom-if" if="[[snapshot.addons.length]]">
         <div>Add-ons:</div>
         <paper-dialog-scrollable>
-          <template is='dom-repeat' items='[[snapshot.addons]]' sort='_sortAddons'>
-            <paper-checkbox checked='{{item.checked}}'>
+          <template is="dom-repeat" items="[[snapshot.addons]]" sort="_sortAddons">
+            <paper-checkbox checked="{{item.checked}}">
               [[item.name]]
-              <span class='details'>([[item.version]])</span>
+              <span class="details">([[item.version]])</span>
             </paper-checkbox>
           </template>
         </paper-dialog-scrollable>
       </template>
-      <template is='dom-if' if='[[snapshot.protected]]'>
-        <paper-input autofocus label='Password' type='password' value='{{snapshotPassword}}'></paper-input>
+      <template is="dom-if" if="[[snapshot.protected]]">
+        <paper-input autofocus="" label="Password" type="password" value="{{snapshotPassword}}"></paper-input>
       </template>
-      <template is='dom-if' if='[[error]]'>
-        <p class='error'>Error: [[error]]</p>
+      <template is="dom-if" if="[[error]]">
+        <p class="error">Error: [[error]]</p>
       </template>
-      <div class='buttons'>
-        <paper-icon-button
-          icon='mdi:delete'
-          on-click='_deleteClicked'
-          class='warning'
-          title='Delete snapshot'
-        ></paper-icon-button>
-        <a href='[[_computeDownloadUrl(snapshotSlug)]]' download='[[_computeDownloadName(snapshot)]]'>
-          <paper-icon-button
-            icon='mdi:download'
-            class='download'
-            title='Download snapshot'
-          ></paper-icon-button>
+      <div class="buttons">
+        <paper-icon-button icon="mdi:delete" on-click="_deleteClicked" class="warning" title="Delete snapshot"></paper-icon-button>
+        <a href="[[_computeDownloadUrl(snapshotSlug)]]" download="[[_computeDownloadName(snapshot)]]">
+          <paper-icon-button icon="mdi:download" class="download" title="Download snapshot"></paper-icon-button>
         </a>
-        <paper-button on-click='_partialRestoreClicked'>Restore selected</paper-button>
-        <template is='dom-if' if='[[_isFullSnapshot(snapshot.type)]]'>
-          <paper-button on-click='_fullRestoreClicked'>Wipe &amp; restore</paper-button>
+        <paper-button on-click="_partialRestoreClicked">Restore selected</paper-button>
+        <template is="dom-if" if="[[_isFullSnapshot(snapshot.type)]]">
+          <paper-button on-click="_fullRestoreClicked">Wipe &amp; restore</paper-button>
         </template>
       </div>
     </paper-dialog>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioSnapshot extends Polymer.Element {
   static get is() { return 'hassio-snapshot'; }
 
   static get properties() {
@@ -267,4 +255,3 @@ class HassioSnapshot extends Polymer.Element {
   }
 }
 customElements.define(HassioSnapshot.is, HassioSnapshot);
-</script>
diff --git a/hassio/snapshots/hassio-snapshots.html b/hassio/snapshots/hassio-snapshots.js
similarity index 65%
rename from hassio/snapshots/hassio-snapshots.html
rename to hassio/snapshots/hassio-snapshots.js
index b53dcf9a89..be062de773 100644
--- a/hassio/snapshots/hassio-snapshots.html
+++ b/hassio/snapshots/hassio-snapshots.js
@@ -1,19 +1,20 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-<link rel='import' href='../../bower_components/paper-radio-group/paper-radio-group.html'>
-<link rel='import' href='../../bower_components/paper-radio-button/paper-radio-button.html'>
-<link rel='import' href='../../bower_components/paper-checkbox/paper-checkbox.html'>
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-checkbox/paper-checkbox.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-radio-button/paper-radio-button.js';
+import '@polymer/paper-radio-group/paper-radio-group.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../../src/components/hassio-card-content.js';
+import '../../src/resources/hassio-style.js';
+import '../../src/util/hass-mixins.js';
 
-<link rel='import' href='../../src/components/hassio-card-content.html'>
-<link rel='import' href='../../src/resources/hassio-style.html'>
-
-<dom-module id="hassio-snapshots">
-  <template>
-    <style include='ha-style hassio-style'>
+class HassioSnapshots extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="ha-style hassio-style">
       paper-radio-group {
         display: block;
       }
@@ -30,83 +31,75 @@
         cursor: pointer;
       }
     </style>
-    <div class='content'>
-      <div class='card-group'>
-        <div class='title'>
+    <div class="content">
+      <div class="card-group">
+        <div class="title">
           Create snapshot
-          <div class='description'>
+          <div class="description">
             Snapshots allow you to easily backup and
             restore all data of your Hass.io instance.
           </div>
         </div>
         <paper-card>
-          <div class='card-content'>
-            <paper-input autofocus label='Name' value='{{snapshotName}}'></paper-input>
+          <div class="card-content">
+            <paper-input autofocus="" label="Name" value="{{snapshotName}}"></paper-input>
             Type:
-            <paper-radio-group selected='{{snapshotType}}'>
-              <paper-radio-button name='full'>
+            <paper-radio-group selected="{{snapshotType}}">
+              <paper-radio-button name="full">
                 Full snapshot
               </paper-radio-button>
-              <paper-radio-button name='partial'>
+              <paper-radio-button name="partial">
                 Partial snapshot
               </paper-radio-button>
             </paper-radio-group>
-            <template is='dom-if' if='[[!_fullSelected(snapshotType)]]'>
+            <template is="dom-if" if="[[!_fullSelected(snapshotType)]]">
               Folders:
-              <template is='dom-repeat' items='[[folderList]]'>
-                <paper-checkbox checked='{{item.checked}}'>
+              <template is="dom-repeat" items="[[folderList]]">
+                <paper-checkbox checked="{{item.checked}}">
                   [[item.name]]
                 </paper-checkbox>
               </template>
               Add-ons:
-              <template is='dom-repeat' items='[[addonList]]' sort='_sortAddons'>
-                <paper-checkbox checked='{{item.checked}}'>
+              <template is="dom-repeat" items="[[addonList]]" sort="_sortAddons">
+                <paper-checkbox checked="{{item.checked}}">
                   [[item.name]]
                 </paper-checkbox>
               </template>
             </template>
             Security:
-            <paper-checkbox checked='{{snapshotHasPassword}}'>Password protection</paper-checkbox>
-            <template is='dom-if' if='[[snapshotHasPassword]]'>
-              <paper-input label='Password' type='password' value='{{snapshotPassword}}'></paper-input>
+            <paper-checkbox checked="{{snapshotHasPassword}}">Password protection</paper-checkbox>
+            <template is="dom-if" if="[[snapshotHasPassword]]">
+              <paper-input label="Password" type="password" value="{{snapshotPassword}}"></paper-input>
             </template>
-            <template is='dom-if' if='[[error]]'>
-              <p class='error'>[[error]]</p>
+            <template is="dom-if" if="[[error]]">
+              <p class="error">[[error]]</p>
             </template>
           </div>
-          <div class='card-actions'>
-            <paper-button disabled='[[creatingSnapshot]]' on-click='_createSnapshot'>Create</paper-button>
+          <div class="card-actions">
+            <paper-button disabled="[[creatingSnapshot]]" on-click="_createSnapshot">Create</paper-button>
           </div>
         </paper-card>
       </div>
 
-      <div class='card-group'>
-        <div class='title'>Available snapshots</div>
-        <template is='dom-if' if='[[!snapshots.length]]'>
+      <div class="card-group">
+        <div class="title">Available snapshots</div>
+        <template is="dom-if" if="[[!snapshots.length]]">
           <paper-card>
-            <div class='card-content'>You don't have any snapshots yet.</div>
+            <div class="card-content">You don't have any snapshots yet.</div>
           </paper-card>
         </template>
-        <template is='dom-repeat' items='[[snapshots]]' as='snapshot' sort='_sortSnapshots'>
-          <paper-card class='pointer' on-click='_snapshotClicked'>
-            <div class='card-content'>
-              <hassio-card-content
-                title='[[_computeName(snapshot)]]'
-                description='[[_computeDetails(snapshot)]]'
-                datetime='[[snapshot.date]]'
-                icon='[[_computeIcon(snapshot.type)]]'
-                icon-class='snapshot'
-              ></hassio-card-content>
+        <template is="dom-repeat" items="[[snapshots]]" as="snapshot" sort="_sortSnapshots">
+          <paper-card class="pointer" on-click="_snapshotClicked">
+            <div class="card-content">
+              <hassio-card-content title="[[_computeName(snapshot)]]" description="[[_computeDetails(snapshot)]]" datetime="[[snapshot.date]]" icon="[[_computeIcon(snapshot.type)]]" icon-class="snapshot"></hassio-card-content>
             </div>
           </paper-card>
         </template>
       </div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioSnapshots extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'hassio-snapshots'; }
 
   static get properties() {
@@ -269,4 +262,3 @@ class HassioSnapshots extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HassioSnapshots.is, HassioSnapshots);
-</script>
diff --git a/hassio/system/hassio-host-info.html b/hassio/system/hassio-host-info.js
similarity index 68%
rename from hassio/system/hassio-host-info.html
rename to hassio/system/hassio-host-info.js
index 8f86927619..84039ee3b7 100644
--- a/hassio/system/hassio-host-info.html
+++ b/hassio/system/hassio-host-info.js
@@ -1,12 +1,14 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
+import '../../src/components/buttons/ha-call-api-button.js';
+import '../../src/util/hass-mixins.js';
 
-<dom-module id="hassio-host-info">
-  <template>
+class HassioHostInfo extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       paper-card {
         display: inline-block;
@@ -43,8 +45,8 @@
     <paper-card>
       <div class="card-content">
         <h2>Host system</h2>
-        <table class='info'>
-          <tr>
+        <table class="info">
+          <tbody><tr>
             <td>Hostname</td>
             <td>[[data.hostname]]</td>
           </tr>
@@ -56,44 +58,27 @@
             <td>Deployment</td>
             <td>[[data.deployment]]</td>
           </tr>
-        </table>
-        <paper-button
-          raised
-          on-click='_showHardware'
-          class='info'
-        >Show hardware</paper-button>
-        <template is='dom-if' if='[[errors]]'>
-          <div class='errors'>Error: [[errors]]</div>
+        </tbody></table>
+        <paper-button raised="" on-click="_showHardware" class="info">Show hardware</paper-button>
+        <template is="dom-if" if="[[errors]]">
+          <div class="errors">Error: [[errors]]</div>
         </template>
       </div>
       <div class="card-actions">
-        <template is='dom-if' if='[[computeRebootAvailable(data)]]'>
-          <ha-call-api-button
-            class='warning'
-            hass='[[hass]]'
-            path="hassio/host/reboot"
-          >Reboot</ha-call-api-button>
+        <template is="dom-if" if="[[computeRebootAvailable(data)]]">
+          <ha-call-api-button class="warning" hass="[[hass]]" path="hassio/host/reboot">Reboot</ha-call-api-button>
         </template>
-        <template is='dom-if' if='[[computeShutdownAvailable(data)]]'>
-          <ha-call-api-button
-            class='warning'
-            hass='[[hass]]'
-            path="hassio/host/shutdown"
-          >Shutdown</ha-call-api-button>
+        <template is="dom-if" if="[[computeShutdownAvailable(data)]]">
+          <ha-call-api-button class="warning" hass="[[hass]]" path="hassio/host/shutdown">Shutdown</ha-call-api-button>
         </template>
-        <template is='dom-if' if='[[computeUpdateAvailable(data)]]'>
-          <ha-call-api-button
-            hass='[[hass]]'
-            path="hassio/host/update"
-          >Update</ha-call-api-button>
+        <template is="dom-if" if="[[computeUpdateAvailable(data)]]">
+          <ha-call-api-button hass="[[hass]]" path="hassio/host/update">Update</ha-call-api-button>
         </template>
       </div>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioHostInfo extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'hassio-host-info'; }
 
   static get properties() {
@@ -170,4 +155,3 @@ class HassioHostInfo extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HassioHostInfo.is, HassioHostInfo);
-</script>
diff --git a/hassio/system/hassio-supervisor-info.html b/hassio/system/hassio-supervisor-info.js
similarity index 64%
rename from hassio/system/hassio-supervisor-info.html
rename to hassio/system/hassio-supervisor-info.js
index 08cc155470..64d36c9aff 100644
--- a/hassio/system/hassio-supervisor-info.html
+++ b/hassio/system/hassio-supervisor-info.js
@@ -1,12 +1,14 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
-<link rel="import" href="../../src/components/buttons/ha-call-api-button.html">
+import '../../src/components/buttons/ha-call-api-button.js';
+import '../../src/util/hass-mixins.js';
 
-<dom-module id="hassio-supervisor-info">
-  <template>
+class HassioSupervisorInfo extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       paper-card {
         display: inline-block;
@@ -37,8 +39,8 @@
     <paper-card>
       <div class="card-content">
         <h2>Hass.io supervisor</h2>
-        <table class='info'>
-          <tr>
+        <table class="info">
+          <tbody><tr>
             <td>Version</td>
             <td>
               [[data.version]]
@@ -48,49 +50,33 @@
             <td>Latest version</td>
             <td>[[data.last_version]]</td>
           </tr>
-          <template is='dom-if' if='[[!_equals(data.channel, "stable")]]'>
+          <template is="dom-if" if="[[!_equals(data.channel, &quot;stable&quot;)]]">
             <tr>
               <td>Channel</td>
               <td>[[data.channel]]</td>
             </tr>
           </template>
-        </table>
-        <template is='dom-if' if='[[errors]]'>
-          <div class='errors'>Error: [[errors]]</div>
+        </tbody></table>
+        <template is="dom-if" if="[[errors]]">
+          <div class="errors">Error: [[errors]]</div>
         </template>
       </div>
       <div class="card-actions">
-        <ha-call-api-button
-          hass='[[hass]]'
-          path="hassio/supervisor/reload"
-        >Reload</ha-call-api-button>
-        <template is='dom-if' if='[[computeUpdateAvailable(data)]]'>
-          <ha-call-api-button
-            hass='[[hass]]'
-            path="hassio/supervisor/update"
-          >Update</ha-call-api-button>
+        <ha-call-api-button hass="[[hass]]" path="hassio/supervisor/reload">Reload</ha-call-api-button>
+        <template is="dom-if" if="[[computeUpdateAvailable(data)]]">
+          <ha-call-api-button hass="[[hass]]" path="hassio/supervisor/update">Update</ha-call-api-button>
         </template>
-        <template is='dom-if' if='[[_equals(data.channel, "beta")]]'>
-          <ha-call-api-button
-            hass='[[hass]]'
-            path='hassio/supervisor/options'
-            data='[[leaveBeta]]'
-          >Leave beta channel</ha-call-api-button>
+        <template is="dom-if" if="[[_equals(data.channel, &quot;beta&quot;)]]">
+          <ha-call-api-button hass="[[hass]]" path="hassio/supervisor/options" data="[[leaveBeta]]">Leave beta channel</ha-call-api-button>
         </template>
-        <template is='dom-if' if='[[_equals(data.channel, "stable")]]'>
-          <paper-button
-            on-click='_joinBeta'
-            class='warning'
-            title='Get beta updates for Home Assistant (RCs), supervisor and host'
-          >Join beta channel</paper-button>
+        <template is="dom-if" if="[[_equals(data.channel, &quot;stable&quot;)]]">
+          <paper-button on-click="_joinBeta" class="warning" title="Get beta updates for Home Assistant (RCs), supervisor and host">Join beta channel</paper-button>
         </template>
       </div>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioSupervisorInfo extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'hassio-supervisor-info'; }
 
   static get properties() {
@@ -167,4 +153,3 @@ This inludes beta releases for:
 }
 
 customElements.define(HassioSupervisorInfo.is, HassioSupervisorInfo);
-</script>
\ No newline at end of file
diff --git a/hassio/system/hassio-supervisor-log.html b/hassio/system/hassio-supervisor-log.js
similarity index 57%
rename from hassio/system/hassio-supervisor-log.html
rename to hassio/system/hassio-supervisor-log.js
index 0e2bad02c2..4889b5c083 100644
--- a/hassio/system/hassio-supervisor-log.html
+++ b/hassio/system/hassio-supervisor-log.js
@@ -1,27 +1,27 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel='import' href='../../bower_components/paper-card/paper-card.html'>
-<link rel='import' href='../../bower_components/paper-button/paper-button.html'>
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="hassio-supervisor-log">
-  <template>
+class HassioSupervisorLog extends PolymerElement {
+  static get template() {
+    return html`
     <style include="ha-style">
       paper-card {
         display: block;
       }
     </style>
     <paper-card>
-      <div class='card-content'>
+      <div class="card-content">
         <pre>[[log]]</pre>
       </div>
-      <div class='card-actions'>
-        <paper-button on-click='refreshTapped'>Refresh</paper-button>
+      <div class="card-actions">
+        <paper-button on-click="refreshTapped">Refresh</paper-button>
       </div>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioSupervisorLog extends Polymer.Element {
   static get is() { return 'hassio-supervisor-log'; }
 
   static get properties() {
@@ -51,4 +51,3 @@ class HassioSupervisorLog extends Polymer.Element {
 }
 
 customElements.define(HassioSupervisorLog.is, HassioSupervisorLog);
-</script>
\ No newline at end of file
diff --git a/hassio/system/hassio-system.html b/hassio/system/hassio-system.html
deleted file mode 100644
index ba62bacf3d..0000000000
--- a/hassio/system/hassio-system.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel="import" href="./hassio-host-info.html">
-<link rel="import" href="./hassio-supervisor-info.html">
-<link rel='import' href='./hassio-supervisor-log.html'>
-
-<dom-module id="hassio-system">
-  <template>
-    <style include="iron-flex ha-style">
-      .content {
-        margin: 4px;
-      }
-      .title {
-        margin-top: 24px;
-        color: var(--primary-text-color);
-        font-size: 2em;
-        padding-left: 8px;
-        margin-bottom: 8px;
-      }
-    </style>
-    <div class='content'>
-      <div class='title'>Information</div>
-      <hassio-supervisor-info
-        hass='[[hass]]'
-        data='[[supervisorInfo]]'
-      ></hassio-supervisor-info>
-      <hassio-host-info
-        hass='[[hass]]'
-        data='[[hostInfo]]'
-      ></hassio-host-info>
-      <div class='title'>System log</div>
-      <hassio-supervisor-log
-        hass='[[hass]]'
-      ></hassio-supervisor-log>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-class HassioSystem extends Polymer.Element {
-  static get is() { return 'hassio-system'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      supervisorInfo: Object,
-      hostInfo: Object,
-    };
-  }
-}
-
-customElements.define(HassioSystem.is, HassioSystem);
-</script>
\ No newline at end of file
diff --git a/hassio/system/hassio-system.js b/hassio/system/hassio-system.js
new file mode 100644
index 0000000000..3654d2a835
--- /dev/null
+++ b/hassio/system/hassio-system.js
@@ -0,0 +1,45 @@
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import './hassio-host-info.js';
+import './hassio-supervisor-info.js';
+import './hassio-supervisor-log.js';
+
+class HassioSystem extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style">
+      .content {
+        margin: 4px;
+      }
+      .title {
+        margin-top: 24px;
+        color: var(--primary-text-color);
+        font-size: 2em;
+        padding-left: 8px;
+        margin-bottom: 8px;
+      }
+    </style>
+    <div class="content">
+      <div class="title">Information</div>
+      <hassio-supervisor-info hass="[[hass]]" data="[[supervisorInfo]]"></hassio-supervisor-info>
+      <hassio-host-info hass="[[hass]]" data="[[hostInfo]]"></hassio-host-info>
+      <div class="title">System log</div>
+      <hassio-supervisor-log hass="[[hass]]"></hassio-supervisor-log>
+    </div>
+`;
+  }
+
+  static get is() { return 'hassio-system'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      supervisorInfo: Object,
+      hostInfo: Object,
+    };
+  }
+}
+
+customElements.define(HassioSystem.is, HassioSystem);
diff --git a/index.html b/index.html
index a5b8ad32f7..a2b7ad3080 100644
--- a/index.html
+++ b/index.html
@@ -87,27 +87,23 @@
       if (!webComponentsSupported) {
         var e = document.createElement('script');
         e.onerror = initError;
-        e.src = '/static/webcomponents-lite.js';
+        e.src = '/static/webcomponents-bundle.js';
         if ('import' in document.createElement('link')) {
           document.write(e.outerHTML);
         } else {
           document.head.appendChild(e);
         }
       }
-      if ('serviceWorker' in navigator) {
+      /* if ('serviceWorker' in navigator) {
         window.addEventListener('load', function () {
           navigator.serviceWorker.register('/service_worker.js');
         });
-      }
-      window.CHART_SCRIPT = '/home-assistant-polymer/src/resources/ha-chart-scripts.html';
+      } */
     </script>
     <!--<script src='/home-assistant-polymer/build/_demo_data_compiled.js'></script>-->
     <!--EXTRA_SCRIPTS-->
     <script src='/home-assistant-polymer/build/core.js'></script>
-    <link rel='import' href='/home-assistant-polymer/src/home-assistant.html' onerror='initError()'>
-    {% if panel_url -%}
-      <link rel='import' href='{{ panel_url }}' async>
-    {% endif -%}
+    <script src='/home-assistant-polymer/build/webpack/app.js'></script>
     <link rel='import' href='/home-assistant-polymer/hass_frontend/mdi.html' async>
     {% for extra_url in extra_urls -%}
       <link rel='import' href='{{ extra_url }}' async>
diff --git a/package.json b/package.json
index e525165859..d5b7a327a3 100644
--- a/package.json
+++ b/package.json
@@ -1,48 +1,104 @@
 {
-  "name": "home-assistant-polymer",
-  "version": "1.0.0",
   "description": "A frontend for Home Assistant using the Polymer framework",
   "repository": {
     "type": "git",
     "url": "https://github.com/home-assistant/home-assistant-polymer"
   },
+  "name": "home-assistant-frontend",
+  "version": "1.0.0",
   "scripts": {
     "clean": "rm -rf build/* build-temp/* build-es5/* build-temp-es5/* build-translations/*",
     "gulp": "gulp",
-    "build": "BUILD_DEV=0 gulp",
+    "build": "BUILD_DEV=0 gulp && NODE_ENV=production webpack -p",
     "build_demo": "BUILD_DEV=0 BUILD_DEMO=1 gulp",
     "dev": "npm run gulp ru_all gen-service-worker",
     "dev-watch": "npm run gulp watch_ru_all gen-service-worker",
     "dev-es5": "npm run gulp ru_all_es5 gen-service-worker-es5",
     "dev-watch-es5": "npm run gulp watch_ru_all_es5 gen-service-worker-es5",
-    "lint_js": "eslint src panels js hassio test-mocha --ext js,html",
-    "lint_html": "find src panels hassio -name '*.html' | grep -v hassio/index.html | xargs polymer lint --input",
+    "lint_js": "eslint src panels js hassio test-mocha",
+    "lint_html": "polymer lint",
     "mocha": "node_modules/.bin/mocha --opts test-mocha/mocha.opts",
     "test": "npm run lint_js && npm run lint_html && npm run mocha"
   },
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "Apache-2.0",
   "dependencies": {
+    "@polymer/app-layout": "^3.0.0-pre.18",
+    "@polymer/app-localize-behavior": "^3.0.0-pre.18",
+    "@polymer/app-route": "^3.0.0-pre.18",
+    "@polymer/app-storage": "^3.0.0-pre.18",
+    "@polymer/font-roboto": "^3.0.0-pre.18",
+    "@polymer/font-roboto-local": "^3.0.0-pre.19",
+    "@polymer/iron-autogrow-textarea": "^3.0.0-pre.18",
+    "@polymer/iron-flex-layout": "^3.0.0-pre.18",
+    "@polymer/iron-icon": "^3.0.0-pre.18",
+    "@polymer/iron-iconset-svg": "^3.0.0-pre.19",
+    "@polymer/iron-image": "^3.0.0-pre.18",
+    "@polymer/iron-input": "^3.0.0-pre.18",
+    "@polymer/iron-label": "^3.0.0-pre.18",
+    "@polymer/iron-media-query": "^3.0.0-pre.18",
+    "@polymer/iron-pages": "^3.0.0-pre.18",
+    "@polymer/iron-resizable-behavior": "^3.0.0-pre.19",
+    "@polymer/neon-animation": "^3.0.0-pre.18",
+    "@polymer/paper-button": "^3.0.0-pre.18",
+    "@polymer/paper-card": "^3.0.0-pre.18",
+    "@polymer/paper-checkbox": "^3.0.0-pre.18",
+    "@polymer/paper-dialog": "^3.0.0-pre.18",
+    "@polymer/paper-dialog-behavior": "^3.0.0-pre.19",
+    "@polymer/paper-dialog-scrollable": "^3.0.0-pre.18",
+    "@polymer/paper-drawer-panel": "^3.0.0-pre.18",
+    "@polymer/paper-dropdown-menu": "^3.0.0-pre.18",
+    "@polymer/paper-fab": "^3.0.0-pre.18",
+    "@polymer/paper-icon-button": "^3.0.0-pre.18",
+    "@polymer/paper-input": "^3.0.0-pre.18",
+    "@polymer/paper-item": "^3.0.0-pre.18",
+    "@polymer/paper-listbox": "^3.0.0-pre.18",
+    "@polymer/paper-menu-button": "^3.0.0-pre.18",
+    "@polymer/paper-progress": "^3.0.0-pre.18",
+    "@polymer/paper-radio-button": "^3.0.0-pre.18",
+    "@polymer/paper-radio-group": "^3.0.0-pre.18",
+    "@polymer/paper-ripple": "^3.0.0-pre.19",
+    "@polymer/paper-scroll-header-panel": "^3.0.0-pre.18",
+    "@polymer/paper-slider": "^3.0.0-pre.18",
+    "@polymer/paper-spinner": "^3.0.0-pre.18",
+    "@polymer/paper-styles": "^3.0.0-pre.18",
+    "@polymer/paper-tabs": "^3.0.0-pre.18",
+    "@polymer/paper-toast": "^3.0.0-pre.18",
+    "@polymer/paper-toggle-button": "^3.0.0-pre.18",
+    "@polymer/polymer": "^3.0.0",
+    "@vaadin/vaadin-combo-box": "4.0.1-pre.1",
+    "@vaadin/vaadin-date-picker": "3.0.0-pre.3",
+    "@webcomponents/shadycss": "^1.0.0",
+    "@webcomponents/webcomponentsjs": "^2.0.0",
+    "chart.js": "~2.7.2",
+    "chartjs-chart-timeline": "0.2.0",
     "es6-object-assign": "^1.1.0",
     "fecha": "^2.3.3",
     "home-assistant-js-websocket": "^1.2.1",
+    "intl-messageformat": "^2.2.0",
+    "leaflet": "^1.0.2",
+    "marked": "^0.3.19",
     "mdn-polyfills": "^5.5.0",
+    "moment": "^2.20.0",
     "preact": "^8.2.6",
-    "unfetch": "^3.0.0"
+    "unfetch": "^3.0.0",
+    "web-animations-js": "^2.3.1",
+    "xss": "^0.3.8"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
+    "babel-eslint": "^8.2.3",
+    "babel-loader": "^7.1.4",
     "babel-plugin-external-helpers": "^6.22.0",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-react-jsx": "^6.24.1",
     "babel-preset-env": "^1.6.1",
-    "bower": "^1.8.2",
     "chai": "^4.1.2",
     "css-slam": "^2.0.2",
     "del": "^3.0.0",
     "eslint": "^4.11.0",
     "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-plugin-html": "^4.0.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-react": "^7.0.0",
     "gulp": "^3.9.1",
@@ -71,7 +127,7 @@
     "polymer-analyzer": "^2.3.0",
     "polymer-build": "^2.1.0",
     "polymer-bundler": "^3.1.0",
-    "polymer-cli": "^1.5.6",
+    "polymer-cli": "^1.7.0",
     "pump": "^3.0.0",
     "reify": "^0.14.1",
     "require-dir": "^1.0.0",
@@ -86,6 +142,19 @@
     "sw-precache": "^5.2.0",
     "uglify-es": "^3.1.9",
     "uglify-js": "^3.1.9",
-    "web-component-tester": "^6.4.0"
-  }
+    "wct-browser-legacy": "^1.0.0",
+    "web-component-tester": "^6.6.0",
+    "webpack": "^4.8.1",
+    "webpack-cli": "^2.1.3"
+  },
+  "resolutions": {
+    "inherits": "2.0.3",
+    "samsam": "1.1.3",
+    "supports-color": "3.1.2",
+    "type-detect": "1.0.0",
+    "@webcomponents/webcomponentsjs": "2.0.0-beta.2",
+    "@vaadin/vaadin-overlay": "3.0.2-pre.2",
+    "fecha": "https://github.com/balloob/fecha/archive/51d14fd0eb4781e2ecf265d1c3080706259133b5.tar.gz"
+  },
+  "main": "src/home-assistant.js"
 }
diff --git a/panels/config/automation/ha-automation-editor.html b/panels/config/automation/ha-automation-editor.js
similarity index 67%
rename from panels/config/automation/ha-automation-editor.html
rename to panels/config/automation/ha-automation-editor.js
index b7cbd6497a..ec07f6925d 100644
--- a/panels/config/automation/ha-automation-editor.html
+++ b/panels/config/automation/ha-automation-editor.js
@@ -1,32 +1,38 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-textarea.html">
-<link rel="import" href="../../../bower_components/paper-radio-button/paper-radio-button.html">
-<link rel="import" href="../../../bower_components/paper-radio-group/paper-radio-group.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu-light.html">
-<link rel="import" href="../../../bower_components/paper-listbox/paper-listbox.html">
-<link rel="import" href="../../../bower_components/paper-menu-button/paper-menu-button.html">
-<link rel="import" href="../../../bower_components/paper-fab/paper-fab.html">
-<link rel="import" href="../../../bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/iron-autogrow-textarea/iron-autogrow-textarea.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu-light.js';
+import '@polymer/paper-fab/paper-fab.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-input/paper-textarea.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import '@polymer/paper-menu-button/paper-menu-button.js';
+import '@polymer/paper-radio-button/paper-radio-button.js';
+import '@polymer/paper-radio-group/paper-radio-group.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/components/entity/ha-entity-picker.html'>
-<link rel='import' href='../../../src/components/ha-combo-box.html'>
-<link rel='import' href='../../../src/components/ha-markdown.html'>
-<link rel='import' href='../../../src/components/ha-service-picker.html'>
-<link rel='import' href='../../../src/layouts/ha-app-layout.html'>
-<link rel='import' href='../../../src/util/hass-mixins.html'>
+import '../../../src/components/entity/ha-entity-picker.js';
+import '../../../src/components/ha-combo-box.js';
+import '../../../src/components/ha-markdown.js';
+import '../../../src/components/ha-service-picker.js';
+import '../../../src/layouts/ha-app-layout.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-js.js';
+import '../ha-config-section.js';
 
-<link rel="import" href="../ha-config-section.html">
-<link rel="import" href="../ha-config-js.html">
-
-<dom-module id="ha-automation-editor">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaAutomationEditor extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
     <style include="ha-style">
       .errors {
         padding: 20px;
@@ -83,42 +89,25 @@
       }
     </style>
 
-    <ha-app-layout has-scrolling-region>
-      <app-header slot="header" fixed>
+    <ha-app-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
         <app-toolbar>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='backTapped'
-          ></paper-icon-button>
-          <div main-title>[[name]]</div>
+          <paper-icon-button icon="mdi:arrow-left" on-click="backTapped"></paper-icon-button>
+          <div main-title="">[[name]]</div>
         </app-toolbar>
       </app-header>
 
-      <div class='content'>
-        <template is='dom-if' if='[[errors]]'>
-          <div class='errors'>[[errors]]</div>
+      <div class="content">
+        <template is="dom-if" if="[[errors]]">
+          <div class="errors">[[errors]]</div>
         </template>
-        <div id='root'></div>
+        <div id="root"></div>
       </div>
-      <paper-fab slot="fab"
-        is-wide$='[[isWide]]'
-        dirty$='[[dirty]]'
-        icon='mdi:content-save'
-        title="[[localize('ui.panel.config.automation.editor.save')]]"
-        on-click='saveAutomation'
-      ></paper-fab>
+      <paper-fab slot="fab" is-wide\$="[[isWide]]" dirty\$="[[dirty]]" icon="mdi:content-save" title="[[localize('ui.panel.config.automation.editor.save')]]" on-click="saveAutomation"></paper-fab>
     </ha-app-layout>
+`;
+  }
 
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaAutomationEditor extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
   static get is() { return 'ha-automation-editor'; }
 
   static get properties() {
@@ -296,4 +285,3 @@ class HaAutomationEditor extends
 }
 
 customElements.define(HaAutomationEditor.is, HaAutomationEditor);
-</script>
diff --git a/panels/config/automation/ha-automation-picker.html b/panels/config/automation/ha-automation-picker.js
similarity index 51%
rename from panels/config/automation/ha-automation-picker.html
rename to panels/config/automation/ha-automation-picker.js
index e635efb9bc..e60e6fe8cd 100644
--- a/panels/config/automation/ha-automation-picker.html
+++ b/panels/config/automation/ha-automation-picker.js
@@ -1,20 +1,26 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../../bower_components/paper-fab/paper-fab.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-fab/paper-fab.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/layouts/ha-app-layout.html'>
-<link rel='import' href='../../../src/components/ha-markdown.html'>
-<link rel='import' href='../../../src/util/hass-mixins.html'>
+import '../../../src/components/ha-markdown.js';
+import '../../../src/layouts/ha-app-layout.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
 
-<link rel="import" href="../ha-config-section.html">
-
-<dom-module id="ha-automation-picker">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaAutomationPicker extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+  static get template() {
+    return html`
     <style include="ha-style">
       :host {
         display: block;
@@ -45,61 +51,43 @@
       }
     </style>
 
-    <ha-app-layout has-scrolling-region>
-      <app-header slot="header" fixed>
+    <ha-app-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
         <app-toolbar>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='_backTapped'
-          ></paper-icon-button>
-          <div main-title>[[localize('ui.panel.config.automation.caption')]]</div>
+          <paper-icon-button icon="mdi:arrow-left" on-click="_backTapped"></paper-icon-button>
+          <div main-title="">[[localize('ui.panel.config.automation.caption')]]</div>
         </app-toolbar>
       </app-header>
 
-      <ha-config-section
-        is-wide='[[isWide]]'
-      >
-        <div slot='header'>[[localize('ui.panel.config.automation.picker.header')]]</div>
-        <div slot='introduction'>
+      <ha-config-section is-wide="[[isWide]]">
+        <div slot="header">[[localize('ui.panel.config.automation.picker.header')]]</div>
+        <div slot="introduction">
           <ha-markdown content="[[localize('ui.panel.config.automation.picker.introduction')]]"></ha-markdown>
         </div>
 
         <paper-card heading="[[localize('ui.panel.config.automation.picker.pick_automation')]]">
-          <template is='dom-if' if='[[!automations.length]]'>
-            <div class='card-content'>
+          <template is="dom-if" if="[[!automations.length]]">
+            <div class="card-content">
               <p>[[localize('ui.panel.config.automation.picker.no_automations')]]</p>
             </div>
           </template>
-          <template is='dom-repeat' items='[[automations]]' as='automation'>
+          <template is="dom-repeat" items="[[automations]]" as="automation">
             <paper-item>
-              <paper-item-body two-line on-click='automationTapped'>
+              <paper-item-body two-line="" on-click="automationTapped">
                 <div>[[computeName(automation)]]</div>
-                <div secondary>[[computeDescription(automation)]]</div>
+                <div secondary="">[[computeDescription(automation)]]</div>
               </paper-item-body>
-              <iron-icon icon='mdi:chevron-right'></iron-icon>
+              <iron-icon icon="mdi:chevron-right"></iron-icon>
             </paper-item>
           </template>
         </paper-card>
       </ha-config-section>
 
-      <paper-fab slot="fab"
-        is-wide$='[[isWide]]'
-        icon='mdi:plus'
-        title="[[localize('ui.panel.config.automation.picker.add_automation')]]"
-        on-click='addAutomation'
-      ></paper-fab>
+      <paper-fab slot="fab" is-wide\$="[[isWide]]" icon="mdi:plus" title="[[localize('ui.panel.config.automation.picker.add_automation')]]" on-click="addAutomation"></paper-fab>
     </ha-app-layout>
+`;
+  }
 
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaAutomationPicker extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
   static get is() { return 'ha-automation-picker'; }
 
   static get properties() {
@@ -151,4 +139,3 @@ class HaAutomationPicker extends
 }
 
 customElements.define(HaAutomationPicker.is, HaAutomationPicker);
-</script>
diff --git a/panels/config/automation/ha-config-automation.html b/panels/config/automation/ha-config-automation.js
similarity index 62%
rename from panels/config/automation/ha-config-automation.html
rename to panels/config/automation/ha-config-automation.js
index 3de2568365..86c6160f0f 100644
--- a/panels/config/automation/ha-config-automation.html
+++ b/panels/config/automation/ha-config-automation.js
@@ -1,52 +1,32 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel='import' href='../../../bower_components/app-route/app-route.html'>
+import '@polymer/app-route/app-route.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="./ha-automation-picker.html">
-<link rel="import" href="./ha-automation-editor.html">
+import './ha-automation-editor.js';
+import './ha-automation-picker.js';
 
-<dom-module id="ha-config-automation">
-  <template>
+class HaConfigAutomation extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       ha-automation-picker,
       ha-automation-editor {
         height: 100%;
       }
     </style>
-    <app-route
-      route='[[route]]'
-      pattern='/automation/edit/:automation'
-      data="{{_routeData}}"
-      active="{{_edittingAutomation}}"
-    ></app-route>
-    <app-route
-      route='[[route]]'
-      pattern='/automation/new'
-      active="{{_creatingNew}}"
-    ></app-route>
+    <app-route route="[[route]]" pattern="/automation/edit/:automation" data="{{_routeData}}" active="{{_edittingAutomation}}"></app-route>
+    <app-route route="[[route]]" pattern="/automation/new" active="{{_creatingNew}}"></app-route>
 
-    <template is='dom-if' if='[[!showEditor]]'>
-      <ha-automation-picker
-        hass='[[hass]]'
-        narrow='[[narrow]]'
-        show-menu='[[showMenu]]'
-        automations='[[automations]]'
-        is-wide='[[isWide]]'
-      ></ha-automation-picker>
+    <template is="dom-if" if="[[!showEditor]]">
+      <ha-automation-picker hass="[[hass]]" narrow="[[narrow]]" show-menu="[[showMenu]]" automations="[[automations]]" is-wide="[[isWide]]"></ha-automation-picker>
     </template>
 
-    <template is='dom-if' if='[[showEditor]]' restamp>
-      <ha-automation-editor
-        hass='[[hass]]'
-        automation='[[automation]]'
-        is-wide='[[isWide]]'
-        creating-new='[[_creatingNew]]'
-      ></ha-automation-editor>
+    <template is="dom-if" if="[[showEditor]]" restamp="">
+      <ha-automation-editor hass="[[hass]]" automation="[[automation]]" is-wide="[[isWide]]" creating-new="[[_creatingNew]]"></ha-automation-editor>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaConfigAutomation extends Polymer.Element {
   static get is() { return 'ha-config-automation'; }
 
   static get properties() {
@@ -124,4 +104,3 @@ class HaConfigAutomation extends Polymer.Element {
 }
 
 customElements.define(HaConfigAutomation.is, HaConfigAutomation);
-</script>
diff --git a/panels/config/cloud/ha-config-cloud-account.html b/panels/config/cloud/ha-config-cloud-account.js
similarity index 62%
rename from panels/config/cloud/ha-config-cloud-account.html
rename to panels/config/cloud/ha-config-cloud-account.js
index 85dca7addd..45eae04534 100644
--- a/panels/config/cloud/ha-config-cloud-account.html
+++ b/panels/config/cloud/ha-config-cloud-account.js
@@ -1,17 +1,18 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href='../../../bower_components/paper-card/paper-card.html'>
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href='../../../bower_components/paper-button/paper-button.html'>
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-item/paper-item-body.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/layouts/hass-subpage.html">
-<link rel="import" href="../../../src/util/hass-mixins.html">
-<link rel="import" href='../../../src/resources/ha-style.html'>
-<link rel="import" href='../../../src/components/buttons/ha-call-api-button.html'>
+import '../../../src/components/buttons/ha-call-api-button.js';
+import '../../../src/layouts/hass-subpage.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
 
-<link rel="import" href="../ha-config-section.html">
-
-<dom-module id="ha-config-cloud-account">
-  <template>
+class HaConfigCloudAccount extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         padding-bottom: 24px;
@@ -49,59 +50,53 @@
         color: var(--primary-color);
       }
     </style>
-    <hass-subpage header='Cloud Account'>
-      <div class='content'>
-        <ha-config-section
-          is-wide='[[isWide]]'
-        >
-          <span slot='header'>Home Assistant Cloud</span>
-          <span slot='introduction'>
+    <hass-subpage header="Cloud Account">
+      <div class="content">
+        <ha-config-section is-wide="[[isWide]]">
+          <span slot="header">Home Assistant Cloud</span>
+          <span slot="introduction">
             Thank you for supporting Home Assistant. It's because of people like you that we are able to run this project and make a great home automation experience for everyone. Thank you!
           </span>
 
-          <paper-card heading='Account'>
-            <div class='account-row'>
-              <paper-item-body two-line>
+          <paper-card heading="Account">
+            <div class="account-row">
+              <paper-item-body two-line="">
                 [[account.email]]
-                <div secondary class='wrap'>
-                  <span class='nowrap'>Subscription expires on </span>
-                  <span class='nowrap'>[[_formatExpiration(account.sub_exp)]]</span>
+                <div secondary="" class="wrap">
+                  <span class="nowrap">Subscription expires on </span>
+                  <span class="nowrap">[[_formatExpiration(account.sub_exp)]]</span>
                 </div>
               </paper-item-body>
-              <paper-button
-                on-click='handleLogout'
-              >Sign out</paper-button>
+              <paper-button on-click="handleLogout">Sign out</paper-button>
             </div>
 
-            <div class='account-row'>
+            <div class="account-row">
               <paper-item-body>
                 Cloud connection status
               </paper-item-body>
-              <div class='status'>[[account.cloud]]</div>
+              <div class="status">[[account.cloud]]</div>
             </div>
           </paper-card>
         </ha-config-section>
 
-        <ha-config-section
-          is-wide='[[isWide]]'
-        >
-          <span slot='header'>Integrations</span>
-          <span slot='introduction'>
+        <ha-config-section is-wide="[[isWide]]">
+          <span slot="header">Integrations</span>
+          <span slot="introduction">
             Integrations for Home Assistant Cloud allow you to connect with services in the cloud
             without having to expose your Home Assistant instance publicly on the internet.
           </span>
 
-          <paper-card heading='Alexa'>
+          <paper-card heading="Alexa">
             <div class="card-content">
               With the Alexa integration for Home Assistant Cloud you'll be able to control all your Home Assistant devices via any Alexa-enabled device.
               <ul>
                 <li>
-                  <a href='https://alexa.amazon.com/spa/index.html#skills/dp/B0772J1QKB/?ref=skill_dsk_skb_sr_2' target='_blank'>
+                  <a href="https://alexa.amazon.com/spa/index.html#skills/dp/B0772J1QKB/?ref=skill_dsk_skb_sr_2" target="_blank">
                     Activate the Home Assistant skill for Alexa
                   </a>
                 </li>
                 <li>
-                  <a href='https://www.home-assistant.io/cloud/alexa/' target='_blank'>
+                  <a href="https://www.home-assistant.io/cloud/alexa/" target="_blank">
                     Config documentation
                   </a>
                 </li>
@@ -110,38 +105,33 @@
             </div>
           </paper-card>
 
-          <paper-card heading='Google Assistant'>
+          <paper-card heading="Google Assistant">
             <div class="card-content">
               With the Google Assistant integration for Home Assistant Cloud you'll be able to control all your Home Assistant devices via any Google Assistant-enabled device.
               <ul>
                 <li>
-                  <a href='https://assistant.google.com/services/a/uid/00000091fd5fb875' target='_blank'>
+                  <a href="https://assistant.google.com/services/a/uid/00000091fd5fb875" target="_blank">
                     Activate the Home Assistant skill for Google Assistant
                   </a>
                 </li>
                 <li>
-                  <a href='https://www.home-assistant.io/cloud/google_assistant/' target='_blank'>
+                  <a href="https://www.home-assistant.io/cloud/google_assistant/" target="_blank">
                     Config documentation
                   </a>
                 </li>
               </ul>
               <p><em>This integration requires a Google Assistant-enabled device like the Google Home or Android phone.</em></p>
             </div>
-            <div class='card-actions'>
-              <ha-call-api-button
-                hass='[[hass]]'
-                path='cloud/google_actions/sync'
-              >Sync devices</ha-call-api-button>
+            <div class="card-actions">
+              <ha-call-api-button hass="[[hass]]" path="cloud/google_actions/sync">Sync devices</ha-call-api-button>
             </div>
           </paper-card>
         </ha-config-section>
       </div>
     </hass-subpage>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaConfigCloudAccount extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-config-cloud-account'; }
 
   static get properties() {
@@ -182,4 +172,3 @@ class HaConfigCloudAccount extends window.hassMixins.EventsMixin(Polymer.Element
 }
 
 customElements.define(HaConfigCloudAccount.is, HaConfigCloudAccount);
-</script>
diff --git a/panels/config/cloud/ha-config-cloud-forgot-password.html b/panels/config/cloud/ha-config-cloud-forgot-password.js
similarity index 64%
rename from panels/config/cloud/ha-config-cloud-forgot-password.html
rename to panels/config/cloud/ha-config-cloud-forgot-password.js
index 3fe8a9d145..ece6a012b8 100644
--- a/panels/config/cloud/ha-config-cloud-forgot-password.html
+++ b/panels/config/cloud/ha-config-cloud-forgot-password.js
@@ -1,14 +1,16 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href='../../../bower_components/paper-card/paper-card.html'>
-<link rel="import" href='../../../bower_components/paper-input/paper-input.html'>
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/layouts/hass-subpage.html">
-<link rel="import" href="../../../src/util/hass-mixins.html">
-<link rel="import" href='../../../src/resources/ha-style.html'>
-<link rel="import" href='../../../src/components/buttons/ha-progress-button.html'>
+import '../../../src/components/buttons/ha-progress-button.js';
+import '../../../src/layouts/hass-subpage.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
 
-<dom-module id="ha-config-cloud-forgot-password">
-  <template>
+class HaConfigCloudForgotPassword extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         padding-bottom: 24px;
@@ -40,38 +42,25 @@
       }
     </style>
     <hass-subpage header="Forgot Password">
-      <div class='content'>
+      <div class="content">
         <paper-card>
-          <div class='card-content'>
+          <div class="card-content">
             <h1>Forgot your password?</h1>
             <p>
               Enter your email address and we will send you a link to reset your password.
             </p>
-            <div class='error' hidden$='[[!_error]]'>[[_error]]</div>
-            <paper-input
-              autofocus
-              id='email'
-              label='E-mail'
-              value='{{email}}'
-              type='email'
-              on-keydown='_keyDown'
-              error-message='Invalid email'
-            ></paper-input>
+            <div class="error" hidden\$="[[!_error]]">[[_error]]</div>
+            <paper-input autofocus="" id="email" label="E-mail" value="{{email}}" type="email" on-keydown="_keyDown" error-message="Invalid email"></paper-input>
           </div>
-          <div class='card-actions'>
-            <ha-progress-button
-              on-click='_handleEmailPasswordReset'
-              progress='[[_requestInProgress]]'
-            >Send reset email</ha-progress-button>
+          <div class="card-actions">
+            <ha-progress-button on-click="_handleEmailPasswordReset" progress="[[_requestInProgress]]">Send reset email</ha-progress-button>
           </div>
         </paper-card>
       </div>
     </hass-subpage>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaConfigCloudForgotPassword extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-config-cloud-forgot-password'; }
 
   static get properties() {
@@ -131,4 +120,3 @@ class HaConfigCloudForgotPassword extends window.hassMixins.EventsMixin(Polymer.
 }
 
 customElements.define(HaConfigCloudForgotPassword.is, HaConfigCloudForgotPassword);
-</script>
diff --git a/panels/config/cloud/ha-config-cloud-login.html b/panels/config/cloud/ha-config-cloud-login.js
similarity index 59%
rename from panels/config/cloud/ha-config-cloud-login.html
rename to panels/config/cloud/ha-config-cloud-login.js
index 34e208bb36..458c86d05d 100644
--- a/panels/config/cloud/ha-config-cloud-login.html
+++ b/panels/config/cloud/ha-config-cloud-login.js
@@ -1,21 +1,23 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href='../../../bower_components/paper-card/paper-card.html'>
-<link rel="import" href='../../../bower_components/paper-button/paper-button.html'>
-<link rel="import" href='../../../bower_components/paper-icon-button/paper-icon-button.html'>
-<link rel="import" href='../../../bower_components/paper-input/paper-input.html'>
-<link rel="import" href='../../../bower_components/paper-ripple/paper-ripple.html'>
-<link rel="import" href='../../../bower_components/paper-item/paper-item.html'>
-<link rel="import" href='../../../bower_components/paper-item/paper-item-body.html'>
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-ripple/paper-ripple.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/layouts/hass-subpage.html">
-<link rel="import" href="../../../src/util/hass-mixins.html">
-<link rel="import" href='../../../src/resources/ha-style.html'>
-<link rel="import" href='../../../src/components/buttons/ha-progress-button.html'>
+import '../../../src/components/buttons/ha-progress-button.js';
+import '../../../src/layouts/hass-subpage.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
 
-<link rel="import" href="../ha-config-section.html">
-
-<dom-module id="ha-config-cloud-login">
-  <template>
+class HaConfigCloudLogin extends
+  window.hassMixins.NavigateMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         padding-bottom: 24px;
@@ -57,80 +59,51 @@
         color: var(--secondary-text-color);
       }
     </style>
-    <hass-subpage header='Cloud Login'>
-      <div class='content'>
-        <ha-config-section
-          is-wide='[[isWide]]'
-        >
-          <span slot='header'>Home Assistant Cloud</span>
-          <span slot='introduction'>
+    <hass-subpage header="Cloud Login">
+      <div class="content">
+        <ha-config-section is-wide="[[isWide]]">
+          <span slot="header">Home Assistant Cloud</span>
+          <span slot="introduction">
             The Home Assistant Cloud allows your local Home Assistant instance to connect with cloud-only services like Amazon Alexa.
-            <p><a href='https://www.home-assistant.io/components/cloud/' target='_blank'>Learn more</a></p>
+            <p><a href="https://www.home-assistant.io/components/cloud/" target="_blank">Learn more</a></p>
           </span>
 
-          <paper-card hidden$='[[!flashMessage]]'>
-            <div class='card-content flash-msg'>
+          <paper-card hidden\$="[[!flashMessage]]">
+            <div class="card-content flash-msg">
               [[flashMessage]]
-              <paper-icon-button
-                icon='mdi:close'
-                on-click='_dismissFlash'
-              >Dismiss</paper-icon-button>
-              <paper-ripple id='flashRipple' noink></paper-ripple>
+              <paper-icon-button icon="mdi:close" on-click="_dismissFlash">Dismiss</paper-icon-button>
+              <paper-ripple id="flashRipple" noink=""></paper-ripple>
             </div>
           </paper-card>
 
           <paper-card>
-            <div class='card-content'>
+            <div class="card-content">
               <h1>Sign In</h1>
-              <div class='error' hidden$='[[!_error]]'>[[_error]]</div>
-              <paper-input
-                label='Email'
-                id='email'
-                type='email'
-                value='{{email}}'
-                on-keydown='_keyDown'
-                error-message='Invalid email'
-              ></paper-input>
-              <paper-input
-                id='password'
-                label='Password'
-                value='{{_password}}'
-                type='password'
-                on-keydown='_keyDown'
-                error-message='Passwords are at least 8 characters'
-              ></paper-input>
+              <div class="error" hidden\$="[[!_error]]">[[_error]]</div>
+              <paper-input label="Email" id="email" type="email" value="{{email}}" on-keydown="_keyDown" error-message="Invalid email"></paper-input>
+              <paper-input id="password" label="Password" value="{{_password}}" type="password" on-keydown="_keyDown" error-message="Passwords are at least 8 characters"></paper-input>
             </div>
-            <div class='card-actions'>
-              <ha-progress-button
-                on-click='_handleLogin'
-                progress='[[_requestInProgress]]'
-              >Sign in</ha-progress-button>
-              <button
-                class='link'
-                hidden='[[_requestInProgress]]'
-                on-click='_handleForgotPassword'
-              >forgot password?</button>
+            <div class="card-actions">
+              <ha-progress-button on-click="_handleLogin" progress="[[_requestInProgress]]">Sign in</ha-progress-button>
+              <button class="link" hidden="[[_requestInProgress]]" on-click="_handleForgotPassword">forgot password?</button>
             </div>
           </paper-card>
 
           <paper-card>
-            <paper-item on-click='_handleRegister'>
-              <paper-item-body two-line>
+            <paper-item on-click="_handleRegister">
+              <paper-item-body two-line="">
                 Create Account
-                <div secondary>Get up and running quickly.</div>
+                <div secondary="">Get up and running quickly.</div>
               </paper-item-body>
-              <iron-icon icon='mdi:chevron-right'></iron-icon>
+              <iron-icon icon="mdi:chevron-right"></iron-icon>
             </paper-item>
           </paper-card>
         </ha-config-section>
       </div>
     </hass-subpage>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaConfigCloudLogin extends
-  window.hassMixins.NavigateMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
   static get is() { return 'ha-config-cloud-login'; }
 
   static get properties() {
@@ -260,4 +233,3 @@ class HaConfigCloudLogin extends
 }
 
 customElements.define(HaConfigCloudLogin.is, HaConfigCloudLogin);
-</script>
diff --git a/panels/config/cloud/ha-config-cloud-register.html b/panels/config/cloud/ha-config-cloud-register.js
similarity index 60%
rename from panels/config/cloud/ha-config-cloud-register.html
rename to panels/config/cloud/ha-config-cloud-register.js
index b6d7b0c7fc..5e894f5094 100644
--- a/panels/config/cloud/ha-config-cloud-register.html
+++ b/panels/config/cloud/ha-config-cloud-register.js
@@ -1,16 +1,17 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href='../../../bower_components/paper-card/paper-card.html'>
-<link rel="import" href='../../../bower_components/paper-input/paper-input.html'>
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/layouts/hass-subpage.html">
-<link rel="import" href="../../../src/util/hass-mixins.html">
-<link rel="import" href='../../../src/resources/ha-style.html'>
-<link rel="import" href='../../../src/components/buttons/ha-progress-button.html'>
+import '../../../src/components/buttons/ha-progress-button.js';
+import '../../../src/layouts/hass-subpage.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
 
-<link rel="import" href="../ha-config-section.html">
-
-<dom-module id="ha-config-cloud-register">
-  <template>
+class HaConfigCloudRegister extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       a {
         color: var(--primary-color);
@@ -41,67 +42,41 @@
       }
     </style>
     <hass-subpage header="Register Account">
-      <div class='content'>
-        <ha-config-section
-          is-wide='[[isWide]]'
-        >
-          <span slot='header'>Register with the Home Assistant Cloud</span>
-          <span slot='introduction'>
+      <div class="content">
+        <ha-config-section is-wide="[[isWide]]">
+          <span slot="header">Register with the Home Assistant Cloud</span>
+          <span slot="introduction">
             Register today to easily connect with the Home Assistant Cloud. This will allow you to unlock great new services and functionality, like Amazon Alexa integration.
 
             <p>
               By registering an account you agree to the following terms and conditions.
-              <ul>
-                <li><a href='https://home-assistant.io/tos/' target='_blank'>Terms and Conditions</a></li>
-                <li><a href='https://home-assistant.io/privacy/' target='_blank'>Privacy Policy</a></li>
+              </p><ul>
+                <li><a href="https://home-assistant.io/tos/" target="_blank">Terms and Conditions</a></li>
+                <li><a href="https://home-assistant.io/privacy/" target="_blank">Privacy Policy</a></li>
               </ul>
-            </p>
+            <p></p>
           </span>
 
           <paper-card>
-            <div class='card-content'>
-              <div class='header'>
+            <div class="card-content">
+              <div class="header">
                 <h1>Register</h1>
-                <div class='error' hidden$='[[!_error]]'>[[_error]]</div>
+                <div class="error" hidden\$="[[!_error]]">[[_error]]</div>
               </div>
-              <paper-input
-                autofocus
-                id='email'
-                label='Email address'
-                type='email'
-                value='{{email}}'
-                on-keydown='_keyDown'
-                error-message='Invalid email'
-              ></paper-input>
-              <paper-input
-                id='password'
-                label='Password'
-                value='{{_password}}'
-                type='password'
-                on-keydown='_keyDown'
-                error-message='Your password needs to be at least 8 characters'
-              ></paper-input>
+              <paper-input autofocus="" id="email" label="Email address" type="email" value="{{email}}" on-keydown="_keyDown" error-message="Invalid email"></paper-input>
+              <paper-input id="password" label="Password" value="{{_password}}" type="password" on-keydown="_keyDown" error-message="Your password needs to be at least 8 characters"></paper-input>
             </div>
-            <div class='card-actions'>
-              <ha-progress-button
-                on-click='_handleRegister'
-                progress='[[_requestInProgress]]'
-              >Create Account</ha-progress-button>
-              <button
-                class='link'
-                hidden='[[_requestInProgress]]'
-                on-click='_handleResendVerifyEmail'
-              >Resend confirmation email</button>
+            <div class="card-actions">
+              <ha-progress-button on-click="_handleRegister" progress="[[_requestInProgress]]">Create Account</ha-progress-button>
+              <button class="link" hidden="[[_requestInProgress]]" on-click="_handleResendVerifyEmail">Resend confirmation email</button>
             </div>
           </paper-card>
         </ha-config-section>
       </div>
     </hass-subpage>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaConfigCloudRegister extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-config-cloud-register'; }
 
   static get properties() {
@@ -209,4 +184,3 @@ class HaConfigCloudRegister extends window.hassMixins.EventsMixin(Polymer.Elemen
 }
 
 customElements.define(HaConfigCloudRegister.is, HaConfigCloudRegister);
-</script>
diff --git a/panels/config/cloud/ha-config-cloud.html b/panels/config/cloud/ha-config-cloud.html
deleted file mode 100644
index cf3152cd56..0000000000
--- a/panels/config/cloud/ha-config-cloud.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../../bower_components/app-route/app-route.html'>
-
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-<link rel="import" href="../ha-config-section.html">
-
-<link rel="import" href="./ha-config-cloud-login.html">
-<link rel="import" href="./ha-config-cloud-register.html">
-<link rel="import" href="./ha-config-cloud-forgot-password.html">
-<link rel="import" href="./ha-config-cloud-account.html">
-
-<dom-module id="ha-config-cloud">
-  <template>
-    <app-route
-      route='[[route]]'
-      pattern='/cloud/:page'
-      data="{{_routeData}}"
-      tail="{{_routeTail}}"
-    ></app-route>
-
-    <template is='dom-if' if='[[_equals(_routeData.page, "account")]]' restamp>
-      <ha-config-cloud-account
-        hass='[[hass]]'
-        account='[[account]]'
-        is-wide='[[isWide]]'
-      ></ha-config-cloud-account>
-    </template>
-
-    <template is='dom-if' if='[[_equals(_routeData.page, "login")]]' restamp>
-      <ha-config-cloud-login
-        page-name='login'
-        hass='[[hass]]'
-        is-wide='[[isWide]]'
-        email='{{_loginEmail}}'
-        flash-message='{{_flashMessage}}'
-      ></ha-config-cloud-login>
-    </template>
-
-    <template is='dom-if' if='[[_equals(_routeData.page, "register")]]' restamp>
-      <ha-config-cloud-register
-        page-name='register'
-        hass='[[hass]]'
-        is-wide='[[isWide]]'
-        email='{{_loginEmail}}'
-      ></ha-config-cloud-register>
-    </template>
-
-    <template is='dom-if' if='[[_equals(_routeData.page, "forgot-password")]]' restamp>
-      <ha-config-cloud-forgot-password
-        page-name='forgot-password'
-        hass='[[hass]]'
-        email='{{_loginEmail}}'
-      ></ha-config-cloud-forgot-password>
-    </template>
-  </template>
-</dom-module>
-
-<script>
-{
-  const LOGGED_IN_URLS = [
-    '/cloud/account',
-  ];
-  const NOT_LOGGED_IN_URLS = [
-    '/cloud/login',
-    '/cloud/register',
-    '/cloud/forgot-password',
-  ];
-
-  class HaConfigCloud extends window.hassMixins.NavigateMixin(Polymer.Element) {
-    static get is() { return 'ha-config-cloud'; }
-
-    static get properties() {
-      return {
-        hass: Object,
-        isWide: Boolean,
-        loadingAccount: {
-          type: Boolean,
-          value: false
-        },
-        account: {
-          type: Object,
-        },
-        _flashMessage: {
-          type: String,
-          value: '',
-        },
-
-        route: Object,
-
-        _routeData: Object,
-        _routeTail: Object,
-        _loginEmail: String,
-      };
-    }
-
-    static get observers() {
-      return [
-        '_checkRoute(route, account)'
-      ];
-    }
-
-    ready() {
-      super.ready();
-      this.addEventListener('cloud-done', (ev) => {
-        this._flashMessage = ev.detail.flashMessage;
-        this.navigate('/config/cloud/login');
-      });
-    }
-
-    _checkRoute(route) {
-      if (!route || route.path.substr(0, 6) !== '/cloud') return;
-
-      this._debouncer = Polymer.Debouncer.debounce(
-        this._debouncer,
-        Polymer.Async.timeOut.after(0),
-        () => {
-          if (!this.account && !NOT_LOGGED_IN_URLS.includes(route.path)) {
-            this.navigate('/config/cloud/login', true);
-          } else if (this.account && !LOGGED_IN_URLS.includes(route.path)) {
-            this.navigate('/config/cloud/account', true);
-          }
-        }
-      );
-    }
-
-    _equals(a, b) {
-      return a === b;
-    }
-  }
-
-  customElements.define(HaConfigCloud.is, HaConfigCloud);
-}
-</script>
diff --git a/panels/config/cloud/ha-config-cloud.js b/panels/config/cloud/ha-config-cloud.js
new file mode 100644
index 0000000000..31be066536
--- /dev/null
+++ b/panels/config/cloud/ha-config-cloud.js
@@ -0,0 +1,109 @@
+import '@polymer/app-route/app-route.js';
+import { timeOut } from '@polymer/polymer/lib/utils/async.js';
+import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
+import './ha-config-cloud-account.js';
+import './ha-config-cloud-forgot-password.js';
+import './ha-config-cloud-login.js';
+import './ha-config-cloud-register.js';
+
+{
+  const LOGGED_IN_URLS = [
+    '/cloud/account',
+  ];
+  const NOT_LOGGED_IN_URLS = [
+    '/cloud/login',
+    '/cloud/register',
+    '/cloud/forgot-password',
+  ];
+
+  class HaConfigCloud extends window.hassMixins.NavigateMixin(PolymerElement) {
+    static get template() {
+      return html`
+    <app-route route="[[route]]" pattern="/cloud/:page" data="{{_routeData}}" tail="{{_routeTail}}"></app-route>
+
+    <template is="dom-if" if="[[_equals(_routeData.page, &quot;account&quot;)]]" restamp="">
+      <ha-config-cloud-account hass="[[hass]]" account="[[account]]" is-wide="[[isWide]]"></ha-config-cloud-account>
+    </template>
+
+    <template is="dom-if" if="[[_equals(_routeData.page, &quot;login&quot;)]]" restamp="">
+      <ha-config-cloud-login page-name="login" hass="[[hass]]" is-wide="[[isWide]]" email="{{_loginEmail}}" flash-message="{{_flashMessage}}"></ha-config-cloud-login>
+    </template>
+
+    <template is="dom-if" if="[[_equals(_routeData.page, &quot;register&quot;)]]" restamp="">
+      <ha-config-cloud-register page-name="register" hass="[[hass]]" is-wide="[[isWide]]" email="{{_loginEmail}}"></ha-config-cloud-register>
+    </template>
+
+    <template is="dom-if" if="[[_equals(_routeData.page, &quot;forgot-password&quot;)]]" restamp="">
+      <ha-config-cloud-forgot-password page-name="forgot-password" hass="[[hass]]" email="{{_loginEmail}}"></ha-config-cloud-forgot-password>
+    </template>
+`;
+    }
+
+    static get is() { return 'ha-config-cloud'; }
+
+    static get properties() {
+      return {
+        hass: Object,
+        isWide: Boolean,
+        loadingAccount: {
+          type: Boolean,
+          value: false
+        },
+        account: {
+          type: Object,
+        },
+        _flashMessage: {
+          type: String,
+          value: '',
+        },
+
+        route: Object,
+
+        _routeData: Object,
+        _routeTail: Object,
+        _loginEmail: String,
+      };
+    }
+
+    static get observers() {
+      return [
+        '_checkRoute(route, account)'
+      ];
+    }
+
+    ready() {
+      super.ready();
+      this.addEventListener('cloud-done', (ev) => {
+        this._flashMessage = ev.detail.flashMessage;
+        this.navigate('/config/cloud/login');
+      });
+    }
+
+    _checkRoute(route) {
+      if (!route || route.path.substr(0, 6) !== '/cloud') return;
+
+      this._debouncer = Debouncer.debounce(
+        this._debouncer,
+        timeOut.after(0),
+        () => {
+          if (!this.account && !NOT_LOGGED_IN_URLS.includes(route.path)) {
+            this.navigate('/config/cloud/login', true);
+          } else if (this.account && !LOGGED_IN_URLS.includes(route.path)) {
+            this.navigate('/config/cloud/account', true);
+          }
+        }
+      );
+    }
+
+    _equals(a, b) {
+      return a === b;
+    }
+  }
+
+  customElements.define(HaConfigCloud.is, HaConfigCloud);
+}
diff --git a/panels/config/config-entries/ha-config-entries.html b/panels/config/config-entries/ha-config-entries.js
similarity index 64%
rename from panels/config/config-entries/ha-config-entries.html
rename to panels/config/config-entries/ha-config-entries.js
index 40be3dbd52..920ff50997 100644
--- a/panels/config/config-entries/ha-config-entries.html
+++ b/panels/config/config-entries/ha-config-entries.js
@@ -1,20 +1,26 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../../bower_components/paper-button/paper-button.html'>
-<link rel='import' href='../../../bower_components/paper-card/paper-card.html'>
-<link rel='import' href='../../../bower_components/paper-item/paper-item-body.html'>
-<link rel='import' href='../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-item/paper-item-body.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-<link rel='import' href='../../../src/resources/ha-style.html'>
-<link rel='import' href='../../../src/layouts/hass-subpage.html'>
+import '../../../src/layouts/hass-subpage.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
+import './ha-config-flow.js';
 
-<link rel='import' href='../ha-config-section.html'>
-
-<link rel='import' href='./ha-config-flow.html'>
-
-<dom-module id="ha-config-entries">
-  <template>
-    <style include='iron-flex ha-style'>
+{
+  /*
+   * @appliesMixin window.hassMixins.LocalizeMixin
+   * @appliesMixin window.hassMixins.EventsMixin
+   */
+  class HaConfigManager extends
+    window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+    static get template() {
+      return html`
+    <style include="iron-flex ha-style">
       paper-button {
         color: var(--primary-color);
         font-weight: 500;
@@ -30,79 +36,66 @@
       }
     </style>
 
-    <hass-subpage header='Integrations'>
-      <template is='dom-if' if='[[_progress.length]]'>
-        <ha-config-section is-wide='[[isWide]]'>
-          <span slot='header'>In Progress</span>
+    <hass-subpage header="Integrations">
+      <template is="dom-if" if="[[_progress.length]]">
+        <ha-config-section is-wide="[[isWide]]">
+          <span slot="header">In Progress</span>
           <paper-card>
-            <template is='dom-repeat' items='[[_progress]]'>
-              <div class='config-entry-row'>
+            <template is="dom-repeat" items="[[_progress]]">
+              <div class="config-entry-row">
                 <paper-item-body>
                   [[_computeIntegrationTitle(localize, item.handler)]]
                 </paper-item-body>
-                <paper-button on-click='_continueFlow'>Configure</paper-button>
+                <paper-button on-click="_continueFlow">Configure</paper-button>
               </div>
             </template>
           </paper-card>
         </ha-config-section>
       </template>
 
-      <ha-config-section is-wide='[[isWide]]'>
-        <span slot='header'>Configured</span>
+      <ha-config-section is-wide="[[isWide]]">
+        <span slot="header">Configured</span>
         <paper-card>
-          <template is='dom-if' if='[[!_entries.length]]'>
-            <div class='config-entry-row'>
+          <template is="dom-if" if="[[!_entries.length]]">
+            <div class="config-entry-row">
               <paper-item-body>
                 Nothing configured yet
               </paper-item-body>
             </div>
           </template>
-          <template is='dom-repeat' items='[[_entries]]'>
-            <div class='config-entry-row'>
-              <paper-item-body three-line>
+          <template is="dom-repeat" items="[[_entries]]">
+            <div class="config-entry-row">
+              <paper-item-body three-line="">
                 [[item.title]]
-                <div secondary>Integration: [[_computeIntegrationTitle(localize, item.domain)]]</div>
-                <div secondary>Added by: [[item.source]]</div>
-                <div secondary>State: [[item.state]]</div>
+                <div secondary="">Integration: [[_computeIntegrationTitle(localize, item.domain)]]</div>
+                <div secondary="">Added by: [[item.source]]</div>
+                <div secondary="">State: [[item.state]]</div>
               </paper-item-body>
-              <paper-button on-click='_removeEntry'>Remove</paper-button>
+              <paper-button on-click="_removeEntry">Remove</paper-button>
             </div>
           </template>
         </paper-card>
       </ha-config-section>
 
-      <ha-config-section is-wide='[[isWide]]'>
-        <span slot='header'>Available</span>
+      <ha-config-section is-wide="[[isWide]]">
+        <span slot="header">Available</span>
         <paper-card>
-          <template is='dom-repeat' items='[[_handlers]]'>
-            <div class='config-entry-row'>
+          <template is="dom-repeat" items="[[_handlers]]">
+            <div class="config-entry-row">
               <paper-item-body>
                 [[_computeIntegrationTitle(localize, item)]]
               </paper-item-body>
-              <paper-button on-click='_createFlow'>Configure</paper-button>
+              <paper-button on-click="_createFlow">Configure</paper-button>
             </div>
           </template>
         </paper-card>
       </ha-config-section>
     </hass-subpage>
 
-    <ha-config-flow
-      hass='[[hass]]'
-      flow-id='[[_flowId]]'
-      step='{{_flowStep}}'
-      on-flow-closed='_flowClose'
-    ></ha-config-flow>
-  </template>
-</dom-module>
+    <ha-config-flow hass="[[hass]]" flow-id="[[_flowId]]" step="{{_flowStep}}" on-flow-closed="_flowClose"></ha-config-flow>
+`;
+    }
 
-<script>
-{
-  /*
-   * @appliesMixin window.hassMixins.LocalizeMixin
-   * @appliesMixin window.hassMixins.EventsMixin
-   */
-  class HaConfigManager extends
-    window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
     static get is() { return 'ha-config-entries'; }
 
     static get properties() {
@@ -209,4 +202,3 @@
 
   customElements.define(HaConfigManager.is, HaConfigManager);
 }
-</script>
diff --git a/panels/config/config-entries/ha-config-flow.html b/panels/config/config-entries/ha-config-flow.js
similarity index 63%
rename from panels/config/config-entries/ha-config-flow.html
rename to panels/config/config-entries/ha-config-flow.js
index 439602e4c2..2d42a99c07 100644
--- a/panels/config/config-entries/ha-config-flow.html
+++ b/panels/config/config-entries/ha-config-flow.js
@@ -1,16 +1,23 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../../bower_components/paper-dialog/paper-dialog.html'>
-<link rel='import' href='../../../bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html'>
-<link rel="import" href='../../../bower_components/paper-button/paper-button.html'>
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-dialog-scrollable/paper-dialog-scrollable.js';
+import '@polymer/paper-dialog/paper-dialog.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-<link rel="import" href='../../../src/components/ha-markdown.html'>
-<link rel='import' href='../../../src/resources/ha-style.html'>
-<link rel="import" href='../../../src/components/ha-form.html'>
+import '../../../src/components/ha-form.js';
+import '../../../src/components/ha-markdown.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
 
-<dom-module id="ha-config-flow">
-  <template>
-    <style include='ha-style-dialog'>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaConfigFlow extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
+    <style include="ha-style-dialog">
       .error {
         color: red;
       }
@@ -22,73 +29,55 @@
         margin: 0 auto;
       }
     </style>
-    <paper-dialog
-      id='dialog'
-      with-backdrop
-      opened='[[step]]'
-      on-opened-changed='_openedChanged'
-    >
+    <paper-dialog id="dialog" with-backdrop="" opened="[[step]]" on-opened-changed="_openedChanged">
       <h2>
-        <template is='dom-if' if='[[_equals(step.type, "abort")]]'>
+        <template is="dom-if" if="[[_equals(step.type, &quot;abort&quot;)]]">
           Aborted
         </template>
-        <template is='dom-if' if='[[_equals(step.type, "create_entry")]]'>
+        <template is="dom-if" if="[[_equals(step.type, &quot;create_entry&quot;)]]">
           Success!
         </template>
-        <template is='dom-if' if='[[_equals(step.type, "form")]]'>
+        <template is="dom-if" if="[[_equals(step.type, &quot;form&quot;)]]">
           [[_computeStepTitle(localize, step)]]
         </template>
       </h2>
       <paper-dialog-scrollable>
-        <template is='dom-if' if='[[!step]]'>
+        <template is="dom-if" if="[[!step]]">
           Loading flow.
         </template>
-        <template is='dom-if' if='[[step]]'>
-          <template is='dom-if' if='[[_equals(step.type, "abort")]]'>
+        <template is="dom-if" if="[[step]]">
+          <template is="dom-if" if="[[_equals(step.type, &quot;abort&quot;)]]">
             <p>[[_computeStepAbortedReason(localize, step)]]</p>
           </template>
 
-          <template is='dom-if' if='[[_equals(step.type, "create_entry")]]'>
+          <template is="dom-if" if="[[_equals(step.type, &quot;create_entry&quot;)]]">
             <p>Created config for [[step.title]]</p>
           </template>
 
-          <template is='dom-if' if='[[_equals(step.type, "form")]]'>
-            <template is='dom-if' if='[[_computeStepDescription(localize, step)]]'>
-              <ha-markdown content='[[_computeStepDescription(localize, step)]]'></ha-markdown>
+          <template is="dom-if" if="[[_equals(step.type, &quot;form&quot;)]]">
+            <template is="dom-if" if="[[_computeStepDescription(localize, step)]]">
+              <ha-markdown content="[[_computeStepDescription(localize, step)]]"></ha-markdown>
             </template>
 
-            <ha-form
-              data='{{stepData}}'
-              schema='[[step.data_schema]]'
-              error='[[step.errors]]'
-              compute-label='[[_computeLabelCallback(localize, step)]]'
-              compute-error='[[_computeErrorCallback(localize, step)]]'
-            ></ha-form>
+            <ha-form data="{{stepData}}" schema="[[step.data_schema]]" error="[[step.errors]]" compute-label="[[_computeLabelCallback(localize, step)]]" compute-error="[[_computeErrorCallback(localize, step)]]"></ha-form>
           </template>
         </template>
       </paper-dialog-scrollable>
-      <div class='buttons'>
-        <template is='dom-if' if='[[_equals(step.type, "abort")]]'>
-          <paper-button on-click='_flowDone'>Close</paper-button>
+      <div class="buttons">
+        <template is="dom-if" if="[[_equals(step.type, &quot;abort&quot;)]]">
+          <paper-button on-click="_flowDone">Close</paper-button>
         </template>
-        <template is='dom-if' if='[[_equals(step.type, "create_entry")]]'>
-          <paper-button on-click='_flowDone'>Close</paper-button>
+        <template is="dom-if" if="[[_equals(step.type, &quot;create_entry&quot;)]]">
+          <paper-button on-click="_flowDone">Close</paper-button>
         </template>
-        <template is='dom-if' if='[[_equals(step.type, "form")]]'>
-          <paper-button on-click='_submitStep'>Submit</paper-button>
+        <template is="dom-if" if="[[_equals(step.type, &quot;form&quot;)]]">
+          <paper-button on-click="_submitStep">Submit</paper-button>
         </template>
       </div>
     </paper-dialog>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaConfigFlow extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
   static get is() { return 'ha-config-flow'; }
 
   static get properties() {
@@ -204,4 +193,3 @@ class HaConfigFlow extends
 }
 
 customElements.define(HaConfigFlow.is, HaConfigFlow);
-</script>
diff --git a/panels/config/core/ha-config-core.html b/panels/config/core/ha-config-core.html
deleted file mode 100644
index a421a4755b..0000000000
--- a/panels/config/core/ha-config-core.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-
-<link rel="import" href="../../../src/resources/ha-style.html">
-<link rel='import' href='../../../src/layouts/ha-app-layout.html'>
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-
-<link rel="import" href="./ha-config-section-core.html">
-<link rel="import" href="./ha-config-section-push-notifications.html">
-<link rel="import" href="./ha-config-section-translation.html">
-<link rel="import" href="./ha-config-section-themes.html">
-
-<dom-module id="ha-config-core">
-  <template>
-    <style include="iron-flex ha-style">
-      .content {
-        padding-bottom: 32px;
-      }
-
-      .border {
-        margin: 32px auto 0;
-        border-bottom: 1px solid rgba(0, 0, 0, 0.12);
-        max-width: 1040px;
-      }
-
-      .narrow .border {
-        max-width: 640px;
-      }
-    </style>
-
-    <ha-app-layout has-scrolling-region>
-      <app-header slot="header" fixed>
-        <app-toolbar>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='_backTapped'
-          ></paper-icon-button>
-          <div main-title>[[localize('ui.panel.config.core.caption')]]</div>
-        </app-toolbar>
-      </app-header>
-
-      <div class$='[[computeClasses(isWide)]]'>
-        <ha-config-section-core
-          is-wide='[[isWide]]'
-          hass='[[hass]]'
-        ></ha-config-section-core>
-
-        <template is='dom-if' if='[[pushSupported]]'>
-          <div class='border'></div>
-          <ha-config-section-push-notifications
-            is-wide='[[isWide]]'
-            hass='[[hass]]'
-            push-supported='{{pushSupported}}'
-          ></ha-config-section-push-notifications>
-        </template>
-        <template is='dom-if' if='[[computeIsTranslationLoaded(hass)]]'>
-          <div class='border'></div>
-          <ha-config-section-translation
-            is-wide='[[isWide]]'
-            hass='[[hass]]'
-          ></ha-config-section-translation>
-        </template>
-
-        <template is='dom-if' if='[[computeIsThemesLoaded(hass)]]'>
-          <div class='border'></div>
-          <ha-config-section-themes
-            is-wide='[[isWide]]'
-            hass='[[hass]]'
-          ></ha-config-section-themes>
-        </template>
-
-      </div>
-    </ha-app-layout>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaConfigCore extends window.hassMixins.LocalizeMixin(Polymer.Element) {
-  static get is() { return 'ha-config-core'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-      pushSupported: {
-        type: Boolean,
-        value: true,
-      },
-    };
-  }
-
-  computeClasses(isWide) {
-    return isWide ? 'content' : 'content narrow';
-  }
-
-  computeIsZwaveLoaded(hass) {
-    return window.hassUtil.isComponentLoaded(hass, 'config.zwave');
-  }
-
-  computeIsTranslationLoaded(hass) {
-    return hass.translationMetadata &&
-      Object.keys(hass.translationMetadata.translations).length;
-  }
-
-  computeIsThemesLoaded(hass) {
-    return hass.themes && hass.themes.themes &&
-      Object.keys(hass.themes.themes).length;
-  }
-
-  _backTapped() {
-    history.back();
-  }
-}
-
-customElements.define(HaConfigCore.is, HaConfigCore);
-</script>
diff --git a/panels/config/core/ha-config-core.js b/panels/config/core/ha-config-core.js
new file mode 100644
index 0000000000..1cbfabe960
--- /dev/null
+++ b/panels/config/core/ha-config-core.js
@@ -0,0 +1,103 @@
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/layouts/ha-app-layout.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
+import './ha-config-section-core.js';
+import './ha-config-section-push-notifications.js';
+import './ha-config-section-themes.js';
+import './ha-config-section-translation.js';
+
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaConfigCore extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style">
+      .content {
+        padding-bottom: 32px;
+      }
+
+      .border {
+        margin: 32px auto 0;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+        max-width: 1040px;
+      }
+
+      .narrow .border {
+        max-width: 640px;
+      }
+    </style>
+
+    <ha-app-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
+        <app-toolbar>
+          <paper-icon-button icon="mdi:arrow-left" on-click="_backTapped"></paper-icon-button>
+          <div main-title="">[[localize('ui.panel.config.core.caption')]]</div>
+        </app-toolbar>
+      </app-header>
+
+      <div class\$="[[computeClasses(isWide)]]">
+        <ha-config-section-core is-wide="[[isWide]]" hass="[[hass]]"></ha-config-section-core>
+
+        <template is="dom-if" if="[[pushSupported]]">
+          <div class="border"></div>
+          <ha-config-section-push-notifications is-wide="[[isWide]]" hass="[[hass]]" push-supported="{{pushSupported}}"></ha-config-section-push-notifications>
+        </template>
+        <template is="dom-if" if="[[computeIsTranslationLoaded(hass)]]">
+          <div class="border"></div>
+          <ha-config-section-translation is-wide="[[isWide]]" hass="[[hass]]"></ha-config-section-translation>
+        </template>
+
+        <template is="dom-if" if="[[computeIsThemesLoaded(hass)]]">
+          <div class="border"></div>
+          <ha-config-section-themes is-wide="[[isWide]]" hass="[[hass]]"></ha-config-section-themes>
+        </template>
+
+      </div>
+    </ha-app-layout>
+`;
+  }
+
+  static get is() { return 'ha-config-core'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      isWide: Boolean,
+      pushSupported: {
+        type: Boolean,
+        value: true,
+      },
+    };
+  }
+
+  computeClasses(isWide) {
+    return isWide ? 'content' : 'content narrow';
+  }
+
+  computeIsZwaveLoaded(hass) {
+    return window.hassUtil.isComponentLoaded(hass, 'config.zwave');
+  }
+
+  computeIsTranslationLoaded(hass) {
+    return hass.translationMetadata &&
+      Object.keys(hass.translationMetadata.translations).length;
+  }
+
+  computeIsThemesLoaded(hass) {
+    return hass.themes && hass.themes.themes &&
+      Object.keys(hass.themes.themes).length;
+  }
+
+  _backTapped() {
+    history.back();
+  }
+}
+
+customElements.define(HaConfigCore.is, HaConfigCore);
diff --git a/panels/config/core/ha-config-section-core.html b/panels/config/core/ha-config-section-core.js
similarity index 51%
rename from panels/config/core/ha-config-section-core.html
rename to panels/config/core/ha-config-section-core.js
index f41dfc59d8..5a8138f535 100644
--- a/panels/config/core/ha-config-section-core.html
+++ b/panels/config/core/ha-config-section-core.js
@@ -1,17 +1,20 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
-<link rel="import" href="../../../src/resources/ha-style.html">
-<link rel='import' href='../../../src/util/hass-mixins.html'>
+import '../../../src/components/buttons/ha-call-service-button.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
 
-<link rel="import" href="../ha-config-section.html">
-
-<dom-module id="ha-config-section-core">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaConfigSectionCore extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .validate-container {
         @apply --layout-vertical;
@@ -42,112 +45,76 @@
         white-space: pre-wrap;
       }
     </style>
-    <ha-config-section
-      is-wide='[[isWide]]'
-    >
-      <span slot='header'>[[localize('ui.panel.config.core.section.core.header')]]</span>
-      <span slot='introduction'>[[localize('ui.panel.config.core.section.core.introduction')]]</span>
+    <ha-config-section is-wide="[[isWide]]">
+      <span slot="header">[[localize('ui.panel.config.core.section.core.header')]]</span>
+      <span slot="introduction">[[localize('ui.panel.config.core.section.core.introduction')]]</span>
 
       <paper-card heading="[[localize('ui.panel.config.core.section.core.validation.heading')]]">
-        <div class='card-content'>
+        <div class="card-content">
           [[localize('ui.panel.config.core.section.core.validation.introduction')]]
-          <template is='dom-if' if='[[!validateLog]]'>
-            <div class='validate-container'>
-              <template is='dom-if' if='[[!validating]]'>
-                <template is='dom-if' if='[[isValid]]'>
-                  <div class='validate-result' id='result'>
+          <template is="dom-if" if="[[!validateLog]]">
+            <div class="validate-container">
+              <template is="dom-if" if="[[!validating]]">
+                <template is="dom-if" if="[[isValid]]">
+                  <div class="validate-result" id="result">
                     [[localize('ui.panel.config.core.section.core.validation.valid')]]
                   </div>
                 </template>
-                <paper-button raised on-click='validateConfig'>
+                <paper-button raised="" on-click="validateConfig">
                   [[localize('ui.panel.config.core.section.core.validation.check_config')]]
                 </paper-button>
               </template>
-              <template is='dom-if' if='[[validating]]'>
-                <paper-spinner active></paper-spinner>
+              <template is="dom-if" if="[[validating]]">
+                <paper-spinner active=""></paper-spinner>
               </template>
             </div>
           </template>
-          <template is='dom-if' if='[[validateLog]]'>
-            <div class='config-invalid'>
-              <span class='text'>
+          <template is="dom-if" if="[[validateLog]]">
+            <div class="config-invalid">
+              <span class="text">
                 [[localize('ui.panel.config.core.section.core.validation.invalid')]]
               </span>
-              <paper-button raised on-click='validateConfig'>
+              <paper-button raised="" on-click="validateConfig">
                 [[localize('ui.panel.config.core.section.core.validation.check_config')]]
               </paper-button>
             </div>
-            <div id='configLog' class='validate-log'>[[validateLog]]</div>
+            <div id="configLog" class="validate-log">[[validateLog]]</div>
           </template>
         </div>
       </paper-card>
 
       <paper-card heading="[[localize('ui.panel.config.core.section.core.reloading.heading')]]">
-        <div class='card-content'>
+        <div class="card-content">
           [[localize('ui.panel.config.core.section.core.reloading.introduction')]]
         </div>
-        <div class='card-actions'>
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='homeassistant'
-            service='reload_core_config'
-          >[[localize('ui.panel.config.core.section.core.reloading.core')]]
+        <div class="card-actions">
+          <ha-call-service-button hass="[[hass]]" domain="homeassistant" service="reload_core_config">[[localize('ui.panel.config.core.section.core.reloading.core')]]
           </ha-call-service-button>
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='group'
-            service='reload'
-            hidden$='[[!groupLoaded(hass)]]'
-          >[[localize('ui.panel.config.core.section.core.reloading.group')]]
+          <ha-call-service-button hass="[[hass]]" domain="group" service="reload" hidden\$="[[!groupLoaded(hass)]]">[[localize('ui.panel.config.core.section.core.reloading.group')]]
           </ha-call-service-button>
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='automation'
-            service='reload'
-            hidden$='[[!automationLoaded(hass)]]'
-          >[[localize('ui.panel.config.core.section.core.reloading.automation')]]
+          <ha-call-service-button hass="[[hass]]" domain="automation" service="reload" hidden\$="[[!automationLoaded(hass)]]">[[localize('ui.panel.config.core.section.core.reloading.automation')]]
           </ha-call-service-button>
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='script'
-            service='reload'
-            hidden$='[[!scriptLoaded(hass)]]'
-          >[[localize('ui.panel.config.core.section.core.reloading.script')]]
+          <ha-call-service-button hass="[[hass]]" domain="script" service="reload" hidden\$="[[!scriptLoaded(hass)]]">[[localize('ui.panel.config.core.section.core.reloading.script')]]
           </ha-call-service-button>
         </div>
       </paper-card>
 
       <paper-card heading="[[localize('ui.panel.config.core.section.core.server_management.heading')]]">
-        <div class='card-content'>
+        <div class="card-content">
           [[localize('ui.panel.config.core.section.core.server_management.introduction')]]
         </div>
-        <div class='card-actions warning'>
-          <ha-call-service-button
-            class='warning'
-            hass='[[hass]]'
-            domain='homeassistant'
-            service='restart'
-          >[[localize('ui.panel.config.core.section.core.server_management.restart')]]
+        <div class="card-actions warning">
+          <ha-call-service-button class="warning" hass="[[hass]]" domain="homeassistant" service="restart">[[localize('ui.panel.config.core.section.core.server_management.restart')]]
           </ha-call-service-button>
-          <ha-call-service-button
-            class='warning'
-            hass='[[hass]]'
-            domain='homeassistant'
-            service='stop'
-          >[[localize('ui.panel.config.core.section.core.server_management.stop')]]
+          <ha-call-service-button class="warning" hass="[[hass]]" domain="homeassistant" service="stop">[[localize('ui.panel.config.core.section.core.server_management.stop')]]
           </ha-call-service-button>
         </div>
       </paper-card>
 
     </ha-config-section>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaConfigSectionCore extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'ha-config-section-core'; }
 
   static get properties() {
@@ -207,4 +174,3 @@ class HaConfigSectionCore extends window.hassMixins.LocalizeMixin(Polymer.Elemen
 }
 
 customElements.define(HaConfigSectionCore.is, HaConfigSectionCore);
-</script>
diff --git a/panels/config/core/ha-config-section-push-notifications.html b/panels/config/core/ha-config-section-push-notifications.html
deleted file mode 100644
index 0f7d3562f7..0000000000
--- a/panels/config/core/ha-config-section-push-notifications.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/iron-label/iron-label.html">
-<link rel="import" href="../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-<link rel="import" href="../ha-config-section.html">
-<link rel='import' href='../../../src/components/ha-push-notifications-toggle.html'>
-
-
-<dom-module id="ha-config-section-push-notifications">
-  <template>
-    <style include="iron-flex iron-flex-alignment iron-positioning">
-      ha-push-notifications-toggle {
-        margin-left: 16px;
-      }
-    </style>
-    <ha-config-section is-wide='[[isWide]]'>
-      <span slot='header'>[[localize('ui.panel.config.core.section.push_notifications.header')]]</span>
-      <span slot='introduction'>
-        [[localize('ui.panel.config.core.section.push_notifications.introduction')]]
-      </span>
-
-      <paper-card>
-        <div class='card-content'>
-          <iron-label class='horizontal layout'>            
-            [[localize('ui.panel.config.core.section.push_notifications.push_notifications')]]
-            <ha-push-notifications-toggle
-              hass='[[hass]]'
-              push-supported='{{pushSupported}}'
-            ></ha-push-notifications-toggle>
-          </iron-label>
-        </div>
-      </paper-card>
-    </ha-config-section>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaConfigSectionPushNotifications extends window.hassMixins.LocalizeMixin(Polymer.Element) {
-  static get is() { return 'ha-config-section-push-notifications'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-      pushSupported: {
-        type: Boolean,
-        notify: true,
-      },
-    };
-  }
-}
-
-customElements.define(HaConfigSectionPushNotifications.is, HaConfigSectionPushNotifications);
-</script>
diff --git a/panels/config/core/ha-config-section-push-notifications.js b/panels/config/core/ha-config-section-push-notifications.js
new file mode 100644
index 0000000000..760160f6b7
--- /dev/null
+++ b/panels/config/core/ha-config-section-push-notifications.js
@@ -0,0 +1,54 @@
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/iron-label/iron-label.js';
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/components/ha-push-notifications-toggle.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
+
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaConfigSectionPushNotifications extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="iron-flex iron-flex-alignment iron-positioning">
+      ha-push-notifications-toggle {
+        margin-left: 16px;
+      }
+    </style>
+    <ha-config-section is-wide="[[isWide]]">
+      <span slot="header">[[localize('ui.panel.config.core.section.push_notifications.header')]]</span>
+      <span slot="introduction">
+        [[localize('ui.panel.config.core.section.push_notifications.introduction')]]
+      </span>
+
+      <paper-card>
+        <div class="card-content">
+          <iron-label class="horizontal layout">            
+            [[localize('ui.panel.config.core.section.push_notifications.push_notifications')]]
+            <ha-push-notifications-toggle hass="[[hass]]" push-supported="{{pushSupported}}"></ha-push-notifications-toggle>
+          </iron-label>
+        </div>
+      </paper-card>
+    </ha-config-section>
+`;
+  }
+
+  static get is() { return 'ha-config-section-push-notifications'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      isWide: Boolean,
+      pushSupported: {
+        type: Boolean,
+        notify: true,
+      },
+    };
+  }
+}
+
+customElements.define(HaConfigSectionPushNotifications.is, HaConfigSectionPushNotifications);
diff --git a/panels/config/core/ha-config-section-themes.html b/panels/config/core/ha-config-section-themes.js
similarity index 63%
rename from panels/config/core/ha-config-section-themes.html
rename to panels/config/core/ha-config-section-themes.js
index 886b8a146d..d4662df386 100644
--- a/panels/config/core/ha-config-section-themes.html
+++ b/panels/config/core/ha-config-section-themes.js
@@ -1,28 +1,32 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-<link rel="import" href="../ha-config-section.html">
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
 
-<dom-module id="ha-config-section-themes">
-  <template>
-    <ha-config-section is-wide='[[isWide]]'>
-      <span slot='header'>[[localize('ui.panel.config.core.section.themes.header')]]</span>
-      <span slot='introduction'>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaConfigSectionThemes extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
+    <ha-config-section is-wide="[[isWide]]">
+      <span slot="header">[[localize('ui.panel.config.core.section.themes.header')]]</span>
+      <span slot="introduction">
         [[localize('ui.panel.config.core.section.themes.introduction')]]
       </span>
 
       <paper-card>
-        <div class='card-content'>
-          <paper-dropdown-menu label="[[localize('ui.panel.config.core.section.themes.header')]]" dynamic-align>
-            <paper-listbox
-              slot="dropdown-content"
-              selected='{{selectedTheme}}'
-            >
-              <template is='dom-repeat' items='[[themes]]' as='theme'>
+        <div class="card-content">
+          <paper-dropdown-menu label="[[localize('ui.panel.config.core.section.themes.header')]]" dynamic-align="">
+            <paper-listbox slot="dropdown-content" selected="{{selectedTheme}}">
+              <template is="dom-repeat" items="[[themes]]" as="theme">
                 <paper-item>[[theme]]</paper-item>
               </template>
             </paper-listbox>
@@ -30,16 +34,9 @@
         </div>
       </paper-card>
     </ha-config-section>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaConfigSectionThemes extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
   static get is() { return 'ha-config-section-themes'; }
 
   static get properties() {
@@ -95,4 +92,3 @@ class HaConfigSectionThemes extends
 }
 
 customElements.define(HaConfigSectionThemes.is, HaConfigSectionThemes);
-</script>
diff --git a/panels/config/core/ha-config-section-translation.html b/panels/config/core/ha-config-section-translation.js
similarity index 62%
rename from panels/config/core/ha-config-section-translation.html
rename to panels/config/core/ha-config-section-translation.js
index c727929e81..e06afb7015 100644
--- a/panels/config/core/ha-config-section-translation.html
+++ b/panels/config/core/ha-config-section-translation.js
@@ -1,42 +1,42 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-<link rel="import" href="../ha-config-section.html">
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
 
-<dom-module id="ha-config-section-translation">
-  <template>
-    <ha-config-section is-wide='[[isWide]]'>
-      <span slot='header'>[[localize('ui.panel.config.core.section.translation.header')]]</span>
-      <span slot='introduction'>
-        [[localize('ui.panel.config.core.section.translation.introduction')]]
-      </span>
-
-      <paper-card>
-        <div class='card-content'>
-          <paper-dropdown-menu label="[[localize('ui.panel.config.core.section.translation.language')]]" dynamic-align>
-            <paper-listbox slot="dropdown-content" attr-for-selected="language-tag" selected="{{languageSelection}}">
-              <template is='dom-repeat' items='[[languages]]'>
-                <paper-item language-tag$="[[item.tag]]">[[item.nativeName]]</paper-item>
-              </template>
-            </paper-listbox>
-          ></paper-dropdown-menu>
-        </div>
-      </paper-card>
-    </ha-config-section>
-  </template>
-</dom-module>
-
-<script>
 /*
  * @appliesMixin window.hassMixins.LocalizeMixin
  * @appliesMixin window.hassMixins.EventsMixin
  */
 class HaConfigSectionTranslation extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
+  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
+    <ha-config-section is-wide="[[isWide]]">
+      <span slot="header">[[localize('ui.panel.config.core.section.translation.header')]]</span>
+      <span slot="introduction">
+        [[localize('ui.panel.config.core.section.translation.introduction')]]
+      </span>
+
+      <paper-card>
+        <div class="card-content">
+          <paper-dropdown-menu label="[[localize('ui.panel.config.core.section.translation.language')]]" dynamic-align="">
+            <paper-listbox slot="dropdown-content" attr-for-selected="language-tag" selected="{{languageSelection}}">
+              <template is="dom-repeat" items="[[languages]]">
+                <paper-item language-tag\$="[[item.tag]]">[[item.nativeName]]</paper-item>
+              </template>
+            </paper-listbox>
+          &gt;</paper-dropdown-menu>
+        </div>
+      </paper-card>
+    </ha-config-section>
+`;
+  }
+
   static get is() { return 'ha-config-section-translation'; }
 
   static get properties() {
@@ -84,4 +84,3 @@ class HaConfigSectionTranslation extends
 }
 
 customElements.define(HaConfigSectionTranslation.is, HaConfigSectionTranslation);
-</script>
diff --git a/panels/config/customize/ha-config-customize.html b/panels/config/customize/ha-config-customize.html
deleted file mode 100644
index 9d5467f624..0000000000
--- a/panels/config/customize/ha-config-customize.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-
-<link rel="import" href="../../../src/util/hass-util.html">
-<link rel="import" href="../../../src/resources/ha-style.html">
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-
-<link rel="import" href="./ha-form-customize.html">
-<link rel="import" href="../ha-config-section.html">
-<link rel="import" href="../ha-entity-config.html">
-
-<dom-module id="ha-config-customize">
-  <template>
-    <style include="ha-style">
-    </style>
-
-    <app-header-layout has-scrolling-region>
-      <app-header slot="header" fixed>
-        <app-toolbar>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='_backTapped'
-          ></paper-icon-button>
-          <div main-title>[[localize('ui.panel.config.customize.caption')]]</div>
-        </app-toolbar>
-      </app-header>
-
-      <div class$='[[computeClasses(isWide)]]'>
-        <ha-config-section is-wide='[[isWide]]'>
-          <span slot='header'>Customization</span>
-          <span slot='introduction'>
-            Tweak per-entity attributes.<br>
-            Added/edited customizations will take effect immediately. Removed customizations will take effect when the entity is updated.
-          </span>
-          <ha-entity-config
-            hass='[[hass]]'
-            label='Entity'
-            entities='[[entities]]'
-            config='[[entityConfig]]'>
-          </ha-entity-config>
-        </ha-config-section>
-      </div>
-    </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaConfigCustomize extends window.hassMixins.LocalizeMixin(Polymer.Element) {
-  static get is() { return 'ha-config-customize'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-
-      entities: {
-        type: Array,
-        computed: 'computeEntities(hass)',
-      },
-
-      entityConfig: {
-        type: Object,
-        value: {
-          component: 'ha-form-customize',
-          computeSelectCaption: stateObj =>
-            window.hassUtil.computeStateName(stateObj) + ' (' + window.hassUtil.computeDomain(stateObj) + ')'
-        }
-      },
-    };
-  }
-
-  computeClasses(isWide) {
-    return isWide ? 'content' : 'content narrow';
-  }
-
-  _backTapped() {
-    history.back();
-  }
-
-  computeEntities(hass) {
-    return Object.keys(hass.states)
-      .map(key => hass.states[key])
-      .sort(window.hassUtil.sortByName);
-  }
-}
-customElements.define(HaConfigCustomize.is, HaConfigCustomize);
-</script>
diff --git a/panels/config/customize/ha-config-customize.js b/panels/config/customize/ha-config-customize.js
new file mode 100644
index 0000000000..603627b0dc
--- /dev/null
+++ b/panels/config/customize/ha-config-customize.js
@@ -0,0 +1,84 @@
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
+import '../../../src/util/hass-util.js';
+import '../ha-config-section.js';
+import '../ha-entity-config.js';
+import './ha-form-customize.js';
+
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaConfigCustomize extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="ha-style">
+    </style>
+
+    <app-header-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
+        <app-toolbar>
+          <paper-icon-button icon="mdi:arrow-left" on-click="_backTapped"></paper-icon-button>
+          <div main-title="">[[localize('ui.panel.config.customize.caption')]]</div>
+        </app-toolbar>
+      </app-header>
+
+      <div class\$="[[computeClasses(isWide)]]">
+        <ha-config-section is-wide="[[isWide]]">
+          <span slot="header">Customization</span>
+          <span slot="introduction">
+            Tweak per-entity attributes.<br>
+            Added/edited customizations will take effect immediately. Removed customizations will take effect when the entity is updated.
+          </span>
+          <ha-entity-config hass="[[hass]]" label="Entity" entities="[[entities]]" config="[[entityConfig]]">
+          </ha-entity-config>
+        </ha-config-section>
+      </div>
+    </app-header-layout>
+`;
+  }
+
+  static get is() { return 'ha-config-customize'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      isWide: Boolean,
+
+      entities: {
+        type: Array,
+        computed: 'computeEntities(hass)',
+      },
+
+      entityConfig: {
+        type: Object,
+        value: {
+          component: 'ha-form-customize',
+          computeSelectCaption: stateObj =>
+            window.hassUtil.computeStateName(stateObj) + ' (' + window.hassUtil.computeDomain(stateObj) + ')'
+        }
+      },
+    };
+  }
+
+  computeClasses(isWide) {
+    return isWide ? 'content' : 'content narrow';
+  }
+
+  _backTapped() {
+    history.back();
+  }
+
+  computeEntities(hass) {
+    return Object.keys(hass.states)
+      .map(key => hass.states[key])
+      .sort(window.hassUtil.sortByName);
+  }
+}
+customElements.define(HaConfigCustomize.is, HaConfigCustomize);
diff --git a/panels/config/customize/ha-customize-attribute.html b/panels/config/customize/ha-customize-attribute.js
similarity index 69%
rename from panels/config/customize/ha-customize-attribute.html
rename to panels/config/customize/ha-customize-attribute.js
index f13ba38807..56f9e5e3a2 100644
--- a/panels/config/customize/ha-customize-attribute.html
+++ b/panels/config/customize/ha-customize-attribute.js
@@ -1,17 +1,18 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel='import' href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/util/hass-attributes-util.html">
+import '../../../src/util/hass-attributes-util.js';
+import '../ha-form-style.js';
+import './types/ha-customize-array.js';
+import './types/ha-customize-boolean.js';
+import './types/ha-customize-icon.js';
+import './types/ha-customize-key-value.js';
+import './types/ha-customize-string.js';
 
-<link rel="import" href="../ha-form-style.html">
-<link rel="import" href="./types/ha-customize-array.html">
-<link rel="import" href="./types/ha-customize-boolean.html">
-<link rel="import" href="./types/ha-customize-icon.html">
-<link rel="import" href="./types/ha-customize-key-value.html">
-<link rel="import" href="./types/ha-customize-string.html">
-
-<dom-module id="ha-customize-attribute">
-  <template>
+class HaCustomizeAttribute extends PolymerElement {
+  static get template() {
+    return html`
     <style include="ha-form-style">
       :host {
         display: block;
@@ -26,13 +27,11 @@
         right: 0;
       }
     </style>
-    <div id='wrapper' class='form-group'></div>
+    <div id="wrapper" class="form-group"></div>
     <paper-icon-button class="button" icon="[[getIcon(item.secondary)]]" on-click="tapButton"></paper-icon-button>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaCustomizeAttribute extends Polymer.Element {
   static get is() { return 'ha-customize-attribute'; }
 
   static get properties() {
@@ -82,4 +81,3 @@ class HaCustomizeAttribute extends Polymer.Element {
   }
 }
 customElements.define(HaCustomizeAttribute.is, HaCustomizeAttribute);
-</script>
diff --git a/panels/config/customize/ha-form-customize-attributes.html b/panels/config/customize/ha-form-customize-attributes.html
deleted file mode 100644
index 7e966c92d4..0000000000
--- a/panels/config/customize/ha-form-customize-attributes.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/polymer/lib/mixins/mutable-data.html">
-
-<link rel="import" href="./ha-customize-attribute.html">
-
-<dom-module id="ha-form-customize-attributes">
-  <template>
-    <style>
-      [hidden] {
-        display: none;
-      }
-    </style>
-    <template is='dom-repeat' items='{{attributes}}' mutable-data>
-      <ha-customize-attribute
-        item="{{item}}"
-        hidden$="[[item.closed]]">
-      </ha-customize-attribute>
-    </template>
-  </template>
-</dom-module>
-
-<script>
-class HaFormCustomizeAttributes extends Polymer.MutableData(Polymer.Element) {
-  static get is() { return 'ha-form-customize-attributes'; }
-
-  static get properties() {
-    return {
-      attributes: {
-        type: Array,
-        notify: true,
-      },
-    };
-  }
-}
-customElements.define(HaFormCustomizeAttributes.is, HaFormCustomizeAttributes);
-</script>
diff --git a/panels/config/customize/ha-form-customize-attributes.js b/panels/config/customize/ha-form-customize-attributes.js
new file mode 100644
index 0000000000..eecc1e9a54
--- /dev/null
+++ b/panels/config/customize/ha-form-customize-attributes.js
@@ -0,0 +1,33 @@
+import { MutableData } from '@polymer/polymer/lib/mixins/mutable-data.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import './ha-customize-attribute.js';
+
+class HaFormCustomizeAttributes extends MutableData(PolymerElement) {
+  static get template() {
+    return html`
+    <style>
+      [hidden] {
+        display: none;
+      }
+    </style>
+    <template is="dom-repeat" items="{{attributes}}" mutable-data="">
+      <ha-customize-attribute item="{{item}}" hidden\$="[[item.closed]]">
+      </ha-customize-attribute>
+    </template>
+`;
+  }
+
+  static get is() { return 'ha-form-customize-attributes'; }
+
+  static get properties() {
+    return {
+      attributes: {
+        type: Array,
+        notify: true,
+      },
+    };
+  }
+}
+customElements.define(HaFormCustomizeAttributes.is, HaFormCustomizeAttributes);
diff --git a/panels/config/customize/ha-form-customize.html b/panels/config/customize/ha-form-customize.js
similarity index 86%
rename from panels/config/customize/ha-form-customize.html
rename to panels/config/customize/ha-form-customize.js
index b0d99bb73b..485fb97ac8 100644
--- a/panels/config/customize/ha-form-customize.html
+++ b/panels/config/customize/ha-form-customize.js
@@ -1,15 +1,16 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/util/hass-util.html">
-<link rel="import" href="../../../src/util/hass-attributes-util.html">
+import '../../../src/util/hass-attributes-util.js';
+import '../../../src/util/hass-util.js';
+import './ha-form-customize-attributes.js';
 
-<link rel="import" href="./ha-form-customize-attributes.html">
-
-<dom-module id="ha-form-customize">
-  <template>
+class HaFormCustomize extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style ha-form-style">
       .warning {
         color: red;
@@ -19,59 +20,50 @@
         padding-left: 20px;
       }
     </style>
-    <template is='dom-if' if='[[computeShowWarning(localConfig, globalConfig)]]'>
+    <template is="dom-if" if="[[computeShowWarning(localConfig, globalConfig)]]">
       <div class="warning">
         It seems that your configuration.yaml doesn't properly include customize.yaml<br>
         Changes made here won't affect your configuration.
       </div>
     </template>
-    <template is='dom-if' if='[[hasLocalAttributes]]'>
+    <template is="dom-if" if="[[hasLocalAttributes]]">
       <h4 class="attributes-text">
         The following attributes are already set in customize.yaml<br>
       </h4>
       <ha-form-customize-attributes attributes="{{localAttributes}}"></ha-form-customize-attributes>
     </template>
-    <template is='dom-if' if='[[hasGlobalAttributes]]'>
+    <template is="dom-if" if="[[hasGlobalAttributes]]">
       <h4 class="attributes-text">
         The following attributes are customized from outside of customize.yaml<br>
         Possibly via a domain, a glob or a different include.
       </h4>
       <ha-form-customize-attributes attributes="{{globalAttributes}}"></ha-form-customize-attributes>
     </template>
-    <template is='dom-if' if='[[hasExistingAttributes]]'>
+    <template is="dom-if" if="[[hasExistingAttributes]]">
       <h4 class="attributes-text">
         The following attributes of the entity are set programatically.<br>
         You can override them if you like.
       </h4>
       <ha-form-customize-attributes attributes="{{existingAttributes}}"></ha-form-customize-attributes>
     </template>
-    <template is='dom-if' if='[[hasNewAttributes]]'>
+    <template is="dom-if" if="[[hasNewAttributes]]">
       <h4 class="attributes-text">
         The following attributes weren't set. Set them if you like.
       </h4>
       <ha-form-customize-attributes attributes="{{newAttributes}}"></ha-form-customize-attributes>
     </template>
-    <div class='form-group'>
-      <paper-dropdown-menu
-        label='Pick an attribute to override'
-        class='flex'
-        dynamic-align
-      >
-        <paper-listbox
-          slot="dropdown-content"
-          selected='{{selectedNewAttribute}}'
-        >
-          <template is='dom-repeat' items='[[newAttributesOptions]]' as='option'>
+    <div class="form-group">
+      <paper-dropdown-menu label="Pick an attribute to override" class="flex" dynamic-align="">
+        <paper-listbox slot="dropdown-content" selected="{{selectedNewAttribute}}">
+          <template is="dom-repeat" items="[[newAttributesOptions]]" as="option">
             <paper-item>[[option]]</paper-item>
           </template>
         </paper-listbox>
       </paper-dropdown-menu>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaFormCustomize extends Polymer.Element {
   static get is() { return 'ha-form-customize'; }
 
   static get properties() {
@@ -275,4 +267,3 @@ class HaFormCustomize extends Polymer.Element {
   }
 }
 customElements.define(HaFormCustomize.is, HaFormCustomize);
-</script>
diff --git a/panels/config/customize/types/ha-customize-array.html b/panels/config/customize/types/ha-customize-array.js
similarity index 50%
rename from panels/config/customize/types/ha-customize-array.html
rename to panels/config/customize/types/ha-customize-array.js
index b95733c659..145a08bf00 100644
--- a/panels/config/customize/types/ha-customize-array.html
+++ b/panels/config/customize/types/ha-customize-array.js
@@ -1,36 +1,29 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../../../bower_components/paper-item/paper-item.html'>
-<link rel="import" href="../../../../src/util/hass-mixins.html">
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='ha-customize-array'>
-  <template>
+import '../../../../src/util/hass-mixins.js';
+
+class HaCustomizeArray extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       paper-dropdown-menu {
         margin: -9px 0;
       }
     </style>
-    <paper-dropdown-menu
-      label='[[item.description]]'
-      disabled='[[item.secondary]]'
-      selected-item-label="{{item.value}}"
-      dynamic-align
-    >
-      <paper-listbox
-        slot="dropdown-content"
-        selected='[[computeSelected(item)]]'
-      >
-        <template is='dom-repeat' items='[[getOptions(item)]]' as='option'>
+    <paper-dropdown-menu label="[[item.description]]" disabled="[[item.secondary]]" selected-item-label="{{item.value}}" dynamic-align="">
+      <paper-listbox slot="dropdown-content" selected="[[computeSelected(item)]]">
+        <template is="dom-repeat" items="[[getOptions(item)]]" as="option">
           <paper-item>[[option]]</paper-item>
         </template>
       </paper-listbox>
     </paper-dropdown-menu>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaCustomizeArray extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-customize-array'; }
 
   static get properties() {
@@ -59,4 +52,3 @@ class HaCustomizeArray extends window.hassMixins.EventsMixin(Polymer.Element) {
   }
 }
 customElements.define(HaCustomizeArray.is, HaCustomizeArray);
-</script>
diff --git a/panels/config/customize/types/ha-customize-boolean.html b/panels/config/customize/types/ha-customize-boolean.html
deleted file mode 100644
index 2e48e54983..0000000000
--- a/panels/config/customize/types/ha-customize-boolean.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../../../bower_components/paper-checkbox/paper-checkbox.html'>
-
-<dom-module id='ha-customize-boolean'>
-  <template>
-    <paper-checkbox
-      disabled='[[item.secondary]]'
-      checked="{{item.value}}"
-    >
-      [[item.description]]
-    </paper-checkbox>
-  </template>
-</dom-module>
-
-<script>
-class HaCustomizeBoolean extends Polymer.Element {
-  static get is() { return 'ha-customize-boolean'; }
-
-  static get properties() {
-    return {
-      item: {
-        type: Object,
-        notifies: true,
-      }
-    };
-  }
-}
-customElements.define(HaCustomizeBoolean.is, HaCustomizeBoolean);
-</script>
diff --git a/panels/config/customize/types/ha-customize-boolean.js b/panels/config/customize/types/ha-customize-boolean.js
new file mode 100644
index 0000000000..dd10b26045
--- /dev/null
+++ b/panels/config/customize/types/ha-customize-boolean.js
@@ -0,0 +1,25 @@
+import '@polymer/paper-checkbox/paper-checkbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+class HaCustomizeBoolean extends PolymerElement {
+  static get template() {
+    return html`
+    <paper-checkbox disabled="[[item.secondary]]" checked="{{item.value}}">
+      [[item.description]]
+    </paper-checkbox>
+`;
+  }
+
+  static get is() { return 'ha-customize-boolean'; }
+
+  static get properties() {
+    return {
+      item: {
+        type: Object,
+        notifies: true,
+      }
+    };
+  }
+}
+customElements.define(HaCustomizeBoolean.is, HaCustomizeBoolean);
diff --git a/panels/config/customize/types/ha-customize-icon.html b/panels/config/customize/types/ha-customize-icon.html
deleted file mode 100644
index 013bdf772e..0000000000
--- a/panels/config/customize/types/ha-customize-icon.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../../../bower_components/iron-icon/iron-icon.html'>
-<link rel='import' href='../../../../bower_components/paper-input/paper-input.html'>
-
-<dom-module id='ha-customize-icon'>
-  <template>
-    <style>
-      :host {
-        @apply --layout-horizontal;
-      }
-      .icon-image {
-        border: 1px solid grey;
-        padding: 8px;
-        margin-right: 20px;
-        margin-top: 10px;
-      }
-    </style>
-    <iron-icon class="icon-image" icon="[[item.value]]"></iron-icon>
-    <paper-input
-      auto-validate pattern="(mdi:.*)?" error-message="Must start with 'mdi:'"
-      disabled='[[item.secondary]]'
-      label='icon'
-      value='{{item.value}}'>
-    </paper-input>
-  </template>
-</dom-module>
-
-<script>
-class HaCustomizeIcon extends Polymer.Element {
-  static get is() { return 'ha-customize-icon'; }
-
-  static get properties() {
-    return {
-      item: {
-        type: Object,
-        notifies: true,
-      }
-    };
-  }
-}
-customElements.define(HaCustomizeIcon.is, HaCustomizeIcon);
-</script>
diff --git a/panels/config/customize/types/ha-customize-icon.js b/panels/config/customize/types/ha-customize-icon.js
new file mode 100644
index 0000000000..c7daad4410
--- /dev/null
+++ b/panels/config/customize/types/ha-customize-icon.js
@@ -0,0 +1,37 @@
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+class HaCustomizeIcon extends PolymerElement {
+  static get template() {
+    return html`
+    <style>
+      :host {
+        @apply --layout-horizontal;
+      }
+      .icon-image {
+        border: 1px solid grey;
+        padding: 8px;
+        margin-right: 20px;
+        margin-top: 10px;
+      }
+    </style>
+    <iron-icon class="icon-image" icon="[[item.value]]"></iron-icon>
+    <paper-input auto-validate="" pattern="(mdi:.*)?" error-message="Must start with 'mdi:'" disabled="[[item.secondary]]" label="icon" value="{{item.value}}">
+    </paper-input>
+`;
+  }
+
+  static get is() { return 'ha-customize-icon'; }
+
+  static get properties() {
+    return {
+      item: {
+        type: Object,
+        notifies: true,
+      }
+    };
+  }
+}
+customElements.define(HaCustomizeIcon.is, HaCustomizeIcon);
diff --git a/panels/config/customize/types/ha-customize-key-value.html b/panels/config/customize/types/ha-customize-key-value.html
deleted file mode 100644
index a9d17e9496..0000000000
--- a/panels/config/customize/types/ha-customize-key-value.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../../../bower_components/paper-input/paper-input.html'>
-
-<dom-module id='ha-customize-key-value'>
-  <template>
-    <style>
-      :host {
-        @apply --layout-horizontal;
-      }
-      paper-input {
-        @apply --layout-flex;
-      }
-      .key {
-        padding-right: 20px;
-      }
-    </style>
-    <paper-input
-      disabled='[[item.secondary]]'
-      class='key'
-      label='Attribute name'
-      value='{{item.attribute}}'>
-    </paper-input>
-    <paper-input
-      disabled='[[item.secondary]]'
-      label='Attribute value'
-      value='{{item.value}}'>
-    </paper-input>
-  </template>
-</dom-module>
-
-<script>
-class HaCustomizeKeyValue extends Polymer.Element {
-  static get is() { return 'ha-customize-key-value'; }
-
-  static get properties() {
-    return {
-      item: {
-        type: Object,
-        notifies: true,
-      }
-    };
-  }
-}
-customElements.define(HaCustomizeKeyValue.is, HaCustomizeKeyValue);
-</script>
diff --git a/panels/config/customize/types/ha-customize-key-value.js b/panels/config/customize/types/ha-customize-key-value.js
new file mode 100644
index 0000000000..1e239ba1c6
--- /dev/null
+++ b/panels/config/customize/types/ha-customize-key-value.js
@@ -0,0 +1,37 @@
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+class HaCustomizeKeyValue extends PolymerElement {
+  static get template() {
+    return html`
+    <style>
+      :host {
+        @apply --layout-horizontal;
+      }
+      paper-input {
+        @apply --layout-flex;
+      }
+      .key {
+        padding-right: 20px;
+      }
+    </style>
+    <paper-input disabled="[[item.secondary]]" class="key" label="Attribute name" value="{{item.attribute}}">
+    </paper-input>
+    <paper-input disabled="[[item.secondary]]" label="Attribute value" value="{{item.value}}">
+    </paper-input>
+`;
+  }
+
+  static get is() { return 'ha-customize-key-value'; }
+
+  static get properties() {
+    return {
+      item: {
+        type: Object,
+        notifies: true,
+      }
+    };
+  }
+}
+customElements.define(HaCustomizeKeyValue.is, HaCustomizeKeyValue);
diff --git a/panels/config/customize/types/ha-customize-string.html b/panels/config/customize/types/ha-customize-string.html
deleted file mode 100644
index 8af29675bd..0000000000
--- a/panels/config/customize/types/ha-customize-string.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../../../bower_components/paper-input/paper-input.html'>
-
-<dom-module id='ha-customize-string'>
-  <template>
-    <paper-input
-      disabled='[[item.secondary]]'
-      label='[[getLabel(item)]]'
-      value='{{item.value}}'>
-    </paper-input>
-  </template>
-</dom-module>
-
-<script>
-class HaCustomizeString extends Polymer.Element {
-  static get is() { return 'ha-customize-string'; }
-
-  static get properties() {
-    return {
-      item: {
-        type: Object,
-        notifies: true,
-      }
-    };
-  }
-
-  getLabel(item) {
-    return item.description + (item.type === 'json' ? ' (JSON formatted)' : '');
-  }
-}
-customElements.define(HaCustomizeString.is, HaCustomizeString);
-</script>
diff --git a/panels/config/customize/types/ha-customize-string.js b/panels/config/customize/types/ha-customize-string.js
new file mode 100644
index 0000000000..ade7377be4
--- /dev/null
+++ b/panels/config/customize/types/ha-customize-string.js
@@ -0,0 +1,28 @@
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+class HaCustomizeString extends PolymerElement {
+  static get template() {
+    return html`
+    <paper-input disabled="[[item.secondary]]" label="[[getLabel(item)]]" value="{{item.value}}">
+    </paper-input>
+`;
+  }
+
+  static get is() { return 'ha-customize-string'; }
+
+  static get properties() {
+    return {
+      item: {
+        type: Object,
+        notifies: true,
+      }
+    };
+  }
+
+  getLabel(item) {
+    return item.description + (item.type === 'json' ? ' (JSON formatted)' : '');
+  }
+}
+customElements.define(HaCustomizeString.is, HaCustomizeString);
diff --git a/panels/config/dashboard/ha-config-cloud-menu.html b/panels/config/dashboard/ha-config-cloud-menu.html
deleted file mode 100644
index 954cf08614..0000000000
--- a/panels/config/dashboard/ha-config-cloud-menu.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../../bower_components/iron-icon/iron-icon.html">
-
-<link rel="import" href="../../../src/util/hass-mixins.html">
-
-<dom-module id="ha-config-cloud-menu">
-  <template>
-    <style include="iron-flex">
-      paper-card {
-        display: block;
-      }
-      paper-item {
-        cursor: pointer;
-      }
-    </style>
-    <paper-card>
-      <paper-item on-click='_navigate'>
-        <paper-item-body two-line>
-          Home Assistant Cloud
-          <template is='dom-if' if='[[account]]'>
-            <div secondary>Logged in as [[account.email]]</div>
-          </template>
-          <template is='dom-if' if='[[!account]]'>
-            <div secondary>Not logged in</div>
-          </template>
-        </paper-item-body>
-        <iron-icon icon='mdi:chevron-right'></iron-icon>
-      </paper-item>
-    </paper-card>
-  </template>
-</dom-module>
-
-<script>
-class HaConfigCloudMenu extends window.hassMixins.NavigateMixin(Polymer.Element) {
-  static get is() { return 'ha-config-cloud-menu'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-      account: Object,
-    };
-  }
-
-  _navigate() {
-    this.navigate('/config/cloud');
-  }
-}
-
-customElements.define(HaConfigCloudMenu.is, HaConfigCloudMenu);
-</script>
diff --git a/panels/config/dashboard/ha-config-cloud-menu.js b/panels/config/dashboard/ha-config-cloud-menu.js
new file mode 100644
index 0000000000..402317b9a5
--- /dev/null
+++ b/panels/config/dashboard/ha-config-cloud-menu.js
@@ -0,0 +1,53 @@
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/util/hass-mixins.js';
+
+class HaConfigCloudMenu extends window.hassMixins.NavigateMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="iron-flex">
+      paper-card {
+        display: block;
+      }
+      paper-item {
+        cursor: pointer;
+      }
+    </style>
+    <paper-card>
+      <paper-item on-click="_navigate">
+        <paper-item-body two-line="">
+          Home Assistant Cloud
+          <template is="dom-if" if="[[account]]">
+            <div secondary="">Logged in as [[account.email]]</div>
+          </template>
+          <template is="dom-if" if="[[!account]]">
+            <div secondary="">Not logged in</div>
+          </template>
+        </paper-item-body>
+        <iron-icon icon="mdi:chevron-right"></iron-icon>
+      </paper-item>
+    </paper-card>
+`;
+  }
+
+  static get is() { return 'ha-config-cloud-menu'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      isWide: Boolean,
+      account: Object,
+    };
+  }
+
+  _navigate() {
+    this.navigate('/config/cloud');
+  }
+}
+
+customElements.define(HaConfigCloudMenu.is, HaConfigCloudMenu);
diff --git a/panels/config/dashboard/ha-config-dashboard.html b/panels/config/dashboard/ha-config-dashboard.html
deleted file mode 100644
index 921370ce1e..0000000000
--- a/panels/config/dashboard/ha-config-dashboard.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-
-<link rel="import" href="../../../src/components/ha-menu-button.html">
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-<link rel="import" href="../ha-config-section.html">
-
-<link rel="import" href="./ha-config-navigation.html">
-<link rel="import" href="./ha-config-cloud-menu.html">
-<link rel="import" href="./ha-config-entries-menu.html">
-
-
-<dom-module id="ha-config-dashboard">
-  <template>
-    <style include="iron-flex ha-style">
-      .content {
-        padding-bottom: 32px;
-      }
-    </style>
-
-    <app-header-layout has-scrolling-region>
-      <app-header slot="header" fixed>
-        <app-toolbar>
-          <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
-          <div main-title>[[localize('panel.configuration')]]</div>
-        </app-toolbar>
-      </app-header>
-
-      <div class='content'>
-        <ha-config-section
-          is-wide='[[isWide]]'
-        >
-          <span slot='header'>[[localize('ui.panel.config.header')]]</span>
-          <span slot='introduction'>[[localize('ui.panel.config.introduction')]]</span>
-
-          <template is='dom-if' if='[[computeIsLoaded(hass, "cloud")]]'>
-            <ha-config-cloud-menu
-              hass='[[hass]]'
-              account='[[account]]'
-            ></ha-config-cloud-menu>
-          </template>
-
-          <template is='dom-if' if='[[computeIsLoaded(hass, "config.config_entries")]]'>
-            <ha-config-entries-menu
-              hass='[[hass]]'
-            ></ha-config-entries-menu>
-          </template>
-
-          <ha-config-navigation
-            hass='[[hass]]'
-          ></ha-config-navigation>
-        </ha-config-section>
-      </div>
-    </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaConfigDashboard extends window.hassMixins.LocalizeMixin(Polymer.Element) {
-  static get is() { return 'ha-config-dashboard'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-      account: Object,
-      narrow: Boolean,
-      showMenu: Boolean,
-    };
-  }
-
-  computeIsLoaded(hass, component) {
-    return window.hassUtil.isComponentLoaded(hass, component);
-  }
-}
-
-customElements.define(HaConfigDashboard.is, HaConfigDashboard);
-</script>
diff --git a/panels/config/dashboard/ha-config-dashboard.js b/panels/config/dashboard/ha-config-dashboard.js
new file mode 100644
index 0000000000..c94d5ec218
--- /dev/null
+++ b/panels/config/dashboard/ha-config-dashboard.js
@@ -0,0 +1,71 @@
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/components/ha-menu-button.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
+import './ha-config-cloud-menu.js';
+import './ha-config-entries-menu.js';
+import './ha-config-navigation.js';
+
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaConfigDashboard extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style">
+      .content {
+        padding-bottom: 32px;
+      }
+    </style>
+
+    <app-header-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
+        <app-toolbar>
+          <ha-menu-button narrow="[[narrow]]" show-menu="[[showMenu]]"></ha-menu-button>
+          <div main-title="">[[localize('panel.configuration')]]</div>
+        </app-toolbar>
+      </app-header>
+
+      <div class="content">
+        <ha-config-section is-wide="[[isWide]]">
+          <span slot="header">[[localize('ui.panel.config.header')]]</span>
+          <span slot="introduction">[[localize('ui.panel.config.introduction')]]</span>
+
+          <template is="dom-if" if="[[computeIsLoaded(hass, &quot;cloud&quot;)]]">
+            <ha-config-cloud-menu hass="[[hass]]" account="[[account]]"></ha-config-cloud-menu>
+          </template>
+
+          <template is="dom-if" if="[[computeIsLoaded(hass, &quot;config.config_entries&quot;)]]">
+            <ha-config-entries-menu hass="[[hass]]"></ha-config-entries-menu>
+          </template>
+
+          <ha-config-navigation hass="[[hass]]"></ha-config-navigation>
+        </ha-config-section>
+      </div>
+    </app-header-layout>
+`;
+  }
+
+  static get is() { return 'ha-config-dashboard'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      isWide: Boolean,
+      account: Object,
+      narrow: Boolean,
+      showMenu: Boolean,
+    };
+  }
+
+  computeIsLoaded(hass, component) {
+    return window.hassUtil.isComponentLoaded(hass, component);
+  }
+}
+
+customElements.define(HaConfigDashboard.is, HaConfigDashboard);
diff --git a/panels/config/dashboard/ha-config-entries-menu.html b/panels/config/dashboard/ha-config-entries-menu.html
deleted file mode 100644
index e6a77a5964..0000000000
--- a/panels/config/dashboard/ha-config-entries-menu.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<link rel="import" href='../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../../bower_components/iron-icon/iron-icon.html">
-
-<link rel="import" href="../../../src/util/hass-mixins.html">
-
-<dom-module id="ha-config-entries-menu">
-  <template>
-    <style include="iron-flex">
-      paper-card {
-        display: block;
-      }
-      paper-item {
-        cursor: pointer;
-      }
-    </style>
-    <paper-card>
-      <paper-item on-click='_navigate'>
-        <paper-item-body two-line>
-          Integrations
-          <div secondary>EXPERIMENTAL – Manage connected devices and services</div>
-        </paper-item-body>
-        <iron-icon icon='mdi:chevron-right'></iron-icon>
-      </paper-item>
-    </paper-card>
-  </template>
-</dom-module>
-
-<script>
-class HaConfigEntriesMenu extends window.hassMixins.NavigateMixin(Polymer.Element) {
-  static get is() { return 'ha-config-entries-menu'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-      account: Object,
-    };
-  }
-
-  _navigate() {
-    this.navigate('/config/integrations');
-  }
-}
-
-customElements.define(HaConfigEntriesMenu.is, HaConfigEntriesMenu);
-</script>
diff --git a/panels/config/dashboard/ha-config-entries-menu.js b/panels/config/dashboard/ha-config-entries-menu.js
new file mode 100644
index 0000000000..fadea0ace4
--- /dev/null
+++ b/panels/config/dashboard/ha-config-entries-menu.js
@@ -0,0 +1,48 @@
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/util/hass-mixins.js';
+
+class HaConfigEntriesMenu extends window.hassMixins.NavigateMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="iron-flex">
+      paper-card {
+        display: block;
+      }
+      paper-item {
+        cursor: pointer;
+      }
+    </style>
+    <paper-card>
+      <paper-item on-click="_navigate">
+        <paper-item-body two-line="">
+          Integrations
+          <div secondary="">EXPERIMENTAL – Manage connected devices and services</div>
+        </paper-item-body>
+        <iron-icon icon="mdi:chevron-right"></iron-icon>
+      </paper-item>
+    </paper-card>
+`;
+  }
+
+  static get is() { return 'ha-config-entries-menu'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      isWide: Boolean,
+      account: Object,
+    };
+  }
+
+  _navigate() {
+    this.navigate('/config/integrations');
+  }
+}
+
+customElements.define(HaConfigEntriesMenu.is, HaConfigEntriesMenu);
diff --git a/panels/config/dashboard/ha-config-navigation.html b/panels/config/dashboard/ha-config-navigation.js
similarity index 61%
rename from panels/config/dashboard/ha-config-navigation.html
rename to panels/config/dashboard/ha-config-navigation.js
index 921960c163..3ec4b58c75 100644
--- a/panels/config/dashboard/ha-config-navigation.html
+++ b/panels/config/dashboard/ha-config-navigation.js
@@ -1,38 +1,12 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../../bower_components/iron-icon/iron-icon.html">
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/util/hass-mixins.html'>
+import '../../../src/util/hass-mixins.js';
 
-<dom-module id="ha-config-navigation">
-  <template>
-    <style include="iron-flex">
-      paper-card {
-        display: block;
-      }
-      paper-item {
-        cursor: pointer;
-      }
-    </style>
-    <paper-card>
-      <template is='dom-repeat' items='[[pages]]'>
-        <template is='dom-if' if='[[_computeLoaded(hass, item)]]'>
-          <paper-item on-click='_navigate'>
-            <paper-item-body two-line>
-              [[_computeCaption(item, localize)]]
-              <div secondary>[[_computeDescription(item, localize)]]</div>
-            </paper-item-body>
-            <iron-icon icon='mdi:chevron-right'></iron-icon>
-          </paper-item>
-        </template>
-      </template>
-    </paper-card>
-  </template>
-</dom-module>
-
-<script>
 {
   const CORE_PAGES = [
     'core',
@@ -43,7 +17,33 @@
    * @appliesMixin window.hassMixins.EventsMixin
    */
   class HaConfigNavigation extends
-    window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
+    window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+    static get template() {
+      return html`
+    <style include="iron-flex">
+      paper-card {
+        display: block;
+      }
+      paper-item {
+        cursor: pointer;
+      }
+    </style>
+    <paper-card>
+      <template is="dom-repeat" items="[[pages]]">
+        <template is="dom-if" if="[[_computeLoaded(hass, item)]]">
+          <paper-item on-click="_navigate">
+            <paper-item-body two-line="">
+              [[_computeCaption(item, localize)]]
+              <div secondary="">[[_computeDescription(item, localize)]]</div>
+            </paper-item-body>
+            <iron-icon icon="mdi:chevron-right"></iron-icon>
+          </paper-item>
+        </template>
+      </template>
+    </paper-card>
+`;
+    }
+
     static get is() { return 'ha-config-navigation'; }
 
     static get properties() {
@@ -84,4 +84,3 @@
 
   customElements.define(HaConfigNavigation.is, HaConfigNavigation);
 }
-</script>
diff --git a/panels/config/ha-config-js.html b/panels/config/ha-config-js.html
deleted file mode 100644
index d35e0a085b..0000000000
--- a/panels/config/ha-config-js.html
+++ /dev/null
@@ -1 +0,0 @@
-<script src='../../build-temp/panel-config.js'></script>
diff --git a/panels/config/ha-config-js.js b/panels/config/ha-config-js.js
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/panels/config/ha-config-js.js
@@ -0,0 +1 @@
+
diff --git a/panels/config/ha-config-section.html b/panels/config/ha-config-section.js
similarity index 77%
rename from panels/config/ha-config-section.html
rename to panels/config/ha-config-section.js
index 9a9f56919d..89a5348760 100644
--- a/panels/config/ha-config-section.html
+++ b/panels/config/ha-config-section.js
@@ -1,8 +1,11 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../src/resources/ha-style.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="ha-config-section">
-  <template>
+import '../../src/resources/ha-style.js';
+
+class HaConfigSection extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         padding: 28px 20px 0;
@@ -52,22 +55,20 @@
         max-width: 500px;
       }
     </style>
-    <div class$='[[computeContentClasses(isWide)]]'>
-      <div class='header'><slot name="header"></slot></div>
-      <div class$='[[computeClasses(isWide)]]'>
-        <div class='intro'>
+    <div class\$="[[computeContentClasses(isWide)]]">
+      <div class="header"><slot name="header"></slot></div>
+      <div class\$="[[computeClasses(isWide)]]">
+        <div class="intro">
           <slot name="introduction"></slot>
         </div>
-        <div class='panel flex-auto'>
+        <div class="panel flex-auto">
           <slot></slot>
         </div>
       </div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaConfigSection extends Polymer.Element {
   static get is() { return 'ha-config-section'; }
 
   static get properties() {
@@ -106,4 +107,3 @@ class HaConfigSection extends Polymer.Element {
 }
 
 customElements.define(HaConfigSection.is, HaConfigSection);
-</script>
diff --git a/panels/config/ha-entity-config.html b/panels/config/ha-entity-config.js
similarity index 64%
rename from panels/config/ha-entity-config.html
rename to panels/config/ha-entity-config.js
index 99162178ce..ee696a4339 100644
--- a/panels/config/ha-entity-config.html
+++ b/panels/config/ha-entity-config.js
@@ -1,13 +1,15 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-spinner/paper-spinner.html">
-<link rel="import" href="../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../../bower_components/paper-listbox/paper-listbox.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item.html">
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import '@polymer/paper-spinner/paper-spinner.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="ha-entity-config">
-  <template>
+class HaEntityConfig extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       paper-card {
         display: block;
@@ -34,61 +36,44 @@
       }
     </style>
     <paper-card>
-      <div class='card-content'>
-        <div class='device-picker'>
-          <paper-dropdown-menu
-            label='[[label]]'
-            class='flex'
-            disabled='[[!entities.length]]'
-          >
-            <paper-listbox
-              slot="dropdown-content"
-              selected='{{selectedEntity}}'
-            >
-              <template is='dom-repeat' items='[[entities]]' as='state'>
+      <div class="card-content">
+        <div class="device-picker">
+          <paper-dropdown-menu label="[[label]]" class="flex" disabled="[[!entities.length]]">
+            <paper-listbox slot="dropdown-content" selected="{{selectedEntity}}">
+              <template is="dom-repeat" items="[[entities]]" as="state">
                 <paper-item>[[computeSelectCaption(state)]]</paper-item>
               </template>
             </paper-listbox>
           </paper-dropdown-menu>
         </div>
 
-        <div class='form-container'>
-          <template is='dom-if' if='[[computeShowPlaceholder(formState)]]'>
-            <div class='form-placeholder'>
-              <template is='dom-if' if='[[computeShowNoDevices(formState)]]'>
+        <div class="form-container">
+          <template is="dom-if" if="[[computeShowPlaceholder(formState)]]">
+            <div class="form-placeholder">
+              <template is="dom-if" if="[[computeShowNoDevices(formState)]]">
                 No entities found! :-(
               </template>
 
-              <template is='dom-if' if='[[computeShowSpinner(formState)]]'>
-                <paper-spinner active alt='[[formState]]'></paper-spinner>
+              <template is="dom-if" if="[[computeShowSpinner(formState)]]">
+                <paper-spinner active="" alt="[[formState]]"></paper-spinner>
                 [[formState]]
               </template>
             </div>
           </template>
 
-          <div hidden$='[[!computeShowForm(formState)]]' id='form'></div>
+          <div hidden\$="[[!computeShowForm(formState)]]" id="form"></div>
         </div>
       </div>
-      <div class='card-actions'>
-        <paper-button
-          on-click='saveEntity'
-          disabled='[[computeShowPlaceholder(formState)]]'
-        >SAVE</paper-button>
-        <template is='dom-if' if='[[allowDelete]]'>
-          <paper-button
-            class='warning'
-            on-click='deleteEntity'
-            disabled='[[computeShowPlaceholder(formState)]]'
-          >DELETE</paper-button>
+      <div class="card-actions">
+        <paper-button on-click="saveEntity" disabled="[[computeShowPlaceholder(formState)]]">SAVE</paper-button>
+        <template is="dom-if" if="[[allowDelete]]">
+          <paper-button class="warning" on-click="deleteEntity" disabled="[[computeShowPlaceholder(formState)]]">DELETE</paper-button>
         </template>
       </div>
     </paper-card>
+`;
+  }
 
-  </template>
-</dom-module>
-
-<script>
-class HaEntityConfig extends Polymer.Element {
   static get is() { return 'ha-entity-config'; }
 
   static get properties() {
@@ -214,4 +199,3 @@ class HaEntityConfig extends Polymer.Element {
 }
 
 customElements.define(HaEntityConfig.is, HaEntityConfig);
-</script>
diff --git a/panels/config/ha-form-style.html b/panels/config/ha-form-style.js
similarity index 65%
rename from panels/config/ha-form-style.html
rename to panels/config/ha-form-style.js
index 53b941a25b..1031bff7b4 100644
--- a/panels/config/ha-form-style.html
+++ b/panels/config/ha-form-style.js
@@ -1,4 +1,7 @@
-<dom-module id='ha-form-style'>
+const documentContainer = document.createElement('template');
+documentContainer.setAttribute('style', 'display: none;');
+
+documentContainer.innerHTML = `<dom-module id="ha-form-style">
   <template>
     <style>
       .form-group {
@@ -25,4 +28,6 @@
       }
     </style>
   </template>
-</dom-module>
+</dom-module>`;
+
+document.head.appendChild(documentContainer.content);
diff --git a/panels/config/ha-panel-config.html b/panels/config/ha-panel-config.js
similarity index 78%
rename from panels/config/ha-panel-config.html
rename to panels/config/ha-panel-config.js
index 79f2c2208b..f74003f7fc 100644
--- a/panels/config/ha-panel-config.html
+++ b/panels/config/ha-panel-config.js
@@ -1,21 +1,24 @@
-<link rel="import" href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/iron-media-query/iron-media-query.html'>
-<link rel='import' href='../../bower_components/app-route/app-route.html'>
+import '@polymer/app-route/app-route.js';
+import '@polymer/iron-media-query/iron-media-query.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../src/layouts/hass-error-screen.html">
-<link rel="import" href="../../src/util/hass-mixins.html">
+import '../../build-temp/panel-config.js';
+import '../../src/layouts/hass-error-screen.js';
+import '../../src/util/hass-mixins.js';
+import './automation/ha-config-automation.js';
+import './cloud/ha-config-cloud.js';
+import './config-entries/ha-config-entries.js';
+import './core/ha-config-core.js';
+import './customize/ha-config-customize.js';
+import './dashboard/ha-config-dashboard.js';
+import './script/ha-config-script.js';
+import './zwave/ha-config-zwave.js';
 
-<link rel="import" href="./dashboard/ha-config-dashboard.html">
-<link rel="import" href="./core/ha-config-core.html">
-<link rel="import" href="./cloud/ha-config-cloud.html">
-<link rel="import" href="./automation/ha-config-automation.html">
-<link rel="import" href="./script/ha-config-script.html">
-<link rel="import" href="./zwave/ha-config-zwave.html">
-<link rel="import" href="./customize/ha-config-customize.html">
-<link rel="import" href="./config-entries/ha-config-entries.html">
 
-<dom-module id="ha-panel-config">
-  <template>
+class HaPanelConfig extends window.hassMixins.NavigateMixin(PolymerElement) {
+  static get template() {
+    return html`
     <app-route
       route='[[route]]'
       pattern='/:page'
@@ -97,11 +100,9 @@
         is-wide='[[isWide]]'
       ></ha-config-entries>
     </template>
-  </template>
-</dom-module>
+    `;
+  }
 
-<script>
-class HaPanelConfig extends window.hassMixins.NavigateMixin(Polymer.Element) {
   static get is() { return 'ha-panel-config'; }
 
   static get properties() {
@@ -154,4 +155,3 @@ class HaPanelConfig extends window.hassMixins.NavigateMixin(Polymer.Element) {
 }
 
 customElements.define(HaPanelConfig.is, HaPanelConfig);
-</script>
diff --git a/panels/config/script/ha-config-script.html b/panels/config/script/ha-config-script.js
similarity index 61%
rename from panels/config/script/ha-config-script.html
rename to panels/config/script/ha-config-script.js
index 3236c742dd..e6b53818b2 100644
--- a/panels/config/script/ha-config-script.html
+++ b/panels/config/script/ha-config-script.js
@@ -1,52 +1,32 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel='import' href='../../../bower_components/app-route/app-route.html'>
+import '@polymer/app-route/app-route.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="./ha-script-picker.html">
-<link rel="import" href="./ha-script-editor.html">
+import './ha-script-editor.js';
+import './ha-script-picker.js';
 
-<dom-module id="ha-config-script">
-  <template>
+class HaConfigScript extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       ha-script-picker,
       ha-script-editor {
         height: 100%;
       }
     </style>
-    <app-route
-      route='[[route]]'
-      pattern='/script/edit/:script'
-      data="{{_routeData}}"
-      active="{{_edittingScript}}"
-    ></app-route>
-    <app-route
-      route='[[route]]'
-      pattern='/script/new'
-      active="{{_creatingNew}}"
-    ></app-route>
+    <app-route route="[[route]]" pattern="/script/edit/:script" data="{{_routeData}}" active="{{_edittingScript}}"></app-route>
+    <app-route route="[[route]]" pattern="/script/new" active="{{_creatingNew}}"></app-route>
 
-    <template is='dom-if' if='[[!showEditor]]'>
-      <ha-script-picker
-        hass='[[hass]]'
-        narrow='[[narrow]]'
-        show-menu='[[showMenu]]'
-        scripts='[[scripts]]'
-        is-wide='[[isWide]]'
-      ></ha-script-picker>
+    <template is="dom-if" if="[[!showEditor]]">
+      <ha-script-picker hass="[[hass]]" narrow="[[narrow]]" show-menu="[[showMenu]]" scripts="[[scripts]]" is-wide="[[isWide]]"></ha-script-picker>
     </template>
 
-    <template is='dom-if' if='[[showEditor]]' restamp>
-      <ha-script-editor
-        hass='[[hass]]'
-        script='[[script]]'
-        is-wide='[[isWide]]'
-        creating-new='[[_creatingNew]]'
-      ></ha-script-editor>
+    <template is="dom-if" if="[[showEditor]]" restamp="">
+      <ha-script-editor hass="[[hass]]" script="[[script]]" is-wide="[[isWide]]" creating-new="[[_creatingNew]]"></ha-script-editor>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaConfigScript extends Polymer.Element {
   static get is() { return 'ha-config-script'; }
 
   static get properties() {
@@ -121,4 +101,3 @@ class HaConfigScript extends Polymer.Element {
 }
 
 customElements.define(HaConfigScript.is, HaConfigScript);
-</script>
diff --git a/panels/config/script/ha-script-editor.html b/panels/config/script/ha-script-editor.js
similarity index 68%
rename from panels/config/script/ha-script-editor.html
rename to panels/config/script/ha-script-editor.js
index 6288508358..7bd4f760e4 100644
--- a/panels/config/script/ha-script-editor.html
+++ b/panels/config/script/ha-script-editor.js
@@ -1,31 +1,34 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-textarea.html">
-<link rel="import" href="../../../bower_components/paper-radio-button/paper-radio-button.html">
-<link rel="import" href="../../../bower_components/paper-radio-group/paper-radio-group.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu-light.html">
-<link rel="import" href="../../../bower_components/paper-listbox/paper-listbox.html">
-<link rel="import" href="../../../bower_components/paper-menu-button/paper-menu-button.html">
-<link rel="import" href="../../../bower_components/paper-fab/paper-fab.html">
-<link rel="import" href="../../../bower_components/iron-autogrow-textarea/iron-autogrow-textarea.html">
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/iron-autogrow-textarea/iron-autogrow-textarea.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu-light.js';
+import '@polymer/paper-fab/paper-fab.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-input/paper-textarea.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import '@polymer/paper-menu-button/paper-menu-button.js';
+import '@polymer/paper-radio-button/paper-radio-button.js';
+import '@polymer/paper-radio-group/paper-radio-group.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/components/entity/ha-entity-picker.html'>
-<link rel='import' href='../../../src/components/ha-combo-box.html'>
-<link rel='import' href='../../../src/layouts/ha-app-layout.html'>
-<link rel='import' href='../../../src/util/hass-mixins.html'>
+import '../../../src/components/entity/ha-entity-picker.js';
+import '../../../src/components/ha-combo-box.js';
+import '../../../src/layouts/ha-app-layout.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-js.js';
+import '../ha-config-section.js';
 
-<link rel="import" href="../ha-config-section.html">
-
-<link rel="import" href="../ha-config-js.html">
-
-<dom-module id="ha-script-editor">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaScriptEditor extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="ha-style">
       .errors {
         padding: 20px;
@@ -81,39 +84,24 @@
         margin-bottom: 0;
       }
     </style>
-    <ha-app-layout has-scrolling-region>
-      <app-header slot="header" fixed>
+    <ha-app-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
         <app-toolbar>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='backTapped'
-          ></paper-icon-button>
-          <div main-title>Script [[name]]</div>
+          <paper-icon-button icon="mdi:arrow-left" on-click="backTapped"></paper-icon-button>
+          <div main-title="">Script [[name]]</div>
         </app-toolbar>
       </app-header>
-      <div class='content'>
-        <template is='dom-if' if='[[errors]]'>
-          <div class='errors'>[[errors]]</div>
+      <div class="content">
+        <template is="dom-if" if="[[errors]]">
+          <div class="errors">[[errors]]</div>
         </template>
-        <div id='root'></div>
+        <div id="root"></div>
       </div>
-      <paper-fab slot="fab"
-        is-wide$='[[isWide]]'
-        dirty$='[[dirty]]'
-        icon='mdi:content-save'
-        title='Save'
-        on-click='saveScript'
-      ></paper-fab>
+      <paper-fab slot="fab" is-wide\$="[[isWide]]" dirty\$="[[dirty]]" icon="mdi:content-save" title="Save" on-click="saveScript"></paper-fab>
     </ha-app-layout>
+`;
+  }
 
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaScriptEditor extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'ha-script-editor'; }
 
   static get properties() {
@@ -286,4 +274,3 @@ class HaScriptEditor extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(HaScriptEditor.is, HaScriptEditor);
-</script>
diff --git a/panels/config/script/ha-script-picker.html b/panels/config/script/ha-script-picker.html
deleted file mode 100644
index 1be02521d2..0000000000
--- a/panels/config/script/ha-script-picker.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../../bower_components/paper-fab/paper-fab.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-
-<link rel='import' href='../../../src/layouts/ha-app-layout.html'>
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-
-<link rel="import" href="../ha-config-section.html">
-
-<dom-module id="ha-script-picker">
-  <template>
-    <style include="ha-style">
-      :host {
-        display: block;
-      }
-
-      paper-item {
-        cursor: pointer;
-      }
-
-      paper-fab {
-        position: fixed;
-        bottom: 16px;
-        right: 16px;
-        z-index: 1;
-      }
-
-      paper-fab[is-wide] {
-        bottom: 24px;
-        right: 24px;
-      }
-
-      a {
-        color: var(--primary-color);
-      }
-    </style>
-
-    <ha-app-layout has-scrolling-region>
-      <app-header slot="header" fixed>
-        <app-toolbar>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='_backTapped'
-          ></paper-icon-button>
-          <div main-title>[[localize('ui.panel.config.script.caption')]]</div>
-        </app-toolbar>
-      </app-header>
-
-      <ha-config-section
-        is-wide='[[isWide]]'
-      >
-        <div slot='header'>Script Editor</div>
-        <div slot='introduction'>
-          The script editor allows you to create and edit scripts.
-          Please read <a href='https://home-assistant.io/docs/scripts/editor/' target='_blank'>the instructions</a> to make sure that you have configured Home Assistant correctly.
-        </div>
-
-        <paper-card heading='Pick script to edit'>
-          <template is='dom-if' if='[[!scripts.length]]'>
-            <div class='card-content'>
-              <p>We couldn't find any editable scripts.</p>
-            </div>
-          </template>
-          <template is='dom-repeat' items='[[scripts]]' as='script'>
-            <paper-item>
-              <paper-item-body two-line on-click='scriptTapped'>
-                <div>[[computeName(script)]]</div>
-                <div secondary>[[computeDescription(script)]]</div>
-              </paper-item-body>
-              <iron-icon icon='mdi:chevron-right'></iron-icon>
-            </paper-item>
-          </template>
-        </paper-card>
-      </ha-config-section>
-
-      <paper-fab slot="fab"
-        is-wide$='[[isWide]]'
-        icon='mdi:plus'
-        title='Add Script'
-        on-click='addScript'
-      ></paper-fab>
-    </ha-app-layout>
-
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaScriptPicker extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
-  static get is() { return 'ha-script-picker'; }
-
-  static get properties() {
-    return {
-      hass: {
-        type: Object,
-      },
-
-      narrow: {
-        type: Boolean,
-      },
-
-      showMenu: {
-        type: Boolean,
-        value: false,
-      },
-
-      scripts: {
-        type: Array,
-      },
-
-      isWide: {
-        type: Boolean,
-      },
-    };
-  }
-
-  scriptTapped(ev) {
-    this.navigate('/config/script/edit/' + this.scripts[ev.model.index].entity_id);
-  }
-
-  addScript() {
-    this.navigate('/config/script/new');
-  }
-
-  computeName(script) {
-    return window.hassUtil.computeStateName(script);
-  }
-
-  // Still thinking of something to add here.
-  // eslint-disable-next-line
-  computeDescription(script) {
-    return '';
-  }
-
-  _backTapped() {
-    history.back();
-  }
-}
-
-customElements.define(HaScriptPicker.is, HaScriptPicker);
-</script>
diff --git a/panels/config/script/ha-script-picker.js b/panels/config/script/ha-script-picker.js
new file mode 100644
index 0000000000..e0b4e50392
--- /dev/null
+++ b/panels/config/script/ha-script-picker.js
@@ -0,0 +1,137 @@
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-fab/paper-fab.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/layouts/ha-app-layout.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
+
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaScriptPicker extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+  static get template() {
+    return html`
+    <style include="ha-style">
+      :host {
+        display: block;
+      }
+
+      paper-item {
+        cursor: pointer;
+      }
+
+      paper-fab {
+        position: fixed;
+        bottom: 16px;
+        right: 16px;
+        z-index: 1;
+      }
+
+      paper-fab[is-wide] {
+        bottom: 24px;
+        right: 24px;
+      }
+
+      a {
+        color: var(--primary-color);
+      }
+    </style>
+
+    <ha-app-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
+        <app-toolbar>
+          <paper-icon-button icon="mdi:arrow-left" on-click="_backTapped"></paper-icon-button>
+          <div main-title="">[[localize('ui.panel.config.script.caption')]]</div>
+        </app-toolbar>
+      </app-header>
+
+      <ha-config-section is-wide="[[isWide]]">
+        <div slot="header">Script Editor</div>
+        <div slot="introduction">
+          The script editor allows you to create and edit scripts.
+          Please read <a href="https://home-assistant.io/docs/scripts/editor/" target="_blank">the instructions</a> to make sure that you have configured Home Assistant correctly.
+        </div>
+
+        <paper-card heading="Pick script to edit">
+          <template is="dom-if" if="[[!scripts.length]]">
+            <div class="card-content">
+              <p>We couldn't find any editable scripts.</p>
+            </div>
+          </template>
+          <template is="dom-repeat" items="[[scripts]]" as="script">
+            <paper-item>
+              <paper-item-body two-line="" on-click="scriptTapped">
+                <div>[[computeName(script)]]</div>
+                <div secondary="">[[computeDescription(script)]]</div>
+              </paper-item-body>
+              <iron-icon icon="mdi:chevron-right"></iron-icon>
+            </paper-item>
+          </template>
+        </paper-card>
+      </ha-config-section>
+
+      <paper-fab slot="fab" is-wide\$="[[isWide]]" icon="mdi:plus" title="Add Script" on-click="addScript"></paper-fab>
+    </ha-app-layout>
+`;
+  }
+
+  static get is() { return 'ha-script-picker'; }
+
+  static get properties() {
+    return {
+      hass: {
+        type: Object,
+      },
+
+      narrow: {
+        type: Boolean,
+      },
+
+      showMenu: {
+        type: Boolean,
+        value: false,
+      },
+
+      scripts: {
+        type: Array,
+      },
+
+      isWide: {
+        type: Boolean,
+      },
+    };
+  }
+
+  scriptTapped(ev) {
+    this.navigate('/config/script/edit/' + this.scripts[ev.model.index].entity_id);
+  }
+
+  addScript() {
+    this.navigate('/config/script/new');
+  }
+
+  computeName(script) {
+    return window.hassUtil.computeStateName(script);
+  }
+
+  // Still thinking of something to add here.
+  // eslint-disable-next-line
+  computeDescription(script) {
+    return '';
+  }
+
+  _backTapped() {
+    history.back();
+  }
+}
+
+customElements.define(HaScriptPicker.is, HaScriptPicker);
diff --git a/panels/config/zwave/ha-config-zwave.html b/panels/config/zwave/ha-config-zwave.html
deleted file mode 100644
index dc3fa92772..0000000000
--- a/panels/config/zwave/ha-config-zwave.html
+++ /dev/null
@@ -1,618 +0,0 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../src/components/ha-menu-button.html">
-<link rel="import" href="../../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href="../../../bower_components/paper-listbox/paper-listbox.html">
-<link rel='import' href="../../../bower_components/paper-input/paper-input.html">
-
-<link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
-<link rel="import" href="../../../src/components/ha-service-description.html">
-<link rel='import' href='../../../src/layouts/ha-app-layout.html'>
-<link rel="import" href="../../../src/resources/ha-style.html">
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-
-<link rel="import" href="../ha-config-section.html">
-<link rel="import" href="../ha-form-style.html">
-
-<link rel="import" href="./zwave-log.html">
-<link rel="import" href="./zwave-network.html">
-<link rel="import" href="./zwave-node-information.html">
-<link rel="import" href="./zwave-values.html">
-<link rel="import" href="./zwave-groups.html">
-<link rel="import" href="./zwave-node-config.html">
-<link rel="import" href="./zwave-usercodes.html">
-
-<dom-module id="ha-config-zwave">
-  <template>
-    <style include="iron-flex ha-style ha-form-style">
-      .content {
-        margin-top: 24px;
-      }
-
-      .node-info {
-        margin-left: 16px;
-      }
-
-      .help-text {
-        padding-left: 24px;
-        padding-right: 24px;
-      }
-
-      paper-card {
-        display: block;
-        margin: 0 auto;
-        max-width: 600px;
-      }
-
-      .device-picker {
-        @apply --layout-horizontal;
-        @apply --layout-center-center;
-        padding-left: 24px;
-        padding-right: 24px;
-        padding-bottom: 24px;
-      }
-
-      ha-service-description {
-        display: block;
-        color: grey;
-      }
-
-      [hidden] {
-        display: none;
-      }
-
-      .toggle-help-icon {
-        position: absolute;
-        top: 6px;
-        right: 0;
-        color: var(--primary-color);
-      }
-    </style>
-    <ha-app-layout has-scrolling-region>
-      <app-header slot="header" fixed>
-        <app-toolbar>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='_backTapped'
-          ></paper-icon-button>
-          <div main-title>[[localize('ui.panel.config.zwave.caption')]]</div>
-        </app-toolbar>
-      </app-header>
-
-      <zwave-network
-        id='zwave-network'
-        is-wide='[[isWide]]'
-        hass='[[hass]]'
-      ></zwave-network>
-
-      <!--Node card-->
-      <ha-config-section is-wide='[[isWide]]'>
-        <div style="position: relative" slot='header'>
-          <span>Z-Wave Node Management</span>
-          <paper-icon-button
-            class="toggle-help-icon"
-            on-click='toggleHelp'
-            icon='mdi:help-circle'
-          ></paper-icon-button>
-
-        </div>
-        <span slot='introduction'>
-          Run Z-Wave commands that affect a single node. Pick a node to see a list of available commands.
-        </span>
-
-        <paper-card class="content">
-          <div class='device-picker'>
-            <paper-dropdown-menu dynamic-align label="Nodes" class="flex">
-              <paper-listbox slot="dropdown-content" selected='{{selectedNode}}'>
-                <template is='dom-repeat' items='[[nodes]]' as='state'>
-                  <paper-item>[[computeSelectCaption(state)]]</paper-item>
-                </template>
-              </paper-listbox>
-            </paper-dropdown-menu>
-          </div>
-            <template is='dom-if' if='[[!computeIsNodeSelected(selectedNode)]]'>
-              <template is='dom-if' if='[[showHelp]]'>
-                <div style='color: grey; padding: 12px'>Select node to view per-node options</div>
-              </template>
-            </template>
-
-          <template is='dom-if' if='[[computeIsNodeSelected(selectedNode)]]'>
-          <div class='card-actions'>
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='refresh_node'
-              service-data=[[computeNodeServiceData(selectedNode)]]
-            >Refresh Node</ha-call-service-button>
-            <ha-service-description
-              hass='[[hass]]'
-              domain='zwave'
-              service='refresh_node'
-              hidden$='[[!showHelp]]'
-            ></ha-service-description>
-
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='remove_failed_node'
-              service-data=[[computeNodeServiceData(selectedNode)]]
-            >Remove Failed Node</ha-call-service-button>
-            <ha-service-description
-              hass='[[hass]]'
-              domain='zwave'
-              service='remove_failed_node'
-              hidden$='[[!showHelp]]'
-            ></ha-service-description>
-
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='replace_failed_node'
-              service-data=[[computeNodeServiceData(selectedNode)]]
-            >Replace Failed Node</ha-call-service-button>
-            <ha-service-description
-              hass='[[hass]]'
-              domain='zwave'
-              service='replace_failed_node'
-              hidden$='[[!showHelp]]'
-            ></ha-service-description>
-
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='print_node'
-              service-data=[[computeNodeServiceData(selectedNode)]]
-            >Print Node</ha-call-service-button>
-            <ha-service-description
-              hass='[[hass]]'
-              domain='zwave'
-              service='print_node'
-              hidden$='[[!showHelp]]'
-            ></ha-service-description>
-
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='heal_node'
-              service-data=[[computeHealNodeServiceData(selectedNode)]]
-            >Heal Node</ha-call-service-button>
-            <ha-service-description
-              hass='[[hass]]'
-              domain='zwave'
-              service='heal_node'
-              hidden$='[[!showHelp]]'
-            ></ha-service-description>
-
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='test_node'
-              service-data=[[computeNodeServiceData(selectedNode)]]
-            >Test Node</ha-call-service-button>
-            <ha-service-description
-              hass='[[hass]]'
-              domain='zwave'
-              service='test_node'
-              hidden$='[[!showHelp]]'
-            ></ha-service-description>
-          </div>
-          <div class='card-actions'>
-            <paper-input
-              float-label="New node name"
-              type=text
-              value={{newNodeNameInput}}
-              placeholder=[[computeGetNodeName(selectedNode)]]>
-            </paper-input>
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='rename_node'
-              service-data=[[computeNodeNameServiceData(newNodeNameInput)]]
-            >Rename Node</ha-call-service-button>
-            <ha-service-description
-              hass='[[hass]]'
-              domain='zwave'
-              service='rename_node'
-              hidden$='[[!showHelp]]'
-            ></ha-service-description>
-           </div>
-
-           <div class='device-picker'>
-            <paper-dropdown-menu label="Entities of this node" dynamic-align class="flex">
-              <paper-listbox
-                slot="dropdown-content"
-                selected='{{selectedEntity}}'>
-                <template is='dom-repeat' items='[[entities]]' as='state'>
-                  <paper-item>[[computeSelectCaptionEnt(state)]]</paper-item>
-                </template>
-              </paper-listbox>
-            </paper-dropdown-menu>
-           </div>
-           <template is='dom-if' if='[[!computeIsEntitySelected(selectedEntity)]]'>
-           <div class='card-actions'>
-             <ha-call-service-button
-               hass='[[hass]]'
-               domain='zwave'
-               service='refresh_entity'
-               service-data=[[computeRefreshEntityServiceData(selectedEntity)]]
-             >Refresh Entity</ha-call-service-button>
-             <ha-service-description
-               hass='[[hass]]'
-               domain='zwave'
-               service='refresh_entity'
-               hidden$='[[!showHelp]]'
-             ></ha-service-description>
-           </div>
-           <div class='form-group'>
-             <paper-checkbox
-               checked='{{entityIgnored}}'
-               class='form-control'
-             >
-             Exclude this entity from Home Assistant
-             </paper-checkbox>
-             <paper-input
-               disabled='{{entityIgnored}}'
-               label="Polling intensity"
-               type=number
-               min=0
-               value={{entityPollingIntensity}}>
-             </paper-input>
-           </div>
-           <div class='card-actions'>
-             <ha-call-service-button
-               hass='[[hass]]'
-               domain='zwave'
-               service='set_poll_intensity'
-               service-data=[[computePollIntensityServiceData(entityPollingIntensity)]]
-             >Save</ha-call-service-button>
-           </div>
-           <div class='content'>
-             <div class='card-actions'>
-               <paper-button toggles raised noink active={{entityInfoActive}}>Entity Attributes</paper-button>
-             </div>
-             <template is='dom-if' if={{entityInfoActive}}>
-               <template is='dom-repeat' items='[[selectedEntityAttrs]]' as='state'>
-                 <div class='node-info'>
-                   <span>[[state]]</span>
-                 </div>
-               </template>
-             </template>
-           </div>
-
-           </template>
-          </template>
-        </paper-card>
-
-        <template is='dom-if' if='[[computeIsNodeSelected(selectedNode)]]'>
-          <!--Node info card-->
-          <zwave-node-information
-            id='zwave-node-information'
-            nodes='[[nodes]]'
-            selected-node='[[selectedNode]]'
-          ></zwave-node-information>
-
-          <!--Value card-->
-          <zwave-values
-            hass='[[hass]]'
-            nodes='[[nodes]]'
-            selected-node='[[selectedNode]]'
-            values='[[values]]'
-          ></zwave-values>
-
-          <!--Group card-->
-          <zwave-groups
-            hass='[[hass]]'
-            nodes='[[nodes]]'
-            selected-node='[[selectedNode]]'
-            groups='[[groups]]'
-          ></zwave-groups>
-
-          <!--Config card-->
-          <zwave-node-config
-            hass='[[hass]]'
-            nodes='[[nodes]]'
-            selected-node='[[selectedNode]]'
-            config='[[config]]'
-          ></zwave-node-config>
-        </template>
-
-        <!--User Codes-->
-        <template is='dom-if' if='{{hasNodeUserCodes}}'>
-          <zwave-usercodes
-            id='zwave-usercodes'
-            hass='[[hass]]'
-            nodes='[[nodes]]'
-            user-codes='[[userCodes]]'
-            selected-node='[[selectedNode]]'
-          ></zwave-usercodes>
-      </template>
-      </ha-config-section>
-
-
-
-      <!--Ozw log-->
-      <ozw-log
-        is-wide='[[isWide]]'
-        hass='[[hass]]'
-      ></ozw-log>
-
-    </ha-app-layout>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaConfigZwave extends window.hassMixins.LocalizeMixin(Polymer.Element) {
-  static get is() { return 'ha-config-zwave'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      isWide: Boolean,
-
-      nodes: {
-        type: Array,
-        computed: 'computeNodes(hass)'
-      },
-
-      selectedNode: {
-        type: Number,
-        value: -1,
-        observer: 'selectedNodeChanged'
-      },
-
-      config: {
-        type: Array,
-        value: function () {
-          return [];
-        }
-      },
-
-      entities: {
-        type: Array,
-        computed: 'computeEntities(selectedNode)',
-      },
-
-      entityInfoActive: {
-        type: Boolean,
-      },
-
-      selectedEntity: {
-        type: Number,
-        value: -1,
-        observer: 'selectedEntityChanged',
-      },
-
-      selectedEntityAttrs: {
-        type: Array,
-        computed: 'computeSelectedEntityAttrs(selectedEntity)'
-      },
-
-      values: {
-        type: Array,
-      },
-
-      groups: {
-        type: Array,
-      },
-
-      newNodeNameInput: {
-        type: String,
-      },
-
-      userCodes: {
-        type: Array,
-        value: function () {
-          return [];
-        },
-      },
-
-      hasNodeUserCodes: {
-        type: Boolean,
-        value: false,
-      },
-
-      showHelp: {
-        type: Boolean,
-        value: false,
-      },
-
-      entityIgnored: {
-        type: Boolean,
-      },
-
-      entityPollingIntensity: {
-        type: Number,
-        value: 0,
-      },
-    };
-  }
-
-  ready() {
-    super.ready();
-    this.addEventListener('hass-service-called', ev => this.serviceCalled(ev));
-  }
-
-  serviceCalled(ev) {
-    var el = this;
-    if ((ev.detail.success) && (ev.detail.service === 'set_poll_intensity')) {
-      el.saveEntity();
-    }
-  }
-
-  computeNodes(hass) {
-    return Object.keys(hass.states)
-      .map(function (key) { return hass.states[key]; })
-      .filter(function (ent) {
-        return ((ent.entity_id).match('zwave[.]'));
-      })
-      .sort(window.hassUtil.sortByName);
-  }
-
-  computeEntities(selectedNode) {
-    if (!this.nodes || selectedNode === -1) return -1;
-    var hass = this.hass;
-    var nodeid = this.nodes[this.selectedNode].attributes.node_id;
-    return Object.keys(hass.states)
-      .map(function (key) { return hass.states[key]; })
-      .filter(function (ent) {
-        if (ent.attributes.node_id === undefined) {
-          return false;
-        }
-        return (!ent.attributes.hidden &&
-                'node_id' in ent.attributes &&
-                ent.attributes.node_id === nodeid &&
-                (!(ent.entity_id).match('zwave[.]')));
-      })
-      .sort(window.hassUtil.sortByName);
-  }
-
-  selectedNodeChanged(selectedNode) {
-    this.newNodeNameInput = '';
-
-    if (selectedNode === -1) return;
-    this.selectedConfigParameter = -1;
-    this.selectedConfigParameterValue = -1;
-    this.selectedGroup = -1;
-
-    this.hass.callApi('GET', 'zwave/config/' + this.nodes[selectedNode].attributes.node_id).then((configs) => {
-      this.config = this._objToArray(configs);
-    });
-
-    this.hass.callApi('GET', 'zwave/values/' + this.nodes[selectedNode].attributes.node_id).then((values) => {
-      this.values = this._objToArray(values);
-    });
-
-    this.hass.callApi('GET', 'zwave/groups/' + this.nodes[selectedNode].attributes.node_id).then((groups) => {
-      this.groups = this._objToArray(groups);
-    });
-
-    this.hasNodeUserCodes = false;
-    this.notifyPath('hasNodeUserCodes');
-    this.hass.callApi('GET', 'zwave/usercodes/' + this.nodes[selectedNode].attributes.node_id).then((usercodes) => {
-      this.userCodes = this._objToArray(usercodes);
-      this.hasNodeUserCodes = this.userCodes.length > 0;
-      this.notifyPath('hasNodeUserCodes');
-    });
-  }
-
-  selectedEntityChanged(selectedEntity) {
-    if (selectedEntity === -1) return;
-    var el = this;
-    el.hass.callApi('GET', 'zwave/values/' + el.nodes[el.selectedNode].attributes.node_id).then((values) => {
-      el.values = el._objToArray(values);
-    });
-
-    var valueId = el.entities[selectedEntity].attributes.value_id;
-    var valueData = el.values.find(function (obj) { return obj.key === valueId; });
-    var valueIndex = el.values.indexOf(valueData);
-    el.hass.callApi('GET', 'config/zwave/device_config/' + valueId)
-      .then(function (data) {
-        el.entityIgnored = data.ignored || false;
-        el.entityPollingIntensity = el.values[valueIndex].value.poll_intensity;
-      });
-  }
-
-  computeSelectedEntityAttrs(selectedEntity) {
-    if (selectedEntity === -1) return 'No entity selected';
-    var entityAttrs = this.entities[selectedEntity].attributes;
-    var att = [];
-    Object.keys(entityAttrs).forEach(function (key) {
-      att.push(key + ': ' + entityAttrs[key]);
-    });
-    return att.sort();
-  }
-
-  computeSelectCaption(stateObj) {
-    return window.hassUtil.computeStateName(stateObj) + ' (Node:' +
-      stateObj.attributes.node_id + ' ' +
-      stateObj.attributes.query_stage + ')';
-  }
-
-  computeSelectCaptionEnt(stateObj) {
-    return (window.hassUtil.computeDomain(stateObj) + '.'
-            + window.hassUtil.computeStateName(stateObj));
-  }
-
-  computeIsNodeSelected() {
-    return (this.nodes && this.selectedNode !== -1);
-  }
-
-  computeIsEntitySelected(selectedEntity) {
-    return (selectedEntity === -1);
-  }
-
-  computeNodeServiceData(selectedNode) {
-    return { node_id: this.nodes[selectedNode].attributes.node_id };
-  }
-
-  computeHealNodeServiceData(selectedNode) {
-    return {
-      node_id: this.nodes[selectedNode].attributes.node_id,
-      return_routes: true
-    };
-  }
-
-  computeGetNodeName(selectedNode) {
-    if (this.selectedNode === -1 ||
-      !this.nodes[selectedNode].entity_id) return -1;
-    return this.nodes[selectedNode].attributes.node_name;
-  }
-
-  computeNodeNameServiceData(newNodeNameInput) {
-    return {
-      node_id: this.nodes[this.selectedNode].attributes.node_id,
-      name: newNodeNameInput
-    };
-  }
-
-  computeRefreshEntityServiceData(selectedEntity) {
-    if (selectedEntity === -1) return -1;
-    return { entity_id: this.entities[selectedEntity].entity_id };
-  }
-
-  computePollIntensityServiceData(entityPollingIntensity) {
-    if (!this.selectedNode === -1 || this.selectedEntity === -1) return -1;
-    return {
-      node_id: this.nodes[this.selectedNode].attributes.node_id,
-      value_id: this.entities[this.selectedEntity].attributes.value_id,
-      poll_intensity: parseInt(entityPollingIntensity),
-    };
-  }
-
-  saveEntity() {
-    var data = {
-      ignored: this.entityIgnored,
-      polling_intensity: parseInt(this.entityPollingIntensity),
-    };
-    return this.hass.callApi('POST', 'config/zwave/device_config/' + this.entities[this.selectedEntity].entity_id, data);
-  }
-
-  toggleHelp() {
-    this.showHelp = !this.showHelp;
-  }
-
-  _objToArray(obj) {
-    var array = [];
-    Object.keys(obj).forEach(function (key) {
-      array.push({
-        key: key,
-        value: obj[key],
-      });
-    });
-    return array;
-  }
-
-  _backTapped() {
-    history.back();
-  }
-}
-
-customElements.define(HaConfigZwave.is, HaConfigZwave);
-</script>
diff --git a/panels/config/zwave/ha-config-zwave.js b/panels/config/zwave/ha-config-zwave.js
new file mode 100644
index 0000000000..06ee8fe81f
--- /dev/null
+++ b/panels/config/zwave/ha-config-zwave.js
@@ -0,0 +1,477 @@
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/components/buttons/ha-call-service-button.js';
+import '../../../src/components/ha-menu-button.js';
+import '../../../src/components/ha-service-description.js';
+import '../../../src/layouts/ha-app-layout.js';
+import '../../../src/resources/ha-style.js';
+import '../../../src/util/hass-mixins.js';
+import '../ha-config-section.js';
+import '../ha-form-style.js';
+import './zwave-groups.js';
+import './zwave-log.js';
+import './zwave-network.js';
+import './zwave-node-config.js';
+import './zwave-node-information.js';
+import './zwave-usercodes.js';
+import './zwave-values.js';
+
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaConfigZwave extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style ha-form-style">
+      .content {
+        margin-top: 24px;
+      }
+
+      .node-info {
+        margin-left: 16px;
+      }
+
+      .help-text {
+        padding-left: 24px;
+        padding-right: 24px;
+      }
+
+      paper-card {
+        display: block;
+        margin: 0 auto;
+        max-width: 600px;
+      }
+
+      .device-picker {
+        @apply --layout-horizontal;
+        @apply --layout-center-center;
+        padding-left: 24px;
+        padding-right: 24px;
+        padding-bottom: 24px;
+      }
+
+      ha-service-description {
+        display: block;
+        color: grey;
+      }
+
+      [hidden] {
+        display: none;
+      }
+
+      .toggle-help-icon {
+        position: absolute;
+        top: 6px;
+        right: 0;
+        color: var(--primary-color);
+      }
+    </style>
+    <ha-app-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
+        <app-toolbar>
+          <paper-icon-button icon="mdi:arrow-left" on-click="_backTapped"></paper-icon-button>
+          <div main-title="">[[localize('ui.panel.config.zwave.caption')]]</div>
+        </app-toolbar>
+      </app-header>
+
+      <zwave-network id="zwave-network" is-wide="[[isWide]]" hass="[[hass]]"></zwave-network>
+
+      <!--Node card-->
+      <ha-config-section is-wide="[[isWide]]">
+        <div style="position: relative" slot="header">
+          <span>Z-Wave Node Management</span>
+          <paper-icon-button class="toggle-help-icon" on-click="toggleHelp" icon="mdi:help-circle"></paper-icon-button>
+
+        </div>
+        <span slot="introduction">
+          Run Z-Wave commands that affect a single node. Pick a node to see a list of available commands.
+        </span>
+
+        <paper-card class="content">
+          <div class="device-picker">
+            <paper-dropdown-menu dynamic-align="" label="Nodes" class="flex">
+              <paper-listbox slot="dropdown-content" selected="{{selectedNode}}">
+                <template is="dom-repeat" items="[[nodes]]" as="state">
+                  <paper-item>[[computeSelectCaption(state)]]</paper-item>
+                </template>
+              </paper-listbox>
+            </paper-dropdown-menu>
+          </div>
+            <template is="dom-if" if="[[!computeIsNodeSelected(selectedNode)]]">
+              <template is="dom-if" if="[[showHelp]]">
+                <div style="color: grey; padding: 12px">Select node to view per-node options</div>
+              </template>
+            </template>
+
+          <template is="dom-if" if="[[computeIsNodeSelected(selectedNode)]]">
+          <div class="card-actions">
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="refresh_node" service-data="[[computeNodeServiceData(selectedNode)]]">Refresh Node</ha-call-service-button>
+            <ha-service-description hass="[[hass]]" domain="zwave" service="refresh_node" hidden\$="[[!showHelp]]"></ha-service-description>
+
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="remove_failed_node" service-data="[[computeNodeServiceData(selectedNode)]]">Remove Failed Node</ha-call-service-button>
+            <ha-service-description hass="[[hass]]" domain="zwave" service="remove_failed_node" hidden\$="[[!showHelp]]"></ha-service-description>
+
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="replace_failed_node" service-data="[[computeNodeServiceData(selectedNode)]]">Replace Failed Node</ha-call-service-button>
+            <ha-service-description hass="[[hass]]" domain="zwave" service="replace_failed_node" hidden\$="[[!showHelp]]"></ha-service-description>
+
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="print_node" service-data="[[computeNodeServiceData(selectedNode)]]">Print Node</ha-call-service-button>
+            <ha-service-description hass="[[hass]]" domain="zwave" service="print_node" hidden\$="[[!showHelp]]"></ha-service-description>
+
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="heal_node" service-data="[[computeHealNodeServiceData(selectedNode)]]">Heal Node</ha-call-service-button>
+            <ha-service-description hass="[[hass]]" domain="zwave" service="heal_node" hidden\$="[[!showHelp]]"></ha-service-description>
+
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="test_node" service-data="[[computeNodeServiceData(selectedNode)]]">Test Node</ha-call-service-button>
+            <ha-service-description hass="[[hass]]" domain="zwave" service="test_node" hidden\$="[[!showHelp]]"></ha-service-description>
+          </div>
+          <div class="card-actions">
+            <paper-input float-label="New node name" type="text" value="{{newNodeNameInput}}" placeholder="[[computeGetNodeName(selectedNode)]]">
+            </paper-input>
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="rename_node" service-data="[[computeNodeNameServiceData(newNodeNameInput)]]">Rename Node</ha-call-service-button>
+            <ha-service-description hass="[[hass]]" domain="zwave" service="rename_node" hidden\$="[[!showHelp]]"></ha-service-description>
+           </div>
+
+           <div class="device-picker">
+            <paper-dropdown-menu label="Entities of this node" dynamic-align="" class="flex">
+              <paper-listbox slot="dropdown-content" selected="{{selectedEntity}}">
+                <template is="dom-repeat" items="[[entities]]" as="state">
+                  <paper-item>[[computeSelectCaptionEnt(state)]]</paper-item>
+                </template>
+              </paper-listbox>
+            </paper-dropdown-menu>
+           </div>
+           <template is="dom-if" if="[[!computeIsEntitySelected(selectedEntity)]]">
+           <div class="card-actions">
+             <ha-call-service-button hass="[[hass]]" domain="zwave" service="refresh_entity" service-data="[[computeRefreshEntityServiceData(selectedEntity)]]">Refresh Entity</ha-call-service-button>
+             <ha-service-description hass="[[hass]]" domain="zwave" service="refresh_entity" hidden\$="[[!showHelp]]"></ha-service-description>
+           </div>
+           <div class="form-group">
+             <paper-checkbox checked="{{entityIgnored}}" class="form-control">
+             Exclude this entity from Home Assistant
+             </paper-checkbox>
+             <paper-input disabled="{{entityIgnored}}" label="Polling intensity" type="number" min="0" value="{{entityPollingIntensity}}">
+             </paper-input>
+           </div>
+           <div class="card-actions">
+             <ha-call-service-button hass="[[hass]]" domain="zwave" service="set_poll_intensity" service-data="[[computePollIntensityServiceData(entityPollingIntensity)]]">Save</ha-call-service-button>
+           </div>
+           <div class="content">
+             <div class="card-actions">
+               <paper-button toggles="" raised="" noink="" active="{{entityInfoActive}}">Entity Attributes</paper-button>
+             </div>
+             <template is="dom-if" if="{{entityInfoActive}}">
+               <template is="dom-repeat" items="[[selectedEntityAttrs]]" as="state">
+                 <div class="node-info">
+                   <span>[[state]]</span>
+                 </div>
+               </template>
+             </template>
+           </div>
+
+           </template>
+          </template>
+        </paper-card>
+
+        <template is="dom-if" if="[[computeIsNodeSelected(selectedNode)]]">
+          <!--Node info card-->
+          <zwave-node-information id="zwave-node-information" nodes="[[nodes]]" selected-node="[[selectedNode]]"></zwave-node-information>
+
+          <!--Value card-->
+          <zwave-values hass="[[hass]]" nodes="[[nodes]]" selected-node="[[selectedNode]]" values="[[values]]"></zwave-values>
+
+          <!--Group card-->
+          <zwave-groups hass="[[hass]]" nodes="[[nodes]]" selected-node="[[selectedNode]]" groups="[[groups]]"></zwave-groups>
+
+          <!--Config card-->
+          <zwave-node-config hass="[[hass]]" nodes="[[nodes]]" selected-node="[[selectedNode]]" config="[[config]]"></zwave-node-config>
+        </template>
+
+        <!--User Codes-->
+        <template is="dom-if" if="{{hasNodeUserCodes}}">
+          <zwave-usercodes id="zwave-usercodes" hass="[[hass]]" nodes="[[nodes]]" user-codes="[[userCodes]]" selected-node="[[selectedNode]]"></zwave-usercodes>
+      </template>
+      </ha-config-section>
+
+
+
+      <!--Ozw log-->
+      <ozw-log is-wide="[[isWide]]" hass="[[hass]]"></ozw-log>
+
+    </ha-app-layout>
+`;
+  }
+
+  static get is() { return 'ha-config-zwave'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      isWide: Boolean,
+
+      nodes: {
+        type: Array,
+        computed: 'computeNodes(hass)'
+      },
+
+      selectedNode: {
+        type: Number,
+        value: -1,
+        observer: 'selectedNodeChanged'
+      },
+
+      config: {
+        type: Array,
+        value: function () {
+          return [];
+        }
+      },
+
+      entities: {
+        type: Array,
+        computed: 'computeEntities(selectedNode)',
+      },
+
+      entityInfoActive: {
+        type: Boolean,
+      },
+
+      selectedEntity: {
+        type: Number,
+        value: -1,
+        observer: 'selectedEntityChanged',
+      },
+
+      selectedEntityAttrs: {
+        type: Array,
+        computed: 'computeSelectedEntityAttrs(selectedEntity)'
+      },
+
+      values: {
+        type: Array,
+      },
+
+      groups: {
+        type: Array,
+      },
+
+      newNodeNameInput: {
+        type: String,
+      },
+
+      userCodes: {
+        type: Array,
+        value: function () {
+          return [];
+        },
+      },
+
+      hasNodeUserCodes: {
+        type: Boolean,
+        value: false,
+      },
+
+      showHelp: {
+        type: Boolean,
+        value: false,
+      },
+
+      entityIgnored: {
+        type: Boolean,
+      },
+
+      entityPollingIntensity: {
+        type: Number,
+        value: 0,
+      },
+    };
+  }
+
+  ready() {
+    super.ready();
+    this.addEventListener('hass-service-called', ev => this.serviceCalled(ev));
+  }
+
+  serviceCalled(ev) {
+    var el = this;
+    if ((ev.detail.success) && (ev.detail.service === 'set_poll_intensity')) {
+      el.saveEntity();
+    }
+  }
+
+  computeNodes(hass) {
+    return Object.keys(hass.states)
+      .map(function (key) { return hass.states[key]; })
+      .filter(function (ent) {
+        return ((ent.entity_id).match('zwave[.]'));
+      })
+      .sort(window.hassUtil.sortByName);
+  }
+
+  computeEntities(selectedNode) {
+    if (!this.nodes || selectedNode === -1) return -1;
+    var hass = this.hass;
+    var nodeid = this.nodes[this.selectedNode].attributes.node_id;
+    return Object.keys(hass.states)
+      .map(function (key) { return hass.states[key]; })
+      .filter(function (ent) {
+        if (ent.attributes.node_id === undefined) {
+          return false;
+        }
+        return (!ent.attributes.hidden &&
+                'node_id' in ent.attributes &&
+                ent.attributes.node_id === nodeid &&
+                (!(ent.entity_id).match('zwave[.]')));
+      })
+      .sort(window.hassUtil.sortByName);
+  }
+
+  selectedNodeChanged(selectedNode) {
+    this.newNodeNameInput = '';
+
+    if (selectedNode === -1) return;
+    this.selectedConfigParameter = -1;
+    this.selectedConfigParameterValue = -1;
+    this.selectedGroup = -1;
+
+    this.hass.callApi('GET', 'zwave/config/' + this.nodes[selectedNode].attributes.node_id).then((configs) => {
+      this.config = this._objToArray(configs);
+    });
+
+    this.hass.callApi('GET', 'zwave/values/' + this.nodes[selectedNode].attributes.node_id).then((values) => {
+      this.values = this._objToArray(values);
+    });
+
+    this.hass.callApi('GET', 'zwave/groups/' + this.nodes[selectedNode].attributes.node_id).then((groups) => {
+      this.groups = this._objToArray(groups);
+    });
+
+    this.hasNodeUserCodes = false;
+    this.notifyPath('hasNodeUserCodes');
+    this.hass.callApi('GET', 'zwave/usercodes/' + this.nodes[selectedNode].attributes.node_id).then((usercodes) => {
+      this.userCodes = this._objToArray(usercodes);
+      this.hasNodeUserCodes = this.userCodes.length > 0;
+      this.notifyPath('hasNodeUserCodes');
+    });
+  }
+
+  selectedEntityChanged(selectedEntity) {
+    if (selectedEntity === -1) return;
+    var el = this;
+    el.hass.callApi('GET', 'zwave/values/' + el.nodes[el.selectedNode].attributes.node_id).then((values) => {
+      el.values = el._objToArray(values);
+    });
+
+    var valueId = el.entities[selectedEntity].attributes.value_id;
+    var valueData = el.values.find(function (obj) { return obj.key === valueId; });
+    var valueIndex = el.values.indexOf(valueData);
+    el.hass.callApi('GET', 'config/zwave/device_config/' + valueId)
+      .then(function (data) {
+        el.entityIgnored = data.ignored || false;
+        el.entityPollingIntensity = el.values[valueIndex].value.poll_intensity;
+      });
+  }
+
+  computeSelectedEntityAttrs(selectedEntity) {
+    if (selectedEntity === -1) return 'No entity selected';
+    var entityAttrs = this.entities[selectedEntity].attributes;
+    var att = [];
+    Object.keys(entityAttrs).forEach(function (key) {
+      att.push(key + ': ' + entityAttrs[key]);
+    });
+    return att.sort();
+  }
+
+  computeSelectCaption(stateObj) {
+    return window.hassUtil.computeStateName(stateObj) + ' (Node:' +
+      stateObj.attributes.node_id + ' ' +
+      stateObj.attributes.query_stage + ')';
+  }
+
+  computeSelectCaptionEnt(stateObj) {
+    return (window.hassUtil.computeDomain(stateObj) + '.'
+            + window.hassUtil.computeStateName(stateObj));
+  }
+
+  computeIsNodeSelected() {
+    return (this.nodes && this.selectedNode !== -1);
+  }
+
+  computeIsEntitySelected(selectedEntity) {
+    return (selectedEntity === -1);
+  }
+
+  computeNodeServiceData(selectedNode) {
+    return { node_id: this.nodes[selectedNode].attributes.node_id };
+  }
+
+  computeHealNodeServiceData(selectedNode) {
+    return {
+      node_id: this.nodes[selectedNode].attributes.node_id,
+      return_routes: true
+    };
+  }
+
+  computeGetNodeName(selectedNode) {
+    if (this.selectedNode === -1 ||
+      !this.nodes[selectedNode].entity_id) return -1;
+    return this.nodes[selectedNode].attributes.node_name;
+  }
+
+  computeNodeNameServiceData(newNodeNameInput) {
+    return {
+      node_id: this.nodes[this.selectedNode].attributes.node_id,
+      name: newNodeNameInput
+    };
+  }
+
+  computeRefreshEntityServiceData(selectedEntity) {
+    if (selectedEntity === -1) return -1;
+    return { entity_id: this.entities[selectedEntity].entity_id };
+  }
+
+  computePollIntensityServiceData(entityPollingIntensity) {
+    if (!this.selectedNode === -1 || this.selectedEntity === -1) return -1;
+    return {
+      node_id: this.nodes[this.selectedNode].attributes.node_id,
+      value_id: this.entities[this.selectedEntity].attributes.value_id,
+      poll_intensity: parseInt(entityPollingIntensity),
+    };
+  }
+
+  saveEntity() {
+    var data = {
+      ignored: this.entityIgnored,
+      polling_intensity: parseInt(this.entityPollingIntensity),
+    };
+    return this.hass.callApi('POST', 'config/zwave/device_config/' + this.entities[this.selectedEntity].entity_id, data);
+  }
+
+  toggleHelp() {
+    this.showHelp = !this.showHelp;
+  }
+
+  _objToArray(obj) {
+    var array = [];
+    Object.keys(obj).forEach(function (key) {
+      array.push({
+        key: key,
+        value: obj[key],
+      });
+    });
+    return array;
+  }
+
+  _backTapped() {
+    history.back();
+  }
+}
+
+customElements.define(HaConfigZwave.is, HaConfigZwave);
diff --git a/panels/config/zwave/zwave-groups.html b/panels/config/zwave/zwave-groups.js
similarity index 71%
rename from panels/config/zwave/zwave-groups.html
rename to panels/config/zwave/zwave-groups.js
index 691a734ee7..e166f0b844 100644
--- a/panels/config/zwave/zwave-groups.html
+++ b/panels/config/zwave/zwave-groups.js
@@ -1,13 +1,15 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href="../../../bower_components/paper-listbox/paper-listbox.html">
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
+import '../../../src/components/buttons/ha-call-service-button.js';
 
-<dom-module id='zwave-groups'>
-  <template>
+class ZwaveGroups extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         margin-top: 24px;
@@ -33,70 +35,54 @@
         padding-bottom: 12px;
       }
     </style>
-    <paper-card class="content" heading='Node group associations'>
+    <paper-card class="content" heading="Node group associations">
       <!--TODO make api for getting groups and members-->
-      <div class='device-picker'>
-        <paper-dropdown-menu label="Group" dynamic-align class='flex'>
-          <paper-listbox
-              slot="dropdown-content"
-              selected='{{selectedGroup}}'>
-            <template is='dom-repeat' items='[[groups]]' as='state'>
+      <div class="device-picker">
+        <paper-dropdown-menu label="Group" dynamic-align="" class="flex">
+          <paper-listbox slot="dropdown-content" selected="{{selectedGroup}}">
+            <template is="dom-repeat" items="[[groups]]" as="state">
               <paper-item>[[computeSelectCaptionGroup(state)]]</paper-item>
             </template>
           </paper-listbox>
         </paper-dropdown-menu>
       </div>
-      <template is='dom-if' if='[[computeIsGroupSelected(selectedGroup)]]'>
-        <div class='device-picker'>
-          <paper-dropdown-menu label="Node to control" dynamic-align class='flex'>
-            <paper-listbox
-                slot="dropdown-content"
-                selected='{{selectedTargetNode}}'>
-              <template is='dom-repeat' items='[[nodes]]' as='state'>
+      <template is="dom-if" if="[[computeIsGroupSelected(selectedGroup)]]">
+        <div class="device-picker">
+          <paper-dropdown-menu label="Node to control" dynamic-align="" class="flex">
+            <paper-listbox slot="dropdown-content" selected="{{selectedTargetNode}}">
+              <template is="dom-repeat" items="[[nodes]]" as="state">
                 <paper-item>[[computeSelectCaption(state)]]</paper-item>
               </template>
             </paper-listbox>
           </paper-dropdown-menu>
         </div>
 
-        <div class='help-text'>
+        <div class="help-text">
           <span>Other Nodes in this group:</span>
-          <template is='dom-repeat' items='[[otherGroupNodes]]' as='state'>
+          <template is="dom-repeat" items="[[otherGroupNodes]]" as="state">
             <div>[[state]]</div>
           </template>
         </div>
-        <div class='help-text'>
+        <div class="help-text">
           <span>Max Associations:</span>
           <span>[[maxAssociations]]</span>
         </div>
       </template>
 
-      <template is='dom-if' if='[[computeIsTargetNodeSelected(selectedTargetNode)]]'>
-        <div class='card-actions'>
-          <template is='dom-if' if='[[!noAssociationsLeft]]'>
-            <ha-call-service-button
-                hass='[[hass]]'
-                domain='zwave'
-                service='change_association'
-                service-data='[[computeAssocServiceData(selectedGroup, "add")]]'
-            >Add To Group</ha-call-service-button>
+      <template is="dom-if" if="[[computeIsTargetNodeSelected(selectedTargetNode)]]">
+        <div class="card-actions">
+          <template is="dom-if" if="[[!noAssociationsLeft]]">
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="change_association" service-data="[[computeAssocServiceData(selectedGroup, &quot;add&quot;)]]">Add To Group</ha-call-service-button>
           </template>
-          <template is='dom-if' if='[[computeTargetInGroup(selectedGroup, selectedTargetNode)]]'>
-            <ha-call-service-button
-                hass='[[hass]]'
-                domain='zwave'
-                service='change_association'
-                service-data='[[computeAssocServiceData(selectedGroup, "remove")]]'
-            >Remove From Group</ha-call-service-button>
+          <template is="dom-if" if="[[computeTargetInGroup(selectedGroup, selectedTargetNode)]]">
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="change_association" service-data="[[computeAssocServiceData(selectedGroup, &quot;remove&quot;)]]">Remove From Group</ha-call-service-button>
           </template>
         </div>
       </template>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class ZwaveGroups extends Polymer.Element {
   static get is() { return 'zwave-groups'; }
 
   static get properties() {
@@ -253,4 +239,3 @@ class ZwaveGroups extends Polymer.Element {
 }
 
 customElements.define(ZwaveGroups.is, ZwaveGroups);
-</script>
diff --git a/panels/config/zwave/zwave-log.html b/panels/config/zwave/zwave-log.js
similarity index 53%
rename from panels/config/zwave/zwave-log.html
rename to panels/config/zwave/zwave-log.js
index c6b1a8f39a..f87266b8dd 100644
--- a/panels/config/zwave/zwave-log.html
+++ b/panels/config/zwave/zwave-log.js
@@ -1,13 +1,15 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../bower_components/paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-checkbox/paper-checkbox.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../ha-config-section.html">
+import '../ha-config-section.js';
 
-<dom-module id='ozw-log'>
-  <template>
+class OzwLog extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         margin-top: 24px;
@@ -25,32 +27,24 @@
         padding-bottom: 24px;
       }
     </style>
-    <ha-config-section is-wide='[[isWide]]'>
-      <span slot='header'>OZW Log</span>
+    <ha-config-section is-wide="[[isWide]]">
+      <span slot="header">OZW Log</span>
       <paper-card>
-      <div class='device-picker'>
-        <paper-input
-          label="Number of last log lines."
-          type=number
-          min=0
-          max=1000
-          step=10
-          value={{numLogLines}}>
+      <div class="device-picker">
+        <paper-input label="Number of last log lines." type="number" min="0" max="1000" step="10" value="{{numLogLines}}">
         </paper-input>
       </div>
       <div class="card-actions">
-        <paper-button raised on-click='refreshLog'>Refresh</paper-button>
+        <paper-button raised="" on-click="refreshLog">Refresh</paper-button>
       </div>
-      <div class='help-text'>
+      <div class="help-text">
              <pre>[[ozwLogs]]</pre>
       </div>
       </paper-card>
     </ha-config-section>
-  </template>
-</dom-module>
-<script>
+`;
+  }
 
-class OzwLog extends Polymer.Element {
   static get is() { return 'ozw-log'; }
 
   static get properties() {
@@ -86,4 +80,3 @@ class OzwLog extends Polymer.Element {
 }
 
 customElements.define(OzwLog.is, OzwLog);
-</script>
diff --git a/panels/config/zwave/zwave-network.html b/panels/config/zwave/zwave-network.html
deleted file mode 100644
index 53f75b6346..0000000000
--- a/panels/config/zwave/zwave-network.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
-<link rel="import" href="../../../src/components/buttons/ha-call-api-button.html">
-<link rel="import" href="../../../src/components/ha-service-description.html">
-
-<link rel="import" href="../ha-config-section.html">
-
-<dom-module id='zwave-network'>
-  <template>
-    <style include="iron-flex ha-style">
-      .content {
-        margin-top: 24px;
-      }
-
-      paper-card {
-        display: block;
-        margin: 0 auto;
-        max-width: 600px;
-      }
-
-      .card-actions.warning ha-call-service-button {
-        color: var(--google-red-500);
-      }
-
-      .toggle-help-icon {
-        position: absolute;
-        top: -6px;
-        right: 0;
-        color: var(--primary-color);
-      }
-
-      ha-service-description {
-        display: block;
-        color: grey;
-      }
-
-      [hidden] {
-        display: none;
-      }
-    </style>
-    <ha-config-section is-wide='[[isWide]]'>
-      <div style="position: relative" slot='header'>
-        <span>Z-Wave Network Management</span>
-        <paper-icon-button
-          class="toggle-help-icon"
-          on-click='helpTap'
-          icon='mdi:help-circle'
-        ></paper-icon-button>
-
-      </div>
-      <span slot='introduction'>
-        Run commands that affect the Z-Wave network. You won't get feedback on whether the command succeeded, but you can look in the OZW Log to try to figure out.
-      </span>
-
-
-      <paper-card class="content">
-        <div class='card-actions'>
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='add_node_secure'
-          >Add Node Secure</ha-call-service-button>
-          <ha-service-description
-            hass='[[hass]]'
-            domain='zwave'
-            service='add_node_secure'
-            hidden$='[[!showDescription]]'
-          ></ha-service-description>
-
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='add_node'
-          >Add Node</ha-call-service-button>
-          <ha-service-description
-            hass='[[hass]]'
-            domain='zwave'
-            service='add_node'
-            hidden$='[[!showDescription]]'
-          ></ha-service-description>
-
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='remove_node'
-          >Remove Node</ha-call-service-button>
-          <ha-service-description
-            hass='[[hass]]'
-            domain='zwave'
-            service='remove_node'
-            hidden$='[[!showDescription]]'
-          ></ha-service-description>
-
-        </div>
-        <div class='card-actions warning'>
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='cancel_command'
-          >Cancel Command</ha-call-service-button>
-          <ha-service-description
-            hass='[[hass]]'
-            domain='zwave'
-            service='cancel_command'
-            hidden$='[[!showDescription]]'
-          ></ha-service-description>
-
-        </div>
-        <div class='card-actions'>
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='heal_network'
-          >Heal Network</ha-call-service-button>
-
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='start_network'
-          >Start Network</ha-call-service-button>
-          <ha-service-description
-            hass='[[hass]]'
-            domain='zwave'
-            service='start_network'
-            hidden$='[[!showDescription]]'
-          ></ha-service-description>
-
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='stop_network'
-          >Stop Network</ha-call-service-button>
-          <ha-service-description
-            hass='[[hass]]'
-            domain='zwave'
-            service='stop_network'
-            hidden$='[[!showDescription]]'
-          ></ha-service-description>
-
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='soft_reset'
-          >Soft Reset</ha-call-service-button>
-          <ha-service-description
-            hass='[[hass]]'
-            domain='zwave'
-            service='soft_reset'
-            hidden$='[[!showDescription]]'
-          ></ha-service-description>
-
-          <ha-call-service-button
-            hass='[[hass]]'
-            domain='zwave'
-            service='test_network'
-          >Test Network</ha-call-service-button>
-          <ha-service-description
-            hass='[[hass]]'
-            domain='zwave'
-            service='test_network'
-            hidden$='[[!showDescription]]'
-          ></ha-service-description>
-          <ha-call-api-button
-            hass='[[hass]]'
-            path="zwave/saveconfig"
-          >Save Config</ha-call-api-button>
-
-        </div>
-      </paper-card>
-    </ha-config-section>
-  </template>
-</dom-module>
-<script>
-
-class ZwaveNetwork extends Polymer.Element {
-  static get is() { return 'zwave-network'; }
-
-  static get properties() {
-    return {
-      hass: {
-        type: Object,
-      },
-
-      isWide: {
-        type: Boolean,
-        value: false,
-      },
-
-      showDescription: {
-        type: Boolean,
-        value: false,
-      },
-    };
-  }
-
-  helpTap() {
-    this.showDescription = !this.showDescription;
-  }
-}
-
-customElements.define(ZwaveNetwork.is, ZwaveNetwork);
-</script>
diff --git a/panels/config/zwave/zwave-network.js b/panels/config/zwave/zwave-network.js
new file mode 100644
index 0000000000..ce09a6fc86
--- /dev/null
+++ b/panels/config/zwave/zwave-network.js
@@ -0,0 +1,120 @@
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../src/components/buttons/ha-call-api-button.js';
+import '../../../src/components/buttons/ha-call-service-button.js';
+import '../../../src/components/ha-service-description.js';
+import '../ha-config-section.js';
+
+class ZwaveNetwork extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style">
+      .content {
+        margin-top: 24px;
+      }
+
+      paper-card {
+        display: block;
+        margin: 0 auto;
+        max-width: 600px;
+      }
+
+      .card-actions.warning ha-call-service-button {
+        color: var(--google-red-500);
+      }
+
+      .toggle-help-icon {
+        position: absolute;
+        top: -6px;
+        right: 0;
+        color: var(--primary-color);
+      }
+
+      ha-service-description {
+        display: block;
+        color: grey;
+      }
+
+      [hidden] {
+        display: none;
+      }
+    </style>
+    <ha-config-section is-wide="[[isWide]]">
+      <div style="position: relative" slot="header">
+        <span>Z-Wave Network Management</span>
+        <paper-icon-button class="toggle-help-icon" on-click="helpTap" icon="mdi:help-circle"></paper-icon-button>
+
+      </div>
+      <span slot="introduction">
+        Run commands that affect the Z-Wave network. You won't get feedback on whether the command succeeded, but you can look in the OZW Log to try to figure out.
+      </span>
+
+
+      <paper-card class="content">
+        <div class="card-actions">
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="add_node_secure">Add Node Secure</ha-call-service-button>
+          <ha-service-description hass="[[hass]]" domain="zwave" service="add_node_secure" hidden\$="[[!showDescription]]"></ha-service-description>
+
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="add_node">Add Node</ha-call-service-button>
+          <ha-service-description hass="[[hass]]" domain="zwave" service="add_node" hidden\$="[[!showDescription]]"></ha-service-description>
+
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="remove_node">Remove Node</ha-call-service-button>
+          <ha-service-description hass="[[hass]]" domain="zwave" service="remove_node" hidden\$="[[!showDescription]]"></ha-service-description>
+
+        </div>
+        <div class="card-actions warning">
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="cancel_command">Cancel Command</ha-call-service-button>
+          <ha-service-description hass="[[hass]]" domain="zwave" service="cancel_command" hidden\$="[[!showDescription]]"></ha-service-description>
+
+        </div>
+        <div class="card-actions">
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="heal_network">Heal Network</ha-call-service-button>
+
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="start_network">Start Network</ha-call-service-button>
+          <ha-service-description hass="[[hass]]" domain="zwave" service="start_network" hidden\$="[[!showDescription]]"></ha-service-description>
+
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="stop_network">Stop Network</ha-call-service-button>
+          <ha-service-description hass="[[hass]]" domain="zwave" service="stop_network" hidden\$="[[!showDescription]]"></ha-service-description>
+
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="soft_reset">Soft Reset</ha-call-service-button>
+          <ha-service-description hass="[[hass]]" domain="zwave" service="soft_reset" hidden\$="[[!showDescription]]"></ha-service-description>
+
+          <ha-call-service-button hass="[[hass]]" domain="zwave" service="test_network">Test Network</ha-call-service-button>
+          <ha-service-description hass="[[hass]]" domain="zwave" service="test_network" hidden\$="[[!showDescription]]"></ha-service-description>
+          <ha-call-api-button hass="[[hass]]" path="zwave/saveconfig">Save Config</ha-call-api-button>
+
+        </div>
+      </paper-card>
+    </ha-config-section>
+`;
+  }
+
+  static get is() { return 'zwave-network'; }
+
+  static get properties() {
+    return {
+      hass: {
+        type: Object,
+      },
+
+      isWide: {
+        type: Boolean,
+        value: false,
+      },
+
+      showDescription: {
+        type: Boolean,
+        value: false,
+      },
+    };
+  }
+
+  helpTap() {
+    this.showDescription = !this.showDescription;
+  }
+}
+
+customElements.define(ZwaveNetwork.is, ZwaveNetwork);
diff --git a/panels/config/zwave/zwave-node-config.html b/panels/config/zwave/zwave-node-config.js
similarity index 70%
rename from panels/config/zwave/zwave-node-config.html
rename to panels/config/zwave/zwave-node-config.js
index 385072fafb..f42f41b16c 100644
--- a/panels/config/zwave/zwave-node-config.html
+++ b/panels/config/zwave/zwave-node-config.js
@@ -1,14 +1,16 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href="../../../bower_components/paper-listbox/paper-listbox.html">
-<link rel='import' href="../../../bower_components/paper-input/paper-input.html">
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
+import '../../../src/components/buttons/ha-call-service-button.js';
 
-<dom-module id='zwave-node-config'>
-  <template>
+class ZwaveNodeConfig extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         margin-top: 24px;
@@ -33,43 +35,30 @@
         padding-right: 24px;
       }
     </style>
-    <div class='content'>
-      <paper-card heading='Node config options'>
-        <template is='dom-if' if='[[wakeupNode]]'>
-          <div class='card-actions'>
-            <paper-input
-              float-label="Wakeup Interval"
-              type=number
-              value={{wakeupInput}}
-              placeholder=[[computeGetWakeupValue(selectedNode)]]>
-               <div suffix>seconds</div>
+    <div class="content">
+      <paper-card heading="Node config options">
+        <template is="dom-if" if="[[wakeupNode]]">
+          <div class="card-actions">
+            <paper-input float-label="Wakeup Interval" type="number" value="{{wakeupInput}}" placeholder="[[computeGetWakeupValue(selectedNode)]]">
+               <div suffix="">seconds</div>
             </paper-input>
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='set_wakeup'
-              service-data='[[computeWakeupServiceData(wakeupInput)]]'
-            >Set Wakeup</ha-call-service-button>
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="set_wakeup" service-data="[[computeWakeupServiceData(wakeupInput)]]">Set Wakeup</ha-call-service-button>
           </div>
         </template>
-        <div class='device-picker'>
-        <paper-dropdown-menu label="Config parameter" dynamic-align class='flex'>
-          <paper-listbox
-            slot="dropdown-content"
-            selected='{{selectedConfigParameter}}'>
-            <template is='dom-repeat' items='[[config]]' as='state'>
+        <div class="device-picker">
+        <paper-dropdown-menu label="Config parameter" dynamic-align="" class="flex">
+          <paper-listbox slot="dropdown-content" selected="{{selectedConfigParameter}}">
+            <template is="dom-repeat" items="[[config]]" as="state">
               <paper-item>[[computeSelectCaptionConfigParameter(state)]]</paper-item>
             </template>
           </paper-listbox>
         </paper-dropdown-menu>
         </div>
-        <template is='dom-if' if="[[isConfigParameterSelected(selectedConfigParameter, 'List')]]">
-          <div class='device-picker'>
-            <paper-dropdown-menu label="Config value" dynamic-align class='flex' placeholder='{{loadedConfigValue}}'>
-              <paper-listbox
-                slot="dropdown-content"
-                selected='{{selectedConfigValue}}'>
-                <template is='dom-repeat' items='[[selectedConfigParameterValues]]' as='state'>
+        <template is="dom-if" if="[[isConfigParameterSelected(selectedConfigParameter, 'List')]]">
+          <div class="device-picker">
+            <paper-dropdown-menu label="Config value" dynamic-align="" class="flex" placeholder="{{loadedConfigValue}}">
+              <paper-listbox slot="dropdown-content" selected="{{selectedConfigValue}}">
+                <template is="dom-repeat" items="[[selectedConfigParameterValues]]" as="state">
                   <paper-item>[[state]]</paper-item>
                 </template>
               </paper-listbox>
@@ -77,50 +66,36 @@
           </div>
         </template>
 
-        <template is='dom-if' if="[[isConfigParameterSelected(selectedConfigParameter, 'Byte Short Int')]]">
-          <div class='card-actions'>
-            <paper-input
-              label='{{selectedConfigParameterNumValues}}'
-              type=number
-              value='{{selectedConfigValue}}'
-              max='{{configParameterMax}}'
-              min='{{configParameterMin}}'>
+        <template is="dom-if" if="[[isConfigParameterSelected(selectedConfigParameter, 'Byte Short Int')]]">
+          <div class="card-actions">
+            <paper-input label="{{selectedConfigParameterNumValues}}" type="number" value="{{selectedConfigValue}}" max="{{configParameterMax}}" min="{{configParameterMin}}">
             </paper-input>
           </div>
         </template>
-        <template is='dom-if' if="[[isConfigParameterSelected(selectedConfigParameter, 'Bool Button')]]">
-          <div class='device-picker'>
-            <paper-dropdown-menu label="Config value" class='flex' dynamic-align placeholder='{{loadedConfigValue}}'>
-              <paper-listbox
-                slot="dropdown-content"
-                selected='{{selectedConfigValue}}'>
-                <template is='dom-repeat' items='[[selectedConfigParameterValues]]' as='state'>
+        <template is="dom-if" if="[[isConfigParameterSelected(selectedConfigParameter, 'Bool Button')]]">
+          <div class="device-picker">
+            <paper-dropdown-menu label="Config value" class="flex" dynamic-align="" placeholder="{{loadedConfigValue}}">
+              <paper-listbox slot="dropdown-content" selected="{{selectedConfigValue}}">
+                <template is="dom-repeat" items="[[selectedConfigParameterValues]]" as="state">
                   <paper-item>[[state]]</paper-item>
                 </template>
               </paper-listbox>
             </paper-dropdown-menu>
           </div>
         </template>
-        <div class='help-text'>
+        <div class="help-text">
           <span>[[configValueHelpText]]</span>
         </div>
-        <template is='dom-if' if="[[isConfigParameterSelected(selectedConfigParameter, 'Bool Button Byte Short Int List')]]">
-          <div class='card-actions'>
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='set_config_parameter'
-              service-data=[[computeSetConfigParameterServiceData(selectedConfigValue)]]
-            >Set Config Parameter</ha-call-service-button>
+        <template is="dom-if" if="[[isConfigParameterSelected(selectedConfigParameter, 'Bool Button Byte Short Int List')]]">
+          <div class="card-actions">
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="set_config_parameter" service-data="[[computeSetConfigParameterServiceData(selectedConfigValue)]]">Set Config Parameter</ha-call-service-button>
           </div>
         </template>
       </paper-card>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class ZwaveNodeConfig extends Polymer.Element {
   static get is() { return 'zwave-node-config'; }
 
   static get properties() {
@@ -321,4 +296,3 @@ class ZwaveNodeConfig extends Polymer.Element {
 }
 
 customElements.define(ZwaveNodeConfig.is, ZwaveNodeConfig);
-</script>
diff --git a/panels/config/zwave/zwave-node-information.html b/panels/config/zwave/zwave-node-information.js
similarity index 62%
rename from panels/config/zwave/zwave-node-information.html
rename to panels/config/zwave/zwave-node-information.js
index 596250fa55..cecdc093e8 100644
--- a/panels/config/zwave/zwave-node-information.html
+++ b/panels/config/zwave/zwave-node-information.js
@@ -1,9 +1,11 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='zwave-node-information'>
-  <template>
+class ZwaveNodeInformation extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         margin-top: 24px;
@@ -25,26 +27,23 @@
 
     </style>
 
-    <div class='content'>
-      <paper-card heading='Node Information'>
-      <div class='card-actions'>
-        <paper-button toggles raised noink active={{nodeInfoActive}}>Show</paper-button>
+    <div class="content">
+      <paper-card heading="Node Information">
+      <div class="card-actions">
+        <paper-button toggles="" raised="" noink="" active="{{nodeInfoActive}}">Show</paper-button>
       </div>
-      <template is='dom-if' if={{nodeInfoActive}}>
-        <template is='dom-repeat' items='[[selectedNodeAttrs]]' as='state'>
-          <div class='node-info'>
+      <template is="dom-if" if="{{nodeInfoActive}}">
+        <template is="dom-repeat" items="[[selectedNodeAttrs]]" as="state">
+          <div class="node-info">
             <span>[[state]]</span>
           </div>
         </template>
       </template>
       </paper-card>
     </div>
+`;
+  }
 
-  </template>
-</dom-module>
-<script>
-
-class ZwaveNodeInformation extends Polymer.Element {
   static get is() { return 'zwave-node-information'; }
 
   static get properties() {
@@ -82,4 +81,3 @@ class ZwaveNodeInformation extends Polymer.Element {
 }
 
 customElements.define(ZwaveNodeInformation.is, ZwaveNodeInformation);
-</script>
diff --git a/panels/config/zwave/zwave-usercodes.html b/panels/config/zwave/zwave-usercodes.js
similarity index 66%
rename from panels/config/zwave/zwave-usercodes.html
rename to panels/config/zwave/zwave-usercodes.js
index e663afbb86..8b5f1af0fa 100644
--- a/panels/config/zwave/zwave-usercodes.html
+++ b/panels/config/zwave/zwave-usercodes.js
@@ -1,14 +1,16 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href="../../../bower_components/paper-listbox/paper-listbox.html">
-<link rel='import' href="../../../bower_components/paper-input/paper-input.html">
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
+import '../../../src/components/buttons/ha-call-service-button.js';
 
-<dom-module id='zwave-usercodes'>
-  <template>
+class ZwaveUsercodes extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         margin-top: 24px;
@@ -28,54 +30,34 @@
         padding-bottom: 24px;
         }
     </style>
-      <div class='content'>
-        <paper-card heading='Node user codes'>
-          <div class='device-picker'>
-          <paper-dropdown-menu label="Code slot" dynamic-align class='flex'>
-            <paper-listbox
-              slot="dropdown-content"
-              selected='{{selectedUserCode}}'>
-              <template is='dom-repeat' items='[[userCodes]]' as='state'>
+      <div class="content">
+        <paper-card heading="Node user codes">
+          <div class="device-picker">
+          <paper-dropdown-menu label="Code slot" dynamic-align="" class="flex">
+            <paper-listbox slot="dropdown-content" selected="{{selectedUserCode}}">
+              <template is="dom-repeat" items="[[userCodes]]" as="state">
                 <paper-item>[[computeSelectCaptionUserCodes(state)]]</paper-item>
               </template>
             </paper-listbox>
           </paper-dropdown-menu>
           </div>
 
-          <template is='dom-if' if="[[isUserCodeSelected(selectedUserCode)]]">
-            <div class='card-actions'>
-              <paper-input
-                label='User code'
-                type='text'
-                allowed-pattern='[0-9,a-f,x,\\]'
-                maxlength='{{userCodeMaxLen}}'
-                minlength='16'
-                value='{{selectedUserCodeValue}}'>
+          <template is="dom-if" if="[[isUserCodeSelected(selectedUserCode)]]">
+            <div class="card-actions">
+              <paper-input label="User code" type="text" allowed-pattern="[0-9,a-f,x,\\\\]" maxlength="{{userCodeMaxLen}}" minlength="16" value="{{selectedUserCodeValue}}">
               </paper-input>
               <pre>Ascii: [[computedCodeOutput]]</pre>
             </div>
-            <div class='card-actions'>
-              <ha-call-service-button
-                hass='[[hass]]'
-                domain='lock'
-                service='set_usercode'
-                service-data='[[computeUserCodeServiceData(selectedUserCodeValue, "Add")]]'
-              >Set Usercode</ha-call-service-button>
-              <ha-call-service-button
-                hass='[[hass]]'
-                domain='lock'
-                service='clear_usercode'
-                service-data='[[computeUserCodeServiceData(selectedUserCode, "Delete")]]'
-              >Delete Usercode</ha-call-service-button>
+            <div class="card-actions">
+              <ha-call-service-button hass="[[hass]]" domain="lock" service="set_usercode" service-data="[[computeUserCodeServiceData(selectedUserCodeValue, &quot;Add&quot;)]]">Set Usercode</ha-call-service-button>
+              <ha-call-service-button hass="[[hass]]" domain="lock" service="clear_usercode" service-data="[[computeUserCodeServiceData(selectedUserCode, &quot;Delete&quot;)]]">Delete Usercode</ha-call-service-button>
             </div>
           </template>
         </paper-card>
       </div>
-    </template>
-</dom-module>
-<script>
+`;
+  }
 
-class ZwaveUsercodes extends Polymer.Element {
   static get is() { return 'zwave-usercodes'; }
 
   static get properties() {
@@ -213,4 +195,3 @@ class ZwaveUsercodes extends Polymer.Element {
 }
 
 customElements.define(ZwaveUsercodes.is, ZwaveUsercodes);
-</script>
diff --git a/panels/config/zwave/zwave-values.html b/panels/config/zwave/zwave-values.js
similarity index 65%
rename from panels/config/zwave/zwave-values.html
rename to panels/config/zwave/zwave-values.js
index 1c579f02b2..eab048aa10 100644
--- a/panels/config/zwave/zwave-values.html
+++ b/panels/config/zwave/zwave-values.js
@@ -1,13 +1,15 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href="../../../bower_components/paper-listbox/paper-listbox.html">
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../src/components/buttons/ha-call-service-button.html">
+import '../../../src/components/buttons/ha-call-service-button.js';
 
-<dom-module id='zwave-values'>
-  <template>
+class ZwaveValues extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-flex ha-style">
       .content {
         margin-top: 24px;
@@ -32,43 +34,30 @@
         padding-right: 24px;
       }
     </style>
-    <div class='content'>
-      <paper-card heading='Node Values'>
-        <div class='device-picker'>
-        <paper-dropdown-menu label="Value" dynamic-align class='flex'>
-          <paper-listbox
-            slot="dropdown-content"
-            selected='{{selectedValue}}'>
-             <template is='dom-repeat' items='[[values]]' as='item'>
+    <div class="content">
+      <paper-card heading="Node Values">
+        <div class="device-picker">
+        <paper-dropdown-menu label="Value" dynamic-align="" class="flex">
+          <paper-listbox slot="dropdown-content" selected="{{selectedValue}}">
+             <template is="dom-repeat" items="[[values]]" as="item">
               <paper-item>[[computeSelectCaption(item)]]</paper-item>
             </template>
           </paper-listbox>
         </paper-dropdown-menu>
         </div>
-        <template is='dom-if' if='[[!computeIsValueSelected(selectedValue)]]'>
-          <div class='card-actions'>
-            <paper-input
-              float-label="Value Name"
-              type=text
-              value={{newValueNameInput}}
-              placeholder=[[computeGetValueName(selectedValue)]]>
+        <template is="dom-if" if="[[!computeIsValueSelected(selectedValue)]]">
+          <div class="card-actions">
+            <paper-input float-label="Value Name" type="text" value="{{newValueNameInput}}" placeholder="[[computeGetValueName(selectedValue)]]">
             </paper-input>
-            <ha-call-service-button
-              hass='[[hass]]'
-              domain='zwave'
-              service='rename_value'
-              service-data=[[computeValueNameServiceData(newValueNameInput)]]
-            >Rename Value</ha-call-service-button>
+            <ha-call-service-button hass="[[hass]]" domain="zwave" service="rename_value" service-data="[[computeValueNameServiceData(newValueNameInput)]]">Rename Value</ha-call-service-button>
 
           </div>
         </template>
       </paper-card>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class ZwaveValues extends Polymer.Element {
   static get is() { return 'zwave-values'; }
 
   static get properties() {
@@ -158,4 +147,3 @@ class ZwaveValues extends Polymer.Element {
 }
 
 customElements.define(ZwaveValues.is, ZwaveValues);
-</script>
diff --git a/panels/dev-event/events-list.html b/panels/dev-event/events-list.js
similarity index 67%
rename from panels/dev-event/events-list.html
rename to panels/dev-event/events-list.js
index 73beba6e6c..444b233743 100644
--- a/panels/dev-event/events-list.html
+++ b/panels/dev-event/events-list.js
@@ -1,9 +1,11 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../../src/util/hass-mixins.js';
 
-<dom-module id="events-list">
-  <template>
+class EventsList extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       ul {
         margin: 0;
@@ -21,18 +23,16 @@
     </style>
 
     <ul>
-      <template is='dom-repeat' items='[[events]]' as='event'>
+      <template is="dom-repeat" items="[[events]]" as="event">
         <li>
-          <a href='#' on-click='eventSelected'>{{event.event}}</a>
+          <a href="#" on-click="eventSelected">{{event.event}}</a>
           <span> (</span><span>{{event.listener_count}}</span><span> listeners)</span>
         </li>
       </template>
     </ul>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class EventsList extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'events-list'; }
 
   static get properties() {
@@ -61,4 +61,3 @@ class EventsList extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(EventsList.is, EventsList);
-</script>
diff --git a/panels/dev-event/ha-panel-dev-event.html b/panels/dev-event/ha-panel-dev-event.js
similarity index 70%
rename from panels/dev-event/ha-panel-dev-event.html
rename to panels/dev-event/ha-panel-dev-event.js
index bf12eef371..ee3a440109 100644
--- a/panels/dev-event/ha-panel-dev-event.html
+++ b/panels/dev-event/ha-panel-dev-event.js
@@ -1,23 +1,21 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-input/paper-textarea.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/hass-mixins.js';
+import './events-list.js';
 
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../bower_components/paper-input/paper-textarea.html">
-
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/resources/ha-style.html">
-<link rel='import' href='../../src/util/hass-mixins.html'>
-
-<link rel="import" href="./events-list.html">
-
-<dom-module id="ha-panel-dev-event">
-  <template>
+class HaPanelDevEvent extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="ha-style iron-flex iron-positioning"></style>
     <style>
       :host {
@@ -63,16 +61,13 @@
 
         <div>
           <div class='header'>Available Events</div>
-          <events-list on-event-selected='eventSelected' hass='[[hass]]'></event-list>
+          <events-list on-event-selected='eventSelected' hass='[[hass]]'></events-list>
         </div>
       </div>
-    </events-list>
+    </app-header-layout>
+    `;
+  }
 
-  </template>
-</dom-module>
-
-<script>
-class HaPanelDevEvent extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-panel-dev-event'; }
 
   static get properties() {
@@ -134,4 +129,3 @@ class HaPanelDevEvent extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaPanelDevEvent.is, HaPanelDevEvent);
-</script>
diff --git a/panels/dev-info/ha-panel-dev-info.html b/panels/dev-info/ha-panel-dev-info.js
similarity index 86%
rename from panels/dev-info/ha-panel-dev-info.html
rename to panels/dev-info/ha-panel-dev-info.js
index 02c10c0dc5..1790b80089 100644
--- a/panels/dev-info/ha-panel-dev-info.html
+++ b/panels/dev-info/ha-panel-dev-info.js
@@ -1,22 +1,22 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dialog-scrollable/paper-dialog-scrollable.js';
+import '@polymer/paper-dialog/paper-dialog.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../bower_components/paper-dialog/paper-dialog.html">
-<link rel="import" href="../../bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
+import '../../src/components/buttons/ha-call-service-button.js';
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-style.js';
 
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-
-<link rel="import" href="../../src/components/buttons/ha-call-service-button.html">
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/resources/ha-style.html">
-
-<dom-module id="ha-panel-dev-info">
-  <template>
+class HaPanelDevInfo extends PolymerElement {
+  static get template() {
+    return html`
     <style include="iron-positioning ha-style">
       :host {
         -ms-user-select: initial;
@@ -204,7 +204,7 @@
     <paper-dialog with-backdrop id="showlog">
       <h2>Log Details ([[selectedItem.level]])</h2>
       <paper-dialog-scrollable id="scrollable">
-	<p>[[fullTimeStamp(selectedItem.timestamp)]]</p>
+        <p>[[fullTimeStamp(selectedItem.timestamp)]]</p>
         <template is='dom-if' if='[[selectedItem.message]]'>
           <pre>[[selectedItem.message]]</pre>
         </template>
@@ -213,11 +213,8 @@
         </template>
       </paper-dialog-scrollable>
     </paper-dialog>
-  </template>
-</dom-module>
-
-<script>
-class HaPanelDevInfo extends Polymer.Element {
+    `;
+  }
   static get is() { return 'ha-panel-dev-info'; }
 
   static get properties() {
@@ -334,4 +331,3 @@ class HaPanelDevInfo extends Polymer.Element {
 }
 
 customElements.define(HaPanelDevInfo.is, HaPanelDevInfo);
-</script>
diff --git a/panels/dev-mqtt/ha-panel-dev-mqtt.html b/panels/dev-mqtt/ha-panel-dev-mqtt.js
similarity index 64%
rename from panels/dev-mqtt/ha-panel-dev-mqtt.html
rename to panels/dev-mqtt/ha-panel-dev-mqtt.js
index d87aff13fe..7ede0878e7 100644
--- a/panels/dev-mqtt/ha-panel-dev-mqtt.html
+++ b/panels/dev-mqtt/ha-panel-dev-mqtt.js
@@ -1,20 +1,20 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-input/paper-textarea.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../bower_components/app-layout/app-header-layout/app-header-layout.html'>
-<link rel='import' href='../../bower_components/app-layout/app-header/app-header.html'>
-<link rel='import' href='../../bower_components/app-layout/app-toolbar/app-toolbar.html'>
-<link rel="import" href="../../bower_components/app-storage/app-localstorage/app-localstorage-document.html">
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/app-localstorage-document.js';
 
-<link rel='import' href='../../bower_components/paper-card/paper-card.html'>
-<link rel='import' href='../../bower_components/paper-input/paper-input.html'>
-<link rel='import' href='../../bower_components/paper-button/paper-button.html'>
-<link rel='import' href='../../bower_components/paper-input/paper-textarea.html'>
-
-<link rel='import' href='../../src/components/ha-menu-button.html'>
-<link rel='import' href='../../src/resources/ha-style.html'>
-
-<dom-module id='ha-panel-dev-mqtt'>
-  <template>
+class HaPanelDevMqtt extends PolymerElement {
+  static get template() {
+    return html`
     <style include='ha-style'>
       :host {
         -ms-user-select: initial;
@@ -75,11 +75,9 @@
       </div>
 
     </app-header-layout>
-  </template>
-</dom-module>
+    `;
+  }
 
-<script>
-class HaPanelDevMqtt extends Polymer.Element {
   static get is() { return 'ha-panel-dev-mqtt'; }
 
   static get properties() {
@@ -101,4 +99,3 @@ class HaPanelDevMqtt extends Polymer.Element {
 }
 
 customElements.define(HaPanelDevMqtt.is, HaPanelDevMqtt);
-</script>
diff --git a/panels/dev-service/ha-panel-dev-service.html b/panels/dev-service/ha-panel-dev-service.js
similarity index 87%
rename from panels/dev-service/ha-panel-dev-service.html
rename to panels/dev-service/ha-panel-dev-service.js
index 95d35423ff..0d225b8457 100644
--- a/panels/dev-service/ha-panel-dev-service.html
+++ b/panels/dev-service/ha-panel-dev-service.js
@@ -1,20 +1,22 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-input/paper-textarea.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../bower_components/paper-button/paper-button.html'>
-<link rel='import' href='../../bower_components/paper-input/paper-textarea.html'>
+import '../../src/components/entity/ha-entity-picker.js';
+import '../../src/components/ha-menu-button.js';
+import '../../src/components/ha-service-picker.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/app-localstorage-document.js';
 
-<link rel='import' href='../../bower_components/app-layout/app-header-layout/app-header-layout.html'>
-<link rel='import' href='../../bower_components/app-layout/app-header/app-header.html'>
-<link rel='import' href='../../bower_components/app-layout/app-toolbar/app-toolbar.html'>
-<link rel="import" href="../../bower_components/app-storage/app-localstorage/app-localstorage-document.html">
-
-<link rel='import' href='../../src/components/ha-menu-button.html'>
-<link rel='import' href='../../src/components/entity/ha-entity-picker.html'>
-<link rel='import' href='../../src/components/ha-service-picker.html'>
-<link rel='import' href='../../src/resources/ha-style.html'>
-
-<dom-module id='ha-panel-dev-service'>
-  <template>
+{
+  const ERROR_SENTINEL = {};
+  class HaPanelDevService extends PolymerElement {
+    static get template() {
+      return html`
     <style include='ha-style'>
       :host {
         -ms-user-select: initial;
@@ -163,13 +165,8 @@
       </div>
 
     </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-{
-  const ERROR_SENTINEL = {};
-  class HaPanelDevService extends Polymer.Element {
+      `;
+    }
     static get is() { return 'ha-panel-dev-service'; }
 
     static get properties() {
@@ -306,4 +303,3 @@
 
   customElements.define(HaPanelDevService.is, HaPanelDevService);
 }
-</script>
diff --git a/panels/dev-state/ha-panel-dev-state.html b/panels/dev-state/ha-panel-dev-state.js
similarity index 88%
rename from panels/dev-state/ha-panel-dev-state.html
rename to panels/dev-state/ha-panel-dev-state.js
index d26ada4c55..b98cfd77e0 100644
--- a/panels/dev-state/ha-panel-dev-state.html
+++ b/panels/dev-state/ha-panel-dev-state.js
@@ -1,22 +1,21 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-checkbox/paper-checkbox.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-input/paper-textarea.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../bower_components/paper-input/paper-textarea.html">
-<link rel="import" href="../../bower_components/paper-checkbox/paper-checkbox.html">
+import '../../src/components/entity/ha-entity-picker.js';
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/hass-mixins.js';
 
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/components/entity/ha-entity-picker.html">
-<link rel="import" href="../../src/resources/ha-style.html">
-
-<link rel='import' href='../../src/util/hass-mixins.html'>
-
-<dom-module id="ha-panel-dev-state">
-  <template>
+class HaPanelDevState extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="ha-style">
       :host {
         -ms-user-select: initial;
@@ -134,11 +133,8 @@
         </table>
       </div>
     </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-class HaPanelDevState extends window.hassMixins.EventsMixin(Polymer.Element) {
+    `;
+  }
   static get is() { return 'ha-panel-dev-state'; }
 
   static get properties() {
@@ -321,4 +317,3 @@ class HaPanelDevState extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaPanelDevState.is, HaPanelDevState);
-</script>
diff --git a/panels/dev-template/ha-panel-dev-template.html b/panels/dev-template/ha-panel-dev-template.js
similarity index 81%
rename from panels/dev-template/ha-panel-dev-template.html
rename to panels/dev-template/ha-panel-dev-template.js
index 6959ec78a3..a95d92e071 100644
--- a/panels/dev-template/ha-panel-dev-template.html
+++ b/panels/dev-template/ha-panel-dev-template.js
@@ -1,18 +1,19 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/polymer/lib/utils/debounce.html">
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-input/paper-textarea.js';
+import '@polymer/paper-spinner/paper-spinner.js';
+import { timeOut } from '@polymer/polymer/lib/utils/async.js';
+import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/paper-input/paper-textarea.html">
-<link rel="import" href="../../bower_components/paper-spinner/paper-spinner.html">
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-style.js';
 
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/resources/ha-style.html">
-
-<dom-module id="ha-panel-dev-template">
-  <template>
+class HaPanelDevTemplate extends PolymerElement {
+  static get template() {
+    return html`
     <style is="custom-style" include="ha-style iron-flex iron-positioning"></style>
     <style>
       :host {
@@ -95,11 +96,8 @@
         </div>
       </div>
     </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-class HaPanelDevTemplate extends Polymer.Element {
+    `;
+  }
   static get is() { return 'ha-panel-dev-template'; }
 
   static get properties() {
@@ -176,9 +174,9 @@ For loop example:
     if (this.error) {
       this.error = false;
     }
-    this._debouncer = Polymer.Debouncer.debounce(
+    this._debouncer = Debouncer.debounce(
       this._debouncer,
-      Polymer.Async.timeOut.after(500),
+      timeOut.after(500),
       () => { this.renderTemplate(); }
     );
   }
@@ -199,4 +197,3 @@ For loop example:
 }
 
 customElements.define(HaPanelDevTemplate.is, HaPanelDevTemplate);
-</script>
diff --git a/panels/hassio/ha-panel-hassio.html b/panels/hassio/ha-panel-hassio.js
similarity index 86%
rename from panels/hassio/ha-panel-hassio.html
rename to panels/hassio/ha-panel-hassio.js
index 00c1ca0274..776fe19a61 100644
--- a/panels/hassio/ha-panel-hassio.html
+++ b/panels/hassio/ha-panel-hassio.js
@@ -1,8 +1,12 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="ha-panel-hassio">
-  <template>
+import '../../src/util/hass-mixins.js';
+
+class HaPanelHassio extends
+  window.hassMixins.NavigateMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
     <style>
       iframe {
         border: 0;
@@ -15,12 +19,8 @@
       id='iframe'
       src="[[iframeUrl]]"
     ></iframe>
-  </template>
-</dom-module>
-
-<script>
-class HaPanelHassio extends
-  window.hassMixins.NavigateMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
+    `;
+  }
   static get is() { return 'ha-panel-hassio'; }
 
   static get properties() {
@@ -78,4 +78,3 @@ class HaPanelHassio extends
 }
 
 customElements.define(HaPanelHassio.is, HaPanelHassio);
-</script>
diff --git a/panels/history/ha-panel-history.html b/panels/history/ha-panel-history.js
similarity index 71%
rename from panels/history/ha-panel-history.html
rename to panels/history/ha-panel-history.js
index 9f074eb30f..daf124c02b 100644
--- a/panels/history/ha-panel-history.html
+++ b/panels/history/ha-panel-history.js
@@ -1,25 +1,29 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../../bower_components/paper-listbox/paper-listbox.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import '@vaadin/vaadin-date-picker/vaadin-date-picker.js';
 
-<link rel="import" href="../../bower_components/vaadin-date-picker/vaadin-date-picker.html">
+import '../../src/components/ha-menu-button.js';
+import '../../src/components/state-history-charts.js';
+import '../../src/data/ha-state-history-data.js';
+import '../../src/resources/ha-date-picker-style.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/hass-mixins.js';
 
-<link rel="import" href="../../src/components/state-history-charts.html">
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/data/ha-state-history-data.html">
-<link rel="import" href="../../src/resources/ha-style.html">
-<link rel="import" href="../../src/resources/ha-date-picker-style.html">
-<link rel='import' href='../../src/util/hass-mixins.html'>
-
-<dom-module id="ha-panel-history">
-  <template>
-    <style include="iron-flex ha-style">
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaPanelHistory extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+        <style include="iron-flex ha-style">
       .content {
         padding: 0 16px 16px;
       }
@@ -88,14 +92,8 @@
         </state-history-charts>
       </div>
     </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaPanelHistory extends window.hassMixins.LocalizeMixin(Polymer.Element) {
+    `;
+  }
   static get is() { return 'ha-panel-history'; }
 
   static get properties() {
@@ -157,14 +155,9 @@ class HaPanelHistory extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   connectedCallback() {
     super.connectedCallback();
     // We are unable to parse date because we use intl api to render date
-    // So we just return last known date.
-    var lastFormatDate = new Date();
-    this.$.picker.set('i18n.parseDate', function () {
-      return lastFormatDate;
-    });
+    this.$.picker.set('i18n.parseDate', null);
     this.$.picker.set('i18n.formatDate', function (date) {
-      lastFormatDate = date;
-      return window.hassUtil.formatDate(date);
+      return window.hassUtil.formatDate(new Date(date.year, date.month, date.day));
     });
   }
 
@@ -194,4 +187,3 @@ class HaPanelHistory extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(HaPanelHistory.is, HaPanelHistory);
-</script>
diff --git a/panels/iframe/ha-panel-iframe.html b/panels/iframe/ha-panel-iframe.js
similarity index 65%
rename from panels/iframe/ha-panel-iframe.html
rename to panels/iframe/ha-panel-iframe.js
index 5446e02fbb..c18b639496 100644
--- a/panels/iframe/ha-panel-iframe.html
+++ b/panels/iframe/ha-panel-iframe.js
@@ -1,12 +1,13 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-style.js';
 
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/resources/ha-style.html">
-
-<dom-module id='ha-panel-iframe'>
-  <template>
+class HaPanelIframe extends PolymerElement {
+  static get template() {
+    return html`
     <style include='ha-style'>
       iframe {
         border: 0;
@@ -24,11 +25,8 @@
       sandbox="allow-forms allow-popups allow-pointer-lock allow-same-origin allow-scripts"
       allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"
     ></iframe>
-  </template>
-</dom-module>
-
-<script>
-class HaPanelIframe extends Polymer.Element {
+    `;
+  }
   static get is() { return 'ha-panel-iframe'; }
 
   static get properties() {
@@ -49,4 +47,3 @@ class HaPanelIframe extends Polymer.Element {
 }
 
 customElements.define(HaPanelIframe.is, HaPanelIframe);
-</script>
diff --git a/panels/kiosk/ha-panel-kiosk.html b/panels/kiosk/ha-panel-kiosk.html
deleted file mode 100644
index 09bca316b8..0000000000
--- a/panels/kiosk/ha-panel-kiosk.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-
-<link rel='import' href='../../src/layouts/partial-cards.html'>
-
-<dom-module id="ha-panel-kiosk">
-  <template>
-    <partial-cards
-            id='kiosk-states'
-            hass='[[hass]]'
-            show-menu
-            route='[[route]]'
-            panel-visible
-    ></partial-cards>
-  </template>
-</dom-module>
-
-<script>
-class HaPanelKiosk extends Polymer.Element {
-  static get is() { return 'ha-panel-kiosk'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      route: Object,
-    };
-  }
-}
-
-customElements.define(HaPanelKiosk.is, HaPanelKiosk);
-</script>
diff --git a/panels/kiosk/ha-panel-kiosk.js b/panels/kiosk/ha-panel-kiosk.js
new file mode 100644
index 0000000000..ca0fc15811
--- /dev/null
+++ b/panels/kiosk/ha-panel-kiosk.js
@@ -0,0 +1,28 @@
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../src/layouts/partial-cards.js';
+
+class HaPanelKiosk extends PolymerElement {
+  static get template() {
+    return html`
+    <partial-cards
+      id='kiosk-states'
+      hass='[[hass]]'
+      show-menu
+      route='[[route]]'
+      panel-visible
+    ></partial-cards>
+    `;
+  }
+  static get is() { return 'ha-panel-kiosk'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      route: Object,
+    };
+  }
+}
+
+customElements.define(HaPanelKiosk.is, HaPanelKiosk);
diff --git a/panels/logbook/ha-logbook-data.html b/panels/logbook/ha-logbook-data.js
similarity index 91%
rename from panels/logbook/ha-logbook-data.html
rename to panels/logbook/ha-logbook-data.js
index 5ec4cde4f6..dfb98cb88f 100644
--- a/panels/logbook/ha-logbook-data.html
+++ b/panels/logbook/ha-logbook-data.js
@@ -1,10 +1,9 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<script>
 {
   var DATE_CACHE = {};
 
-  class HaLogbookData extends Polymer.Element {
+  class HaLogbookData extends PolymerElement {
     static get is() { return 'ha-logbook-data'; }
 
     static get properties() {
@@ -77,4 +76,3 @@
 
   customElements.define(HaLogbookData.is, HaLogbookData);
 }
-</script>
diff --git a/panels/logbook/ha-logbook.html b/panels/logbook/ha-logbook.js
similarity index 55%
rename from panels/logbook/ha-logbook.html
rename to panels/logbook/ha-logbook.js
index 954d9efd5e..c5d50e6bc1 100644
--- a/panels/logbook/ha-logbook.html
+++ b/panels/logbook/ha-logbook.js
@@ -1,12 +1,13 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../src/components/domain-icon.html">
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../../src/components/domain-icon.js';
+import '../../src/util/hass-mixins.js';
 
-
-<dom-module id="ha-logbook">
-  <template>
+class HaLogbook extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex"></style>
     <style>
       :host {
@@ -38,31 +39,29 @@
       }
     </style>
 
-    <template is='dom-if' if='[[!entries.length]]'>
+    <template is="dom-if" if="[[!entries.length]]">
       No logbook entries found.
     </template>
 
-    <template is='dom-repeat' items="[[entries]]">
-      <div class='horizontal layout entry'>
-        <div class='time'>[[formatTime(item.when)]]</div>
-        <domain-icon domain="[[item.domain]]" class='icon'></domain-icon>
-        <div class='message' flex>
-          <template is='dom-if' if="[[!item.entity_id]]">
-            <span class='name'>[[item.name]]</span>
+    <template is="dom-repeat" items="[[entries]]">
+      <div class="horizontal layout entry">
+        <div class="time">[[formatTime(item.when)]]</div>
+        <domain-icon domain="[[item.domain]]" class="icon"></domain-icon>
+        <div class="message" flex="">
+          <template is="dom-if" if="[[!item.entity_id]]">
+            <span class="name">[[item.name]]</span>
           </template>
-          <template is='dom-if' if="[[item.entity_id]]">
-            <a href='#' on-click="entityClicked" class='name'>[[item.name]]</a>
+          <template is="dom-if" if="[[item.entity_id]]">
+            <a href="#" on-click="entityClicked" class="name">[[item.name]]</a>
           </template>
           <span> </span>
           <span>[[item.message]]</span>
         </div>
       </div>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaLogbook extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-logbook'; }
 
   static get properties() {
@@ -89,4 +88,3 @@ class HaLogbook extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaLogbook.is, HaLogbook);
-</script>
diff --git a/panels/logbook/ha-panel-logbook.html b/panels/logbook/ha-panel-logbook.js
similarity index 68%
rename from panels/logbook/ha-panel-logbook.html
rename to panels/logbook/ha-panel-logbook.js
index 2bb9ab8d1a..cbfbfab52a 100644
--- a/panels/logbook/ha-panel-logbook.html
+++ b/panels/logbook/ha-panel-logbook.js
@@ -1,25 +1,26 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-spinner/paper-spinner.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import '@vaadin/vaadin-date-picker/vaadin-date-picker.js';
 
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../bower_components/paper-spinner/paper-spinner.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-date-picker-style.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/hass-mixins.js';
+import './ha-logbook-data.js';
+import './ha-logbook.js';
 
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-
-<link rel="import" href="../../bower_components/vaadin-date-picker/vaadin-date-picker.html">
-
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/resources/ha-style.html">
-<link rel="import" href="../../src/resources/ha-date-picker-style.html">
-<link rel='import' href='../../src/util/hass-mixins.html'>
-
-<link rel="import" href="./ha-logbook.html">
-<link rel="import" href="./ha-logbook-data.html">
-
-<dom-module id="ha-panel-logbook">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaPanelLogbook extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="ha-style">
     .content {
       padding: 0 16px 16px;
@@ -83,14 +84,8 @@
         <ha-logbook hass='[[hass]]' entries="[[entries]]" hidden$='[[isLoading]]'></ha-logbook>
       </div>
     </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaPanelLogbook extends window.hassMixins.LocalizeMixin(Polymer.Element) {
+    `;
+  }
   static get is() { return 'ha-panel-logbook'; }
 
   static get properties() {
@@ -136,14 +131,9 @@ class HaPanelLogbook extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   connectedCallback() {
     super.connectedCallback();
     // We are unable to parse date because we use intl api to render date
-    // So we just return last known date.
-    var lastFormatDate = new Date();
-    this.$.picker.set('i18n.parseDate', function () {
-      return lastFormatDate;
-    });
+    this.$.picker.set('i18n.parseDate', null);
     this.$.picker.set('i18n.formatDate', function (date) {
-      lastFormatDate = date;
-      return window.hassUtil.formatDate(date);
+      return window.hassUtil.formatDate(new Date(date.year, date.month, date.day));
     });
   }
 
@@ -160,4 +150,3 @@ class HaPanelLogbook extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(HaPanelLogbook.is, HaPanelLogbook);
-</script>
diff --git a/panels/mailbox/ha-panel-mailbox.html b/panels/mailbox/ha-panel-mailbox.js
similarity index 83%
rename from panels/mailbox/ha-panel-mailbox.html
rename to panels/mailbox/ha-panel-mailbox.js
index b2476a6870..aa40a3f89c 100644
--- a/panels/mailbox/ha-panel-mailbox.html
+++ b/panels/mailbox/ha-panel-mailbox.js
@@ -1,24 +1,25 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-dialog/paper-dialog.js';
+import '@polymer/paper-input/paper-textarea.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../bower_components/paper-button/paper-button.html'>
-<link rel='import' href='../../bower_components/paper-dialog/paper-dialog.html'>
-<link rel='import' href='../../bower_components/paper-input/paper-textarea.html'>
-<link rel='import' href='../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href='../../bower_components/paper-item/paper-item-body.html'>
-<link rel='import' href='../../bower_components/paper-card/paper-card.html'>
+import '../../src/components/ha-menu-button.js';
+import '../../src/resources/ha-style.js';
+import '../../src/util/hass-mixins.js';
 
-<link rel='import' href='../../bower_components/app-layout/app-header-layout/app-header-layout.html'>
-<link rel='import' href='../../bower_components/app-layout/app-header/app-header.html'>
-<link rel='import' href='../../bower_components/app-layout/app-toolbar/app-toolbar.html'>
-<link rel="import" href="../../bower_components/app-storage/app-localstorage/app-localstorage-document.html">
-
-<link rel='import' href='../../src/components/ha-menu-button.html'>
-<link rel='import' href='../../src/resources/ha-style.html'>
-<link rel='import' href='../../src/util/hass-mixins.html'>
-
-
-<dom-module id='ha-panel-mailbox'>
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaPanelMailbox extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include='ha-style'>
       :host {
         -ms-user-select: initial;
@@ -120,7 +121,7 @@
                 </div>
               </paper-item-body>
             </paper-item>
-    		  </template>
+          </template>
         </paper-card>
       </div>
     </app-header-layout>
@@ -135,7 +136,7 @@
       </h2>
       <div id="transcribe"></div>
       <div>
-        <audio id="mp3" preload="none" controls> <source id="mp3src" src="" type="audio/mpeg"></audio>
+        <audio id="mp3" preload="none" controls> <source id="mp3src" src="" type="audio/mpeg" /></audio>
       </div>
     </paper-dialog>
 
@@ -146,14 +147,8 @@
         <paper-button dialog-confirm autofocus on-click="deleteSelected">[[localize('ui.panel.mailbox.delete_button')]]</paper-button>
       </div>
     </paper-dialog>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaPanelMailbox extends window.hassMixins.LocalizeMixin(Polymer.Element) {
+    `;
+  }
   static get is() { return 'ha-panel-mailbox'; }
 
   static get properties() {
@@ -272,5 +267,3 @@ class HaPanelMailbox extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(HaPanelMailbox.is, HaPanelMailbox);
-
-</script>
diff --git a/panels/map/ha-entity-marker.html b/panels/map/ha-entity-marker.js
similarity index 67%
rename from panels/map/ha-entity-marker.html
rename to panels/map/ha-entity-marker.js
index ee3fb3df8d..9d448af04c 100644
--- a/panels/map/ha-entity-marker.html
+++ b/panels/map/ha-entity-marker.js
@@ -1,11 +1,13 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/iron-image/iron-image.html'>
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/iron-image/iron-image.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../../src/util/hass-mixins.js';
 
-<dom-module id='ha-entity-marker'>
-  <template>
+class HaEntityMarker extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-positioning"></style>
     <style>
     .marker {
@@ -28,17 +30,15 @@
     }
     </style>
 
-    <div class='marker'>
-      <template is='dom-if' if='[[entityName]]'>[[entityName]]</template>
-      <template is='dom-if' if='[[entityPicture]]'>
-        <iron-image sizing='cover' class='fit' src='[[entityPicture]]'></iron-image>
+    <div class="marker">
+      <template is="dom-if" if="[[entityName]]">[[entityName]]</template>
+      <template is="dom-if" if="[[entityPicture]]">
+        <iron-image sizing="cover" class="fit" src="[[entityPicture]]"></iron-image>
       </template>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaEntityMarker extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-entity-marker'; }
 
   static get properties() {
@@ -78,4 +78,3 @@ class HaEntityMarker extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaEntityMarker.is, HaEntityMarker);
-</script>
diff --git a/panels/map/ha-panel-map.html b/panels/map/ha-panel-map.js
similarity index 89%
rename from panels/map/ha-panel-map.html
rename to panels/map/ha-panel-map.js
index f27d5d4e31..1b7f9a02d8 100644
--- a/panels/map/ha-panel-map.html
+++ b/panels/map/ha-panel-map.js
@@ -1,15 +1,20 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<script src="../../bower_components/leaflet/dist/leaflet.js"></script>
+import '../../src/components/ha-menu-button.js';
+import '../../src/util/hass-mixins.js';
+import './ha-entity-marker.js';
 
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel='import' href='../../src/util/hass-mixins.html'>
-<link rel="import" href="./ha-entity-marker.html">
+window.L.Icon.Default.imagePath = '/static/images/leaflet';
 
-<dom-module id="ha-panel-map">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaPanelMap extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="ha-style">
       #map {
         height: calc(100% - 64px);
@@ -24,16 +29,8 @@
     </app-toolbar>
 
     <div id='map'></div>
-  </template>
-</dom-module>
-
-<script>
-window.L.Icon.Default.imagePath = '/static/images/leaflet';
-
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaPanelMap extends window.hassMixins.LocalizeMixin(Polymer.Element) {
+    `;
+  }
   static get is() { return 'ha-panel-map'; }
 
   static get properties() {
@@ -197,4 +194,3 @@ class HaPanelMap extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(HaPanelMap.is, HaPanelMap);
-</script>
diff --git a/panels/shopping-list/ha-panel-shopping-list.html b/panels/shopping-list/ha-panel-shopping-list.js
similarity index 78%
rename from panels/shopping-list/ha-panel-shopping-list.html
rename to panels/shopping-list/ha-panel-shopping-list.js
index 8409c3601a..cae4866c34 100644
--- a/panels/shopping-list/ha-panel-shopping-list.html
+++ b/panels/shopping-list/ha-panel-shopping-list.js
@@ -1,23 +1,28 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../bower_components/paper-item/paper-icon-item.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../bower_components/paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../bower_components/paper-menu-button/paper-menu-button.html">
-<link rel="import" href="../../bower_components/paper-listbox/paper-listbox.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item.html">
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-card/paper-card.js';
+import '@polymer/paper-checkbox/paper-checkbox.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-icon-item.js';
+import '@polymer/paper-item/paper-item-body.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import '@polymer/paper-menu-button/paper-menu-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
-<link rel="import" href="../../src/components/ha-menu-button.html">
-<link rel="import" href="../../src/components/ha-start-voice-button.html">
+import '../../src/components/ha-menu-button.js';
+import '../../src/components/ha-start-voice-button.js';
+import '../../src/util/hass-mixins.js';
 
-<dom-module id="ha-panel-shopping-list">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaPanelShoppingList extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="ha-style">
       :host {
         height: 100%;
@@ -128,14 +133,8 @@
         </div>
       </div>
     </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaPanelShoppingList extends window.hassMixins.LocalizeMixin(Polymer.Element) {
+    `;
+  }
   static get is() { return 'ha-panel-shopping-list'; }
 
   static get properties() {
@@ -217,4 +216,3 @@ class HaPanelShoppingList extends window.hassMixins.LocalizeMixin(Polymer.Elemen
 }
 
 customElements.define(HaPanelShoppingList.is, HaPanelShoppingList);
-</script>
diff --git a/polymer.json b/polymer.json
index f6339c29e7..f1dfc64b77 100644
--- a/polymer.json
+++ b/polymer.json
@@ -1,23 +1,22 @@
 {
   "entrypoint": "index.html",
-  "shell": "src/home-assistant.html",
+  "shell": "src/home-assistant.js",
   "fragments": [
-    "panels/config/ha-panel-config.html",
-    "panels/dev-event/ha-panel-dev-event.html",
-    "panels/dev-info/ha-panel-dev-info.html",
-    "panels/dev-mqtt/ha-panel-dev-mqtt.html",
-    "panels/dev-service/ha-panel-dev-service.html",
-    "panels/dev-state/ha-panel-dev-state.html",
-    "panels/dev-template/ha-panel-dev-template.html",
-    "panels/hassio/ha-panel-hassio.html",
-    "panels/history/ha-panel-history.html",
-    "panels/iframe/ha-panel-iframe.html",
-    "panels/kiosk/ha-panel-kiosk.html",
-    "panels/logbook/ha-panel-logbook.html",
-    "panels/map/ha-panel-map.html",
-    "panels/shopping-list/ha-panel-shopping-list.html",
-    "panels/mailbox/ha-panel-mailbox.html",
-    "src/resources/ha-chart-scripts.html"
+    "panels/config/ha-panel-config.js",
+    "panels/dev-event/ha-panel-dev-event.js",
+    "panels/dev-info/ha-panel-dev-info.js",
+    "panels/dev-mqtt/ha-panel-dev-mqtt.js",
+    "panels/dev-service/ha-panel-dev-service.js",
+    "panels/dev-state/ha-panel-dev-state.js",
+    "panels/dev-template/ha-panel-dev-template.js",
+    "panels/hassio/ha-panel-hassio.js",
+    "panels/history/ha-panel-history.js",
+    "panels/iframe/ha-panel-iframe.js",
+    "panels/kiosk/ha-panel-kiosk.js",
+    "panels/logbook/ha-panel-logbook.js",
+    "panels/map/ha-panel-map.js",
+    "panels/shopping-list/ha-panel-shopping-list.js",
+    "panels/mailbox/ha-panel-mailbox.js"
   ],
   "sources": [
     "src/**/*",
@@ -25,7 +24,13 @@
     "!src/translations/*"
   ],
   "lint": {
-    "rules": ["polymer-2"]
+    "rules": ["polymer-3"],
+    "filesToIgnore": [
+      "**/*.html",
+      "**/ha-paper-slider.js",
+      "**/hass-mixins.js",
+      "**/ha-iconset-svg.js"
+    ]
   },
   "builds": [
     {
diff --git a/script/build_frontend b/script/build_frontend
index 33b92b59ed..5c65ab999c 100755
--- a/script/build_frontend
+++ b/script/build_frontend
@@ -16,45 +16,33 @@ cp -r public/__init__.py $OUTPUT_DIR_ES5/
 
 # Build frontend
 BUILD_DEV=0 ./node_modules/.bin/gulp
+NODE_ENV=production webpack -p
 BUILD_DEV=0 ./node_modules/.bin/gulp authorize authorize-es5
 
-# Entry points
-cp build/*.js build/*.html $OUTPUT_DIR
-cp build-es5/*.js build-es5/*.html $OUTPUT_DIR_ES5
-
-# Panels
-mkdir $OUTPUT_DIR/panels
-cp build/panels/*.html $OUTPUT_DIR/panels
-mkdir $OUTPUT_DIR_ES5/panels
-cp build-es5/panels/*.html $OUTPUT_DIR_ES5/panels
-
-# Chart code
-cp build/src/resources/ha-chart-scripts.html $OUTPUT_DIR
-cp build-es5/src/resources/ha-chart-scripts.html $OUTPUT_DIR_ES5
+# Copy frontend to output
+cp build/core.js $OUTPUT_DIR
+cp build/webpack/* $OUTPUT_DIR
+cp build-es5/core.js $OUTPUT_DIR_ES5
+cp build-es5/webpack/* $OUTPUT_DIR_ES5
+cp build-es5/compatibility.js $OUTPUT_DIR_ES5
 
 # Translations
 cp -r build-translations/output $OUTPUT_DIR/translations
 
 # Local Roboto
-cp -r bower_components/font-roboto-local/fonts $OUTPUT_DIR
+cp -r node_modules/@polymer/font-roboto-local/fonts $OUTPUT_DIR
 
 # Polyfill web components
-cp bower_components/webcomponentsjs/webcomponents-lite.js $OUTPUT_DIR
-cp bower_components/webcomponentsjs/custom-elements-es5-adapter.js $OUTPUT_DIR_ES5
+cp node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js $OUTPUT_DIR
+cp node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js $OUTPUT_DIR_ES5
 
 # Icons
 script/update_mdi.py
 
 # Leaflet
 mkdir $OUTPUT_DIR/images/leaflet
-cp bower_components/leaflet/dist/leaflet.css $OUTPUT_DIR/images/leaflet
-cp -r bower_components/leaflet/dist/images $OUTPUT_DIR/images/leaflet/
-
-# Generate service worker
-BUILD_DEV=0 ./node_modules/.bin/gulp gen-service-worker-es5
-cp build-es5/service_worker.js $OUTPUT_DIR_ES5
-BUILD_DEV=0 ./node_modules/.bin/gulp gen-service-worker
-cp build/service_worker.js $OUTPUT_DIR
+cp node_modules/leaflet/dist/leaflet.css $OUTPUT_DIR/images/leaflet
+cp -r node_modules/leaflet/dist/images $OUTPUT_DIR/images/leaflet/
 
 ./node_modules/.bin/gulp compress
 
@@ -65,7 +53,5 @@ echo "VERSION = '`git rev-parse HEAD`'" >> $OUTPUT_DIR_ES5/__init__.py
 echo "CREATED_AT = `date +%s`" >> $OUTPUT_DIR_ES5/__init__.py
 
 # Generate the MD5 hash of the new frontend
-script/fingerprint_frontend.py --base_dir $OUTPUT_DIR
-script/fingerprint_frontend.py --base_dir $OUTPUT_DIR_ES5
 ./node_modules/.bin/gulp gen-index-html
 ./node_modules/.bin/gulp gen-index-html-es5
diff --git a/script/build_markdown b/script/build_markdown
deleted file mode 100755
index ac4f6de7a1..0000000000
--- a/script/build_markdown
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# Set XSS_VERSION or MARKED_VERSION to set package versions. If unset, the latest version will be used.
-
-# Stop on errors
-set -e
-
-cd "$(dirname "$0")/.."
-
-output="public/markdown-js.html"
-
-echo "<script>" > $output
-
-pkgs="xss:dist/xss.min.js marked:marked.min.js"
-
-for pkg in $pkgs; do
-    name="$(cut -d':' -f1 <<< "$pkg")"
-    js_path="$(cut -d':' -f2 <<< "$pkg")"
-
-    # Check env variable for version
-    version=$(eval "echo \$$(echo $name | tr "a-z" "A-Z")_VERSION")
-    if [ -z "$version" ]; then
-        version=$(yarn -s info $name dist-tags.latest)
-    fi
-
-    homepage=$(yarn -s info "$name@$version" homepage)
-    license=$(yarn -s info "$name@$version" license)
-    tarball=$(yarn -s info "$name@$version" dist.tarball)
-
-    cat >>$output <<EOF
-/*
-* $name@$version ($license)
-* $homepage
-*/
-EOF
-    echo "Downloading $name@$version"
-    curl -s "$tarball" | tar -xzO "package/$js_path" | ./node_modules/.bin/uglifyjs -c -m >> $output
-done
-
-echo "</script>" >> $output
-
-size=$(wc -c < $output)
-gzip_size=$(cat $output | gzip | wc -c)
-
-echo "$size bytes ($gzip_size bytes gzipped) written to $output"
diff --git a/script/fingerprint_frontend.py b/script/fingerprint_frontend.py
deleted file mode 100755
index 0ae9dee9f5..0000000000
--- a/script/fingerprint_frontend.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python3
-"""Generate a file with all md5 hashes of the assets."""
-
-from collections import OrderedDict
-import glob
-import hashlib
-import json
-import argparse
-from os import path
-import re
-
-parser = argparse.ArgumentParser(description='Generate fingerprints of frontend files.')
-parser.add_argument('--base_dir', type=str, help='Base dir to look for files.', default='hass_frontend')
-args = parser.parse_args()
-base_dir = args.base_dir + '/'
-fingerprint_file = path.join(base_dir, '__init__.py')
-panel_match = re.compile(r'ha-panel-((\w|-)+)\.html')
-
-
-def fingerprint():
-    """Fingerprint the panels."""
-    files = glob.glob(base_dir + 'panels/*.html')
-    md5s = OrderedDict()
-
-    for fil in sorted(files):
-        panel = panel_match.search(fil).groups(0)[0]
-        with open(fil) as fp:
-            md5 = hashlib.md5(fp.read().encode('utf-8')).hexdigest()
-        md5s[panel] = md5
-
-    template = "FINGERPRINTS = {}\n"
-    result = template.format(json.dumps(md5s, indent=4))
-
-    with open(fingerprint_file, 'at') as fp:
-        fp.write(result)
-
-
-if __name__ == '__main__':
-    fingerprint()
diff --git a/script/update_mdi.py b/script/update_mdi.py
index ae9225773a..fbadc437d8 100755
--- a/script/update_mdi.py
+++ b/script/update_mdi.py
@@ -34,7 +34,7 @@ def get_remote_version():
 
 def clean_component(source):
     """Clean component."""
-    return source[source.index(START_ICONSET):]
+    return source[source.index(START_ICONSET):].replace('iron-iconset-svg', 'ha-iconset-svg')
 
 
 def write_component(source):
diff --git a/src/auth/ha-auth-flow.html b/src/auth/ha-auth-flow.js
similarity index 74%
rename from src/auth/ha-auth-flow.html
rename to src/auth/ha-auth-flow.js
index 5ab9ecf8db..fd2bf549a5 100644
--- a/src/auth/ha-auth-flow.html
+++ b/src/auth/ha-auth-flow.js
@@ -1,41 +1,36 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href='../../bower_components/paper-button/paper-button.html'>
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import '@polymer/paper-button/paper-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import '../components/ha-form.js';
+import '../util/hass-mixins.js';
 
-<link rel='import' href='../components/ha-form.html'>
-<link rel='import' href='../util/hass-mixins.html'>
-
-<dom-module id='ha-auth-flow'>
-  <template>
-    <template is='dom-if' if='[[_equals(_state, "loading")]]'>
-      Please wait
-    </template>
-    <template is='dom-if' if='[[_equals(_state, "error")]]'>
-      Something went wrong
-    </template>
-    <template is='dom-if' if='[[_equals(_state, "step")]]'>
-      <template is='dom-if' if='[[_equals(_step.type, "abort")]]'>
-        Aborted
-      </template>
-      <template is='dom-if' if='[[_equals(_step.type, "create_entry")]]'>
-        Success!
-      </template>
-      <template is='dom-if' if='[[_equals(_step.type, "form")]]'>
-        <ha-form
-          data='{{_stepData}}'
-          schema='[[_step.data_schema]]'
-          error='[[_step.errors]]'
-        ></ha-form>
-      </template>
-      <paper-button on-click='_handleSubmit'>[[_computeSubmitCaption(_step.type)]]</paper-button>
-    </template>
-  </template>
-</dom-module>
-
-<script>
 /*
  * @appliesMixin window.hassMixins.EventsMixin
  */
-class HaAuthFlow extends window.hassMixins.EventsMixin(Polymer.Element) {
+class HaAuthFlow extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <template is="dom-if" if="[[_equals(_state, &quot;loading&quot;)]]">
+      Please wait
+    </template>
+    <template is="dom-if" if="[[_equals(_state, &quot;error&quot;)]]">
+      Something went wrong
+    </template>
+    <template is="dom-if" if="[[_equals(_state, &quot;step&quot;)]]">
+      <template is="dom-if" if="[[_equals(_step.type, &quot;abort&quot;)]]">
+        Aborted
+      </template>
+      <template is="dom-if" if="[[_equals(_step.type, &quot;create_entry&quot;)]]">
+        Success!
+      </template>
+      <template is="dom-if" if="[[_equals(_step.type, &quot;form&quot;)]]">
+        <ha-form data="{{_stepData}}" schema="[[_step.data_schema]]" error="[[_step.errors]]"></ha-form>
+      </template>
+      <paper-button on-click="_handleSubmit">[[_computeSubmitCaption(_step.type)]]</paper-button>
+    </template>
+`;
+  }
+
   static get is() { return 'ha-auth-flow'; }
   static get properties() {
     return {
@@ -140,4 +135,3 @@ class HaAuthFlow extends window.hassMixins.EventsMixin(Polymer.Element) {
   }
 }
 customElements.define(HaAuthFlow.is, HaAuthFlow);
-</script>
diff --git a/src/auth/ha-authorize.html b/src/auth/ha-authorize.js
similarity index 51%
rename from src/auth/ha-authorize.html
rename to src/auth/ha-authorize.js
index 0576bd1ac2..e583589ca9 100644
--- a/src/auth/ha-authorize.html
+++ b/src/auth/ha-authorize.js
@@ -1,13 +1,15 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/polymer/lib/elements/dom-if.html'>
-<link rel='import' href='../../bower_components/polymer/lib/elements/dom-repeat.html'>
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/polymer/lib/elements/dom-if.js';
+import '@polymer/polymer/lib/elements/dom-repeat.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='./ha-pick-auth-provider.html'>
-<link rel='import' href='./ha-auth-flow.html'>
+import './ha-auth-flow.js';
+import './ha-pick-auth-provider.js';
 
-<dom-module id='ha-authorize'>
-  <template>
+class HaAuthorize extends PolymerElement {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-positioning"></style>
     <style>
       .layout {
@@ -15,31 +17,18 @@
       }
     </style>
     <div class="layout vertical center fit">
-      <img src="/static/icons/favicon-192x192.png" height="192" />
+      <img src="/static/icons/favicon-192x192.png" height="192">
 
-      <template is='dom-if' if='[[_authProvider]]'>
-        <ha-auth-flow
-          client-id='[[clientId]]'
-          client-secret='[[clientSecret]]'
-          redirect-uri='[[redirectUri]]'
-          oauth2-state='[[oauth2State]]'
-          auth-provider='[[_authProvider]]'
-          on-reset='_handleReset'
-        />
-      </template>
-      <template is='dom-if' if='[[!_authProvider]]'>
-        <ha-pick-auth-provider
-          client-id='[[clientId]]'
-          client-secret='[[clientSecret]]'
-          on-pick='_handleAuthProviderPick'
-        ></ha-pick-auth-provider>
+      <template is="dom-if" if="[[_authProvider]]">
+        <ha-auth-flow client-id="[[clientId]]" client-secret="[[clientSecret]]" redirect-uri="[[redirectUri]]" oauth2-state="[[oauth2State]]" auth-provider="[[_authProvider]]" on-reset="_handleReset">
+      </ha-auth-flow></template>
+      <template is="dom-if" if="[[!_authProvider]]">
+        <ha-pick-auth-provider client-id="[[clientId]]" client-secret="[[clientSecret]]" on-pick="_handleAuthProviderPick"></ha-pick-auth-provider>
       </template>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaAuthorize extends Polymer.Element {
   static get is() { return 'ha-authorize'; }
   static get properties() {
     return {
@@ -78,4 +67,3 @@ class HaAuthorize extends Polymer.Element {
   }
 }
 customElements.define(HaAuthorize.is, HaAuthorize);
-</script>
diff --git a/src/auth/ha-pick-auth-provider.html b/src/auth/ha-pick-auth-provider.js
similarity index 69%
rename from src/auth/ha-pick-auth-provider.html
rename to src/auth/ha-pick-auth-provider.js
index c60a795b71..a805896d82 100644
--- a/src/auth/ha-pick-auth-provider.html
+++ b/src/auth/ha-pick-auth-provider.js
@@ -1,10 +1,15 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/paper-item/paper-item.html'>
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../util/hass-mixins.html'>
+import '../util/hass-mixins.js';
 
-<dom-module id='ha-pick-auth-provider'>
-  <template>
+/*
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaPickAuthProvider extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       :host {
         text-align: center;
@@ -14,29 +19,24 @@
         cursor: pointer;
       }
     </style>
-    <template is='dom-if' if='[[_equal(_state, "loading")]]'>
+    <template is="dom-if" if="[[_equal(_state, &quot;loading&quot;)]]">
       Loading auth providers.
     </template>
-    <template is='dom-if' if='[[_equal(_state, "no-results")]]'>
+    <template is="dom-if" if="[[_equal(_state, &quot;no-results&quot;)]]">
       No auth providers found.
     </template>
-    <template is='dom-if' if='[[_equal(_state, "error-loading")]]'>
+    <template is="dom-if" if="[[_equal(_state, &quot;error-loading&quot;)]]">
       Error loading
     </template>
-    <template is='dom-if' if='[[_equal(_state, "pick")]]'>
+    <template is="dom-if" if="[[_equal(_state, &quot;pick&quot;)]]">
       <p>Log in with</p>
-      <template is='dom-repeat' items='[[authProviders]]'>
-        <paper-item on-click='_handlePick'>[[item.name]]</paper-item>
+      <template is="dom-repeat" items="[[authProviders]]">
+        <paper-item on-click="_handlePick">[[item.name]]</paper-item>
       </template>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaPickAuthProvider extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-pick-auth-provider'; }
   static get properties() {
     return {
@@ -83,4 +83,3 @@ class HaPickAuthProvider extends window.hassMixins.EventsMixin(Polymer.Element)
   }
 }
 customElements.define(HaPickAuthProvider.is, HaPickAuthProvider);
-</script>
diff --git a/src/authorize.html b/src/authorize.html
index 0517a8d3d1..fca9fd3b14 100644
--- a/src/authorize.html
+++ b/src/authorize.html
@@ -8,19 +8,19 @@
   <body>
     <ha-authorize>Loading</ha-authorize>
     <script>
-        function addScript(src) {
-          var e = document.createElement('script');
-          e.src = src;
-          document.head.appendChild(e);
-        }
-        var webComponentsSupported = (
-          'customElements' in window &&
-          'import' in document.createElement('link') &&
-          'content' in document.createElement('template'));
-        if (!webComponentsSupported) {
-          addScript('/static/webcomponents-lite.js');
-        }
+    function addScript(src) {
+      var e = document.createElement('script');
+      e.src = src;
+      document.head.appendChild(e);
+    }
+    var webComponentsSupported = (
+      'customElements' in window &&
+      'import' in document.createElement('link') &&
+      'content' in document.createElement('template'));
+    if (!webComponentsSupported) {
+      addScript('/static/webcomponents-lite.js');
+    }
     </script>
-    <link rel='import' href='./auth/ha-authorize.html'>
+    <script src="/home-assistant-polymer/build/webpack/ha-authorize.js"></script>
   </body>
 </html>
diff --git a/src/cards/ha-badges-card.html b/src/cards/ha-badges-card.html
deleted file mode 100644
index e9d1276bf8..0000000000
--- a/src/cards/ha-badges-card.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-
-<link rel='import' href='../components/entity/ha-state-label-badge.html'>
-
-<dom-module id='ha-badges-card'>
-  <template>
-    <style>
-      ha-state-label-badge {
-        display: inline-block;
-        margin-bottom: var(--ha-state-label-badge-margin-bottom, 16px);
-      }
-    </style>
-    <template is='dom-repeat' items='[[states]]'>
-      <ha-state-label-badge hass='[[hass]]' state='[[item]]'></ha-state-label-badge>
-    </template>
-  </template>
-</dom-module>
-
-<script>
-class HaBadgesCard extends Polymer.Element {
-  static get is() { return 'ha-badges-card'; }
-  static get properties() {
-    return {
-      hass: Object,
-      states: Array,
-    };
-  }
-}
-customElements.define(HaBadgesCard.is, HaBadgesCard);
-</script>
diff --git a/src/cards/ha-badges-card.js b/src/cards/ha-badges-card.js
new file mode 100644
index 0000000000..e3a046683b
--- /dev/null
+++ b/src/cards/ha-badges-card.js
@@ -0,0 +1,29 @@
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../components/entity/ha-state-label-badge.js';
+
+class HaBadgesCard extends PolymerElement {
+  static get template() {
+    return html`
+    <style>
+      ha-state-label-badge {
+        display: inline-block;
+        margin-bottom: var(--ha-state-label-badge-margin-bottom, 16px);
+      }
+    </style>
+    <template is="dom-repeat" items="[[states]]">
+      <ha-state-label-badge hass="[[hass]]" state="[[item]]"></ha-state-label-badge>
+    </template>
+`;
+  }
+
+  static get is() { return 'ha-badges-card'; }
+  static get properties() {
+    return {
+      hass: Object,
+      states: Array,
+    };
+  }
+}
+customElements.define(HaBadgesCard.is, HaBadgesCard);
diff --git a/src/cards/ha-camera-card.html b/src/cards/ha-camera-card.js
similarity index 76%
rename from src/cards/ha-camera-card.html
rename to src/cards/ha-camera-card.js
index b642cb3a92..9fd1ec5c8b 100644
--- a/src/cards/ha-camera-card.html
+++ b/src/cards/ha-camera-card.js
@@ -1,12 +1,22 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../bower_components/paper-material/paper-material.html">
+import '@polymer/paper-styles/element-styles/paper-material-styles.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../util/hass-mixins.html'>
+import '../util/hass-mixins.js';
 
-<dom-module id='ha-camera-card'>
-  <template>
-    <style include="paper-material">
+{
+  const UPDATE_INTERVAL = 10000; // ms
+  /*
+   * @appliesMixin window.hassMixins.LocalizeMixin
+   * @appliesMixin window.hassMixins.EventsMixin
+   */
+  class HaCameraCard extends
+    window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+    static get template() {
+      return html`
+    <style include="paper-material-styles">
       :host {
+        @apply --paper-material-elevation-1;
         display: block;
         position: relative;
         font-size: 0px;
@@ -39,29 +49,16 @@
       }
     </style>
 
-    <img
-      src='[[cameraFeedSrc]]'
-      class='camera-feed'
-      hidden$='[[!imageLoaded]]'
-      alt='[[computeStateName(stateObj)]]'>
-    <div class='caption'>
+    <img src="[[cameraFeedSrc]]" class="camera-feed" hidden\$="[[!imageLoaded]]" alt="[[computeStateName(stateObj)]]">
+    <div class="caption">
       [[computeStateName(stateObj)]]
-      <template is='dom-if' if='[[!imageLoaded]]'>
+      <template is="dom-if" if="[[!imageLoaded]]">
         ([[localize('ui.card.camera.not_available')]])
       </template>
     </div>
-  </template>
-</dom-module>
+`;
+    }
 
-<script>
-{
-  const UPDATE_INTERVAL = 10000; // ms
-  /*
-   * @appliesMixin window.hassMixins.LocalizeMixin
-   * @appliesMixin window.hassMixins.EventsMixin
-   */
-  class HaCameraCard extends
-    window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
     static get is() { return 'ha-camera-card'; }
     static get properties() {
       return {
@@ -75,14 +72,6 @@
           type: Boolean,
           value: true,
         },
-        /**
-         * The z-depth of the card, from 0-5.
-         */
-        elevation: {
-          type: Number,
-          value: 1,
-          reflectToAttribute: true,
-        },
       };
     }
 
@@ -127,4 +116,3 @@
   }
   customElements.define(HaCameraCard.is, HaCameraCard);
 }
-</script>
diff --git a/src/cards/ha-card-chooser.html b/src/cards/ha-card-chooser.js
similarity index 79%
rename from src/cards/ha-card-chooser.html
rename to src/cards/ha-card-chooser.js
index 19a0305f41..fee29c15f9 100644
--- a/src/cards/ha-card-chooser.html
+++ b/src/cards/ha-card-chooser.js
@@ -1,15 +1,14 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='./ha-camera-card.html'>
-<link rel='import' href='./ha-entities-card.html'>
-<link rel='import' href='./ha-history_graph-card.html'>
-<link rel='import' href='./ha-media_player-card.html'>
-<link rel='import' href='./ha-weather-card.html'>
-<link rel='import' href='./ha-persistent_notification-card.html'>
-<link rel='import' href='./ha-plant-card.html'>
+import './ha-camera-card.js';
+import './ha-entities-card.js';
+import './ha-history_graph-card.js';
+import './ha-media_player-card.js';
+import './ha-persistent_notification-card.js';
+import './ha-plant-card.js';
+import './ha-weather-card.js';
 
-<script>
-class HaCardChooser extends Polymer.Element {
+class HaCardChooser extends PolymerElement {
   static get is() { return 'ha-card-chooser'; }
   static get properties() {
     return {
@@ -78,4 +77,3 @@ class HaCardChooser extends Polymer.Element {
   }
 }
 customElements.define(HaCardChooser.is, HaCardChooser);
-</script>
diff --git a/src/cards/ha-entities-card.html b/src/cards/ha-entities-card.js
similarity index 72%
rename from src/cards/ha-entities-card.html
rename to src/cards/ha-entities-card.js
index 1d9328d98a..fd1561dab1 100644
--- a/src/cards/ha-entities-card.html
+++ b/src/cards/ha-entities-card.js
@@ -1,14 +1,16 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../components/entity/ha-entity-toggle.js';
+import '../components/ha-card.js';
+import '../state-summary/state-card-content.js';
+import '../util/hass-mixins.js';
 
-<link rel='import' href='../components/ha-card.html'>
-<link rel='import' href='../components/entity/ha-entity-toggle.html'>
-<link rel='import' href='../state-summary/state-card-content.html'>
-<link rel='import' href='../util/hass-mixins.html'>
-
-<dom-module id='ha-entities-card'>
-  <template>
+class HaEntitiesCard extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex"></style>
     <style>
       ha-card {
@@ -37,33 +39,25 @@
     </style>
 
     <ha-card>
-      <template is='dom-if' if='[[title]]'>
-        <div class$='[[computeTitleClass(groupEntity)]]' on-click='entityTapped'>
-          <div class='flex name'>[[title]]</div>
-          <template is='dom-if' if='[[showGroupToggle(groupEntity, states)]]'>
-            <ha-entity-toggle
-              hass='[[hass]]'
-              state-obj='[[groupEntity]]'></ha-entity-toggle>
+      <template is="dom-if" if="[[title]]">
+        <div class\$="[[computeTitleClass(groupEntity)]]" on-click="entityTapped">
+          <div class="flex name">[[title]]</div>
+          <template is="dom-if" if="[[showGroupToggle(groupEntity, states)]]">
+            <ha-entity-toggle hass="[[hass]]" state-obj="[[groupEntity]]"></ha-entity-toggle>
           </template>
         </div>
       </template>
-      <div class='states'>
-        <template is='dom-repeat' items='[[states]]' on-dom-change='addTapEvents'>
-          <div class$='[[computeStateClass(item)]]'>
-            <state-card-content
-              hass='[[hass]]'
-              class='state-card'
-              state-obj='[[item]]'></state-card-content>
+      <div class="states">
+        <template is="dom-repeat" items="[[states]]" on-dom-change="addTapEvents">
+          <div class\$="[[computeStateClass(item)]]">
+            <state-card-content hass="[[hass]]" class="state-card" state-obj="[[item]]"></state-card-content>
           </div>
         </template>
       </div>
     </ha-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaEntitiesCard extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
   static get is() { return 'ha-entities-card'; }
   static get properties() {
     return {
@@ -155,4 +149,3 @@ class HaEntitiesCard extends
   }
 }
 customElements.define(HaEntitiesCard.is, HaEntitiesCard);
-</script>
diff --git a/src/cards/ha-history_graph-card.html b/src/cards/ha-history_graph-card.js
similarity index 68%
rename from src/cards/ha-history_graph-card.html
rename to src/cards/ha-history_graph-card.js
index e16f2cdfa8..10859fcd59 100644
--- a/src/cards/ha-history_graph-card.html
+++ b/src/cards/ha-history_graph-card.js
@@ -1,12 +1,14 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../bower_components/paper-card/paper-card.html">
+import '@polymer/paper-card/paper-card.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../components/state-history-charts.html">
-<link rel="import" href="../data/ha-state-history-data.html">
-<link rel='import' href='../util/hass-mixins.html'>
+import '../components/state-history-charts.js';
+import '../data/ha-state-history-data.js';
+import '../util/hass-mixins.js';
 
-<dom-module id='ha-history_graph-card'>
-  <template>
+class HaHistoryGraphCard extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       paper-card:not([dialog]) .content {
         padding: 0 16px 16px;
@@ -31,32 +33,17 @@
         display: none;
       }
     </style>
-    <ha-state-history-data
-      hass='[[hass]]'
-      filter-type='recent-entity'
-      entity-id='[[computeHistoryEntities(stateObj)]]'
-      data='{{stateHistory}}'
-      is-loading='{{stateHistoryLoading}}'
-      cache-config='[[cacheConfig]]'
-    ></ha-state-history-data>
-    <paper-card dialog$='[[inDialog]]'
-        on-click='cardTapped'
-        elevation='[[computeElevation(inDialog)]]'>
-      <div class='header'>[[computeTitle(stateObj)]]</div>
-      <div class='content'>
-         <state-history-charts
-           history-data="[[stateHistory]]"
-           is-loading-data="[[stateHistoryLoading]]"
-           up-to-now
-           no-single>
+    <ha-state-history-data hass="[[hass]]" filter-type="recent-entity" entity-id="[[computeHistoryEntities(stateObj)]]" data="{{stateHistory}}" is-loading="{{stateHistoryLoading}}" cache-config="[[cacheConfig]]"></ha-state-history-data>
+    <paper-card dialog\$="[[inDialog]]" on-click="cardTapped" elevation="[[computeElevation(inDialog)]]">
+      <div class="header">[[computeTitle(stateObj)]]</div>
+      <div class="content">
+         <state-history-charts history-data="[[stateHistory]]" is-loading-data="[[stateHistoryLoading]]" up-to-now="" no-single="">
          </state-history-charts>
       </div>
     </paper-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaHistoryGraphCard extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-history_graph-card'; }
   static get properties() {
     return {
@@ -120,4 +107,3 @@ class HaHistoryGraphCard extends window.hassMixins.EventsMixin(Polymer.Element)
   }
 }
 customElements.define(HaHistoryGraphCard.is, HaHistoryGraphCard);
-</script>
diff --git a/src/cards/ha-media_player-card.html b/src/cards/ha-media_player-card.js
similarity index 73%
rename from src/cards/ha-media_player-card.html
rename to src/cards/ha-media_player-card.js
index 4e22c0f2ec..6c50797aa6 100644
--- a/src/cards/ha-media_player-card.html
+++ b/src/cards/ha-media_player-card.js
@@ -1,18 +1,24 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-progress/paper-progress.js';
+import '@polymer/paper-styles/element-styles/paper-material-styles.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../util/hass-media-player-model.js';
+import '../util/hass-mixins.js';
 
-<link rel="import" href="../../bower_components/paper-material/paper-material.html">
-<link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
-<link rel='import' href='../../bower_components/paper-progress/paper-progress.html'>
-
-<link rel='import' href='../util/hass-media-player-model.html'>
-<link rel='import' href='../util/hass-mixins.html'>
-
-<dom-module id='ha-media_player-card'>
-  <template>
-    <style include="paper-material iron-flex iron-flex-alignment iron-positioning">
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaMediaPlayerCard extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
+    <style include="paper-material-styles iron-flex iron-flex-alignment iron-positioning">
       :host {
+        @apply --paper-material-elevation-1;
         display: block;
         position: relative;
         font-size: 0px;
@@ -148,70 +154,33 @@
       }
     </style>
 
-    <div class$='[[computeBannerClasses(playerObj)]]'>
-      <div class='cover' id='cover'></div>
+    <div class\$="[[computeBannerClasses(playerObj)]]">
+      <div class="cover" id="cover"></div>
 
-      <div class='caption'>
+      <div class="caption">
         [[computeStateName(stateObj)]]
-        <div class='title'>[[computePrimaryText(localize, playerObj)]]</div>
-        [[playerObj.secondaryTitle]]<br />
+        <div class="title">[[computePrimaryText(localize, playerObj)]]</div>
+        [[playerObj.secondaryTitle]]<br>
       </div>
     </div>
 
-    <paper-progress
-      max='[[stateObj.attributes.media_duration]]'
-      value='[[playbackPosition]]'
-      hidden$='[[computeHideProgress(playerObj)]]'
-      class='progress'
-    ></paper-progress>
+    <paper-progress max="[[stateObj.attributes.media_duration]]" value="[[playbackPosition]]" hidden\$="[[computeHideProgress(playerObj)]]" class="progress"></paper-progress>
 
-    <div class='controls layout horizontal justified'>
-      <paper-icon-button
-        icon='mdi:power'
-        on-click='handleTogglePower'
-        invisible$='[[computeHidePowerButton(playerObj)]]'
-        class='self-center secondary'
-      ></paper-icon-button>
+    <div class="controls layout horizontal justified">
+      <paper-icon-button icon="mdi:power" on-click="handleTogglePower" invisible\$="[[computeHidePowerButton(playerObj)]]" class="self-center secondary"></paper-icon-button>
 
       <div>
-        <paper-icon-button
-          icon='mdi:skip-previous'
-          invisible$='[[!playerObj.supportsPreviousTrack]]'
-          disabled='[[playerObj.isOff]]'
-          on-click='handlePrevious'
-        ></paper-icon-button>
-        <paper-icon-button
-          class='primary'
-          icon='[[computePlaybackControlIcon(playerObj)]]'
-          invisible$='[[!computePlaybackControlIcon(playerObj)]]'
-          disabled='[[playerObj.isOff]]'
-          on-click='handlePlaybackControl'
-        ></paper-icon-button>
-        <paper-icon-button
-          icon='mdi:skip-next'
-          invisible$='[[!playerObj.supportsNextTrack]]'
-          disabled='[[playerObj.isOff]]'
-          on-click='handleNext'
-        ></paper-icon-button>
+        <paper-icon-button icon="mdi:skip-previous" invisible\$="[[!playerObj.supportsPreviousTrack]]" disabled="[[playerObj.isOff]]" on-click="handlePrevious"></paper-icon-button>
+        <paper-icon-button class="primary" icon="[[computePlaybackControlIcon(playerObj)]]" invisible\$="[[!computePlaybackControlIcon(playerObj)]]" disabled="[[playerObj.isOff]]" on-click="handlePlaybackControl"></paper-icon-button>
+        <paper-icon-button icon="mdi:skip-next" invisible\$="[[!playerObj.supportsNextTrack]]" disabled="[[playerObj.isOff]]" on-click="handleNext"></paper-icon-button>
       </div>
 
-      <paper-icon-button
-        icon='mdi:dots-vertical'
-        on-click='handleOpenMoreInfo'
-        class='self-center secondary'
-      ></paper-icon-button>
+      <paper-icon-button icon="mdi:dots-vertical" on-click="handleOpenMoreInfo" class="self-center secondary"></paper-icon-button>
 
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaMediaPlayerCard extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
   static get is() { return 'ha-media_player-card'; }
   static get properties() {
     return {
@@ -227,14 +196,6 @@ class HaMediaPlayerCard extends
         computed: 'computePlaybackControlIcon(playerObj)',
       },
       playbackPosition: Number,
-      /**
-       * The z-depth of the card, from 0-5.
-       */
-      elevation: {
-        type: Number,
-        value: 1,
-        reflectToAttribute: true,
-      },
     };
   }
 
@@ -347,4 +308,3 @@ class HaMediaPlayerCard extends
   }
 }
 customElements.define(HaMediaPlayerCard.is, HaMediaPlayerCard);
-</script>
diff --git a/src/cards/ha-persistent_notification-card.html b/src/cards/ha-persistent_notification-card.js
similarity index 66%
rename from src/cards/ha-persistent_notification-card.html
rename to src/cards/ha-persistent_notification-card.js
index 75070611ae..d2836fe44d 100644
--- a/src/cards/ha-persistent_notification-card.html
+++ b/src/cards/ha-persistent_notification-card.js
@@ -1,13 +1,17 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/paper-button/paper-button.html'>
+import '@polymer/paper-button/paper-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../components/ha-card.html'>
-<link rel='import' href='../components/ha-markdown.html'>
+import '../components/ha-card.js';
+import '../components/ha-markdown.js';
+import '../util/hass-mixins.js';
 
-<link rel='import' href='../util/hass-mixins.html'>
-
-<dom-module id='ha-persistent_notification-card'>
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaPersistentNotificationCard extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       :host {
         @apply --paper-font-body1;
@@ -37,18 +41,13 @@
       }
     </style>
 
-    <ha-card header='[[computeTitle(stateObj)]]'>
-      <ha-markdown content='[[stateObj.attributes.message]]'></ha-markdown>
-      <paper-button on-click='dismissTap'>[[localize('ui.card.persistent_notification.dismiss')]]</paper-button>
+    <ha-card header="[[computeTitle(stateObj)]]">
+      <ha-markdown content="[[stateObj.attributes.message]]"></ha-markdown>
+      <paper-button on-click="dismissTap">[[localize('ui.card.persistent_notification.dismiss')]]</paper-button>
     </ha-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaPersistentNotificationCard extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'ha-persistent_notification-card'; }
   static get properties() {
     return {
@@ -68,4 +67,3 @@ class HaPersistentNotificationCard extends window.hassMixins.LocalizeMixin(Polym
   }
 }
 customElements.define(HaPersistentNotificationCard.is, HaPersistentNotificationCard);
-</script>
diff --git a/src/cards/ha-plant-card.html b/src/cards/ha-plant-card.js
similarity index 79%
rename from src/cards/ha-plant-card.html
rename to src/cards/ha-plant-card.js
index 5b0a12cc67..622db3841a 100644
--- a/src/cards/ha-plant-card.html
+++ b/src/cards/ha-plant-card.js
@@ -1,10 +1,13 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
-<link rel='import' href='../components/ha-card.html'>
-<link rel='import' href='../util/hass-mixins.html'>
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="ha-plant-card">
-  <template>
+import '../components/ha-card.js';
+import '../util/hass-mixins.js';
+
+class HaPlantCard extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       .content {
         display: flex;
@@ -30,12 +33,12 @@
       }
     </style>
 
-    <ha-card header='[[computeTitle(stateObj)]]'>
-      <div class='content'>
+    <ha-card header="[[computeTitle(stateObj)]]">
+      <div class="content">
         <template is="dom-repeat" items="[[computeAttributes(stateObj.attributes)]]">
           <div class="attributes" on-click="attributeClicked">
             <div><iron-icon icon="[[computeIcon(item, stateObj.attributes.battery)]]"></iron-icon></div>
-            <div class$="[[computeClass(stateObj.attributes.problem, item)]]">
+            <div class\$="[[computeClass(stateObj.attributes.problem, item)]]">
               [[computeValue(stateObj.attributes, item)]]
             </div>
             <div class="uom">[[computeUom(stateObj.attributes.unit_of_measurement_dict, item)]]</div>
@@ -43,11 +46,9 @@
         </template>
       </div>
     </ha-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaPlantCard extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-plant-card'; }
   static get properties() {
     return {
@@ -105,4 +106,3 @@ class HaPlantCard extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaPlantCard.is, HaPlantCard);
-</script>
diff --git a/src/cards/ha-weather-card.html b/src/cards/ha-weather-card.js
similarity index 92%
rename from src/cards/ha-weather-card.html
rename to src/cards/ha-weather-card.js
index db421a6fdf..f28991a6e5 100644
--- a/src/cards/ha-weather-card.html
+++ b/src/cards/ha-weather-card.js
@@ -1,11 +1,17 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
-<link rel='import' href='../components/ha-card.html'>
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../util/hass-mixins.html'>
+import '../components/ha-card.js';
+import '../util/hass-mixins.js';
 
-<dom-module id='ha-weather-card'>
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaWeatherCard extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
     <style>
       :host {
         cursor: pointer;
@@ -80,8 +86,8 @@
         color: var(--secondary-text-color);
       }
     </style>
-    <ha-card header='[[stateObj.attributes.friendly_name]]'>
-      <div class='content'>
+    <ha-card header="[[stateObj.attributes.friendly_name]]">
+      <div class="content">
         <div class="now">
           <div class="main">
             <template is="dom-if" if="[[showWeatherIcon(stateObj.state)]]">
@@ -117,7 +123,7 @@
         </div>
         <template is="dom-if" if="[[forecast]]">
           <div class="forecast">
-            <template is='dom-repeat' items='[[forecast]]'>
+            <template is="dom-repeat" items="[[forecast]]">
               <div>
                 <div class="weekday">[[computeDateTime(item.datetime)]]</div>
                 <template is="dom-if" if="[[item.condition]]">
@@ -135,15 +141,9 @@
         </template>
       </div>
     </ha-card>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaWeatherCard extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
   static get is() { return 'ha-weather-card'; }
   static get properties() {
     return {
@@ -238,4 +238,3 @@ class HaWeatherCard extends
   }
 }
 customElements.define(HaWeatherCard.is, HaWeatherCard);
-</script>
diff --git a/src/components/buttons/ha-call-api-button.html b/src/components/buttons/ha-call-api-button.js
similarity index 71%
rename from src/components/buttons/ha-call-api-button.html
rename to src/components/buttons/ha-call-api-button.js
index 59bc28d93a..bf0d0c4ce2 100644
--- a/src/components/buttons/ha-call-api-button.html
+++ b/src/components/buttons/ha-call-api-button.js
@@ -1,20 +1,16 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="./ha-progress-button.html">
-<link rel='import' href='../../util/hass-mixins.html'>
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='ha-call-api-button'>
-  <template>
-    <ha-progress-button
-      id='progress'
-      progress='[[progress]]'
-      on-click='buttonTapped'
-      disabled='[[disabled]]'
-    ><slot></slot></ha-progress-button>
-  </template>
-</dom-module>
+import '../../util/hass-mixins.js';
+import './ha-progress-button.js';
+
+class HaCallApiButton extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <ha-progress-button id="progress" progress="[[progress]]" on-click="buttonTapped" disabled="[[disabled]]"><slot></slot></ha-progress-button>
+`;
+  }
 
-<script>
-class HaCallApiButton extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-call-api-button'; }
 
   static get properties() {
@@ -71,4 +67,3 @@ class HaCallApiButton extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaCallApiButton.is, HaCallApiButton);
-</script>
diff --git a/src/components/buttons/ha-call-service-button.html b/src/components/buttons/ha-call-service-button.js
similarity index 71%
rename from src/components/buttons/ha-call-service-button.html
rename to src/components/buttons/ha-call-service-button.js
index 1e9a17f4fd..6dd84cba57 100644
--- a/src/components/buttons/ha-call-service-button.html
+++ b/src/components/buttons/ha-call-service-button.js
@@ -1,20 +1,16 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="./ha-progress-button.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../util/hass-mixins.html'>
+import '../../util/hass-mixins.js';
+import './ha-progress-button.js';
 
-<dom-module id='ha-call-service-button'>
-  <template>
-    <ha-progress-button
-      id='progress'
-      progress='[[progress]]'
-      on-click='buttonTapped'
-    ><slot></slot></ha-progress-button>
-  </template>
-</dom-module>
+class HaCallServiceButton extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <ha-progress-button id="progress" progress="[[progress]]" on-click="buttonTapped"><slot></slot></ha-progress-button>
+`;
+  }
 
-<script>
-class HaCallServiceButton extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-call-service-button'; }
 
   static get properties() {
@@ -68,4 +64,3 @@ class HaCallServiceButton extends window.hassMixins.EventsMixin(Polymer.Element)
 }
 
 customElements.define(HaCallServiceButton.is, HaCallServiceButton);
-</script>
diff --git a/src/components/buttons/ha-progress-button.html b/src/components/buttons/ha-progress-button.js
similarity index 70%
rename from src/components/buttons/ha-progress-button.html
rename to src/components/buttons/ha-progress-button.js
index 0591f2e02a..6dd8f19123 100644
--- a/src/components/buttons/ha-progress-button.html
+++ b/src/components/buttons/ha-progress-button.js
@@ -1,9 +1,11 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../../bower_components/paper-spinner/paper-spinner.html">
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-spinner/paper-spinner.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='ha-progress-button'>
-  <template>
+class HaProgressButton extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       .container {
         position: relative;
@@ -40,25 +42,19 @@
         bottom: 0;
       }
     </style>
-    <div class='container' id='container'>
-      <paper-button
-        id='button'
-        disabled='[[computeDisabled(disabled, progress)]]'
-        on-click='buttonTapped'
-      >
+    <div class="container" id="container">
+      <paper-button id="button" disabled="[[computeDisabled(disabled, progress)]]" on-click="buttonTapped">
         <slot></slot>
       </paper-button>
-      <template is='dom-if' if='[[progress]]'>
-        <div class='progress'>
-          <paper-spinner active></paper-spinner>
+      <template is="dom-if" if="[[progress]]">
+        <div class="progress">
+          <paper-spinner active=""></paper-spinner>
         </div>
       </template>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaProgressButton extends Polymer.Element {
   static get is() { return 'ha-progress-button'; }
 
   static get properties() {
@@ -110,4 +106,3 @@ class HaProgressButton extends Polymer.Element {
 }
 
 customElements.define(HaProgressButton.is, HaProgressButton);
-</script>
diff --git a/src/components/domain-icon.html b/src/components/domain-icon.js
similarity index 51%
rename from src/components/domain-icon.html
rename to src/components/domain-icon.js
index d75412d23e..874ee454f5 100644
--- a/src/components/domain-icon.html
+++ b/src/components/domain-icon.js
@@ -1,15 +1,16 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
+import domainIcon from '../../js/common/entity/domain_icon.js';
 
-<dom-module id="domain-icon">
-  <template>
+class DomainIcon extends PolymerElement {
+  static get template() {
+    return html`
     <iron-icon icon="[[computeIcon(domain, state)]]"></iron-icon>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class DomainIcon extends Polymer.Element {
   static get is() { return 'domain-icon'; }
 
   static get properties() {
@@ -27,9 +28,8 @@ class DomainIcon extends Polymer.Element {
   }
 
   computeIcon(domain, state) {
-    return window.hassUtil.domainIcon(domain, state);
+    return domainIcon(domain, state);
   }
 }
 
 customElements.define(DomainIcon.is, DomainIcon);
-</script>
diff --git a/src/components/entity/ha-chart-base.html b/src/components/entity/ha-chart-base.html
deleted file mode 100644
index 223908d080..0000000000
--- a/src/components/entity/ha-chart-base.html
+++ /dev/null
@@ -1,542 +0,0 @@
-<link rel='import' href='../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../../bower_components/iron-resizable-behavior/iron-resizable-behavior.html">
-<link rel='import' href='../../../bower_components/paper-icon-button/paper-icon-button.html'>
-
-<dom-module id="ha-chart-base">
-  <template>
-    <style>
-      :host {
-        display: block;
-      }
-      .chartHeader {
-        padding: 6px 0 0 0;
-        width: 100%;
-        display: flex;
-        flex-direction: row;
-      }
-      .chartHeader > div {
-        vertical-align: top;
-        padding: 0 8px;
-      }
-      .chartHeader > div.chartTitle {
-        padding-top: 8px;
-        flex: 0 0 0;
-        max-width: 30%;
-      }
-      .chartHeader > div.chartLegend {
-        flex: 1 1;
-        min-width: 70%;
-      }
-      :root{
-        user-select: none;
-        -moz-user-select: none;
-        -webkit-user-select: none;
-        -ms-user-select: none;
-      }
-      .chartTooltip {
-        font-size: 90%;
-        opacity: 1;
-        position: absolute;
-        background: rgba(80, 80, 80, .9);
-        color: white;
-        border-radius: 3px;
-        pointer-events: none;
-        transform: translate(-50%, 12px);
-        z-index: 1000;
-        width: 200px;
-        transition: opacity 0.15s ease-in-out;
-      }
-      .chartLegend ul,
-      .chartTooltip ul {
-        display: inline-block;
-        padding: 0 0px;
-        margin: 5px 0 0 0;
-        width: 100%
-      }
-      .chartTooltip li {
-        display: block;
-        white-space: pre-line;
-      }
-      .chartTooltip .title {
-        text-align: center;
-        font-weight: 500;
-      }
-      .chartLegend li {
-        display: inline-block;
-        padding: 0 6px;
-        max-width: 49%;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-        box-sizing: border-box;
-      }
-      .chartLegend li:nth-child(odd):last-of-type {
-        /* Make last item take full width if it is odd-numbered. */
-        max-width: 100%;
-      }
-      .chartLegend li[data-hidden] {
-        text-decoration: line-through;
-      }
-      .chartLegend em,
-      .chartTooltip em {
-        border-radius: 5px;
-        display: inline-block;
-        height: 10px;
-        margin-right: 4px;
-        width: 10px;
-      }
-      paper-icon-button {
-        color: var(--secondary-text-color);
-      }
-    </style>
-    <template is="dom-if" if="[[unit]]">
-      <div class="chartHeader">
-        <div class="chartTitle">[[unit]]</div>
-        <div class="chartLegend">
-          <ul>
-            <template is="dom-repeat" items="[[metas]]">
-              <li on-click="_legendClick" data-hidden$="[[item.hidden]]">
-                <em style$="background-color:[[item.bgColor]]"></em>
-                [[item.label]]
-              </li>
-            </template>
-          </ul>
-        </div>
-      </div>
-    </template>
-    <div id="chartTarget" style="height:40px; width:100%">
-      <canvas id="chartCanvas"></canvas>
-      <div class$="chartTooltip [[tooltip.yAlign]]"
-      style$="opacity:[[tooltip.opacity]]; top:[[tooltip.top]]; left:[[tooltip.left]]; padding:[[tooltip.yPadding]]px [[tooltip.xPadding]]px">
-        <div class="title">[[tooltip.title]]</div>
-        <div>
-          <ul>
-            <template is="dom-repeat" items="[[tooltip.lines]]">
-              <li><em style$="background-color:[[item.bgColor]]"></em>[[item.text]]</li>
-            </template>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </template>
-</dom-module>
-<script>
-// eslint-disable-next-line no-unused-vars
-/* global Chart moment Color */
-{
-  let SCRIPT_LOADED = false;
-
-  class HaChartBase extends Polymer.mixinBehaviors([
-    Polymer.IronResizableBehavior
-  ], Polymer.Element) {
-    get chart() {
-      return this._chart;
-    }
-    static get is() { return 'ha-chart-base'; }
-    static get properties() {
-      return {
-        data: Object,
-        identifier: String,
-        rendered: {
-          type: Boolean,
-          notify: true,
-          value: false,
-          readOnly: true,
-        },
-        metas: {
-          type: Array,
-          value: () => [],
-        },
-        tooltip: {
-          type: Object,
-          value: () => ({
-            opacity: '0',
-            left: '0',
-            top: '0',
-            xPadding: '5',
-            yPadding: '3'
-          })
-        },
-        unit: Object,
-      };
-    }
-
-    static get observers() {
-      return ['onPropsChange(data)'];
-    }
-
-    connectedCallback() {
-      super.connectedCallback();
-      this._isAttached = true;
-      this.onPropsChange();
-      this._resizeListener = () => {
-        this._debouncer = Polymer.Debouncer.debounce(
-          this._debouncer,
-          Polymer.Async.timeOut.after(10),
-          () => {
-            if (this._isAttached) {
-              this.resizeChart();
-            }
-          }
-        );
-      };
-
-      if (typeof ResizeObserver === 'function') {
-        this.resizeObserver = new ResizeObserver((entries) => {
-          entries.forEach(() => {
-            this._resizeListener();
-          });
-        });
-        this.resizeObserver.observe(this.$.chartTarget);
-      } else {
-        this.addEventListener('iron-resize', this._resizeListener);
-      }
-
-      if (!SCRIPT_LOADED) {
-        Polymer.importHref(
-          window.CHART_SCRIPT,
-          () => {
-            SCRIPT_LOADED = true;
-            this.onPropsChange();
-          },
-        );
-      }
-    }
-
-    disconnectedCallback() {
-      super.disconnectedCallback();
-      this._isAttached = false;
-      if (this.resizeObserver) {
-        this.resizeObserver.unobserve(this.$.chartTarget);
-      }
-
-      this.removeEventListener('iron-resize', this._resizeListener);
-
-      if (this._resizeTimer !== undefined) {
-        clearInterval(this._resizeTimer);
-        this._resizeTimer = undefined;
-      }
-    }
-    onPropsChange() {
-      if (!this._isAttached || !SCRIPT_LOADED || !this.data) {
-        return;
-      }
-      this.drawChart();
-    }
-    _customTooltips(tooltip) {
-      // Hide if no tooltip
-      if (tooltip.opacity === 0) {
-        this.set(['tooltip', 'opacity'], 0);
-        return;
-      }
-      // Set caret Position
-      if (tooltip.yAlign) {
-        this.set(['tooltip', 'yAlign'], tooltip.yAlign);
-      } else {
-        this.set(['tooltip', 'yAlign'], 'no-transform');
-      }
-
-      const title = tooltip.title ? tooltip.title[0] || '' : '';
-      this.set(['tooltip', 'title'], title);
-
-      const bodyLines = tooltip.body.map(n => n.lines);
-
-      // Set Text
-      if (tooltip.body) {
-        this.set(['tooltip', 'lines'], bodyLines.map((body, i) => {
-          const colors = tooltip.labelColors[i];
-          return {
-            color: colors.borderColor,
-            bgColor: colors.backgroundColor,
-            text: body.join('\n'),
-          };
-        }));
-      }
-      const parentWidth = this.$.chartTarget.clientWidth;
-      let positionX = tooltip.caretX;
-      const positionY = this._chart.canvas.offsetTop + tooltip.caretY;
-      if (tooltip.caretX + 100 > parentWidth) {
-        positionX = parentWidth - 100;
-      } else if (tooltip.caretX < 100) {
-        positionX = 100;
-      }
-      positionX += this._chart.canvas.offsetLeft;
-      // Display, position, and set styles for font
-      this.tooltip = Object.assign({}, this.tooltip, {
-        opacity: 1,
-        left: `${positionX}px`,
-        top: `${positionY}px`,
-      });
-    }
-
-    _legendClick(event) {
-      event = event || window.event;
-      event.stopPropagation();
-      let target = event.target || event.srcElement;
-      while (target.nodeName !== 'LI') { // user clicked child, find parent LI
-        target = target.parentElement;
-      }
-      const index = event.model.itemsIndex;
-
-      const meta = this._chart.getDatasetMeta(index);
-      meta.hidden = meta.hidden === null ? !this._chart.data.datasets[index].hidden : null;
-      this.set(['metas', index, 'hidden'], this._chart.isDatasetVisible(index) ? null : 'hidden');
-      this._chart.update();
-    }
-    _drawLegend() {
-      const chart = this._chart;
-      // New data for old graph. Keep metadata.
-      const preserveVisibility =
-          this._oldIdentifier && this.identifier === this._oldIdentifier;
-      this._oldIdentifier = this.identifier;
-      this.set('metas', this._chart.data.datasets.map((x, i) => ({
-        label: x.label,
-        color: x.color,
-        bgColor: x.backgroundColor,
-        hidden: preserveVisibility && i < this.metas.length ?
-          this.metas[i].hidden : !chart.isDatasetVisible(i),
-      })));
-      let updateNeeded = false;
-      if (preserveVisibility) {
-        for (let i = 0; i < this.metas.length; i++) {
-          const meta = chart.getDatasetMeta(i);
-          if (!!meta.hidden !== !!this.metas[i].hidden) updateNeeded = true;
-          meta.hidden = this.metas[i].hidden ? true : null;
-        }
-      }
-      if (updateNeeded) {
-        chart.update();
-      }
-      this.unit = this.data.unit;
-    }
-    _formatTickValue(value, index, values) {
-      if (values.length === 0) {
-        return value;
-      }
-      const date = new Date(values[index].value);
-      return window.hassUtil.formatTime(date);
-    }
-    drawChart() {
-      const data = this.data.data;
-      const ctx = this.$.chartCanvas;
-
-      if ((!data.datasets || !data.datasets.length) && !this._chart) {
-        return;
-      }
-      if (this.data.type !== 'timeline' && data.datasets.length > 0) {
-        const cnt = data.datasets.length;
-        const colors = this.constructor.getColorList(cnt);
-        for (let loopI = 0; loopI < cnt; loopI++) {
-          data.datasets[loopI].borderColor = colors[loopI].rgbString();
-          data.datasets[loopI].backgroundColor = colors[loopI].alpha(0.6).rgbaString();
-        }
-      }
-
-      if (this._chart) {
-        this._customTooltips({ opacity: 0 });
-        this._chart.data = data;
-        this._chart.update({ duration: 0 });
-        if (this.isTimeline !== true && this.data.legend === true) {
-          this._drawLegend();
-        }
-        this.resizeChart();
-      } else {
-        if (!data.datasets) {
-          return;
-        }
-        this._customTooltips({ opacity: 0 });
-        const plugins = [
-          { afterRender: () => this._setRendered(true) }
-        ];
-        let options = {
-          responsive: true,
-          maintainAspectRatio: false,
-          animation: {
-            duration: 0,
-          },
-          hover: {
-            animationDuration: 0,
-          },
-          responsiveAnimationDuration: 0,
-          tooltips: {
-            enabled: false,
-            custom: this._customTooltips.bind(this),
-          },
-          legend: {
-            display: false,
-          },
-          line: {
-            spanGaps: true,
-          },
-          elements: {
-            font: "12px 'Roboto', 'sans-serif'",
-          },
-          ticks: {
-            fontFamily: "'Roboto', 'sans-serif'",
-          }
-        };
-        options = Chart.helpers.merge(options, this.data.options);
-        options.scales.xAxes[0].ticks.callback = this._formatTickValue;
-        if (this.data.type === 'timeline') {
-          this.set('isTimeline', true);
-          if (this.data.colors !== undefined) {
-            this._colorFunc = this.constructor.getColorGenerator(
-              this.data.colors.staticColors,
-              this.data.colors.staticColorIndex
-            );
-          }
-          if (this._colorFunc !== undefined) {
-            options.colorFunction = this._colorFunc;
-          }
-          if (data.datasets.length === 1) {
-            if (options.scales.yAxes[0].ticks) {
-              options.scales.yAxes[0].ticks.display = false;
-            } else {
-              options.scales.yAxes[0].ticks = { display: false };
-            }
-          }
-        }
-        this.$.chartTarget.style.height = '160px';
-        this.$.chartTarget.height = '160px';
-        const chartData = {
-          type: this.data.type,
-          data: this.data.data,
-          options: options,
-          plugins: plugins,
-        };
-        // Async resize after dom update
-        this._chart = new Chart(ctx, chartData);
-        if (this.isTimeline !== true && this.data.legend === true) {
-          this._drawLegend();
-        }
-        this.resizeChart();
-      }
-    }
-
-    resizeChart() {
-      if (!this._chart) return;
-      // Chart not ready
-      if (this.$.chartTarget.clientWidth === 0) {
-        if (this._resizeTimer === undefined) {
-          this._resizeTimer = setInterval(this.resizeChart.bind(this), 10);
-          return;
-        }
-      }
-
-      clearInterval(this._resizeTimer);
-      this._resizeTimer = undefined;
-
-      this._resizeChart();
-    }
-
-    _resizeChart() {
-      const chartTarget = this.$.chartTarget;
-
-      const options = this.data;
-      const data = options.data;
-
-      if (data.datasets.length === 0) {
-        return;
-      }
-
-      if (!this.isTimeline) {
-        this._chart.resize();
-        return;
-      }
-
-      // Recalculate chart height for Timeline chart
-      var axis = this._chart.boxes.filter(x => x.position === 'bottom')[0];
-      if (axis && axis.height > 0) {
-        this._axisHeight = axis.height;
-      }
-      if (!this._axisHeight) {
-        chartTarget.style.height = '100px';
-        chartTarget.height = '100px';
-        this._chart.resize();
-        axis = this._chart.boxes.filter(x => x.position === 'bottom')[0];
-        if (axis && axis.height > 0) {
-          this._axisHeight = axis.height;
-        }
-      }
-      if (this._axisHeight) {
-        const cnt = data.datasets.length;
-        const targetHeight = ((30 * cnt) + this._axisHeight) + 'px';
-        if (chartTarget.style.height !== targetHeight) {
-          chartTarget.style.height = targetHeight;
-          chartTarget.height = targetHeight;
-        }
-        this._chart.resize();
-      }
-    }
-
-    // Get HSL distributed color list
-    static getColorList(count) {
-      let processL = false;
-      if (count > 10) {
-        processL = true;
-        count = Math.ceil(count / 2);
-      }
-      const h1 = 360 / count;
-      const result = [];
-      for (let loopI = 0; loopI < count; loopI++) {
-        result[loopI] = Color().hsl(h1 * loopI, 80, 38);
-        if (processL) {
-          result[loopI + count] = Color().hsl(h1 * loopI, 80, 62);
-        }
-      }
-      return result;
-    }
-    static getColorGenerator(staticColors, startIndex) {
-      // Known colors for static data,
-      // should add for very common state string manually.
-      // Palette modified from http://google.github.io/palette.js/ mpn65, Apache 2.0
-      const palette = [
-        'ff0029', '66a61e', '377eb8', '984ea3', '00d2d5', 'ff7f00', 'af8d00',
-        '7f80cd', 'b3e900', 'c42e60', 'a65628', 'f781bf', '8dd3c7', 'bebada',
-        'fb8072', '80b1d3', 'fdb462', 'fccde5', 'bc80bd', 'ffed6f', 'c4eaff',
-        'cf8c00', '1b9e77', 'd95f02', 'e7298a', 'e6ab02', 'a6761d', '0097ff',
-        '00d067', 'f43600', '4ba93b', '5779bb', '927acc', '97ee3f', 'bf3947',
-        '9f5b00', 'f48758', '8caed6', 'f2b94f', 'eff26e', 'e43872', 'd9b100',
-        '9d7a00', '698cff', 'd9d9d9', '00d27e', 'd06800', '009f82', 'c49200',
-        'cbe8ff', 'fecddf', 'c27eb6', '8cd2ce', 'c4b8d9', 'f883b0', 'a49100',
-        'f48800', '27d0df', 'a04a9b'];
-      function getColorIndex(idx) {
-        // Reuse the color if index too large.
-        return Color('#' + palette[idx % palette.length]);
-      }
-      const colorDict = {};
-      let colorIndex = 0;
-      if (startIndex > 0) colorIndex = startIndex;
-      if (staticColors) {
-        Object.keys(staticColors).forEach((c) => {
-          const c1 = staticColors[c];
-          if (isFinite(c1)) {
-            colorDict[c.toLowerCase()] = getColorIndex(c1);
-          } else {
-            colorDict[c.toLowerCase()] = Color(staticColors[c]);
-          }
-        });
-      }
-      // Custom color assign
-      function getColor(__, data) {
-        let ret;
-        const name = data[3];
-        if (name === null) return Color().hsl(0, 40, 38);
-        if (name === undefined) return Color().hsl(120, 40, 38);
-        const name1 = name.toLowerCase();
-        if (ret === undefined) {
-          ret = colorDict[name1];
-        }
-        if (ret === undefined) {
-          ret = getColorIndex(colorIndex);
-          colorIndex++;
-          colorDict[name1] = ret;
-        }
-        return ret;
-      }
-      return getColor;
-    }
-  }
-  customElements.define(HaChartBase.is, HaChartBase);
-}
-</script>
diff --git a/src/components/entity/ha-chart-base.js b/src/components/entity/ha-chart-base.js
new file mode 100644
index 0000000000..98bf9661b3
--- /dev/null
+++ b/src/components/entity/ha-chart-base.js
@@ -0,0 +1,540 @@
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
+import { timeOut } from '@polymer/polymer/lib/utils/async.js';
+import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
+// eslint-disable-next-line no-unused-vars
+/* global Chart moment Color */
+
+let scriptsLoaded = null;
+
+class HaChartBase extends mixinBehaviors([
+  IronResizableBehavior
+], PolymerElement) {
+  static get template() {
+    return html`
+  <style>
+    :host {
+      display: block;
+    }
+    .chartHeader {
+      padding: 6px 0 0 0;
+      width: 100%;
+      display: flex;
+      flex-direction: row;
+    }
+    .chartHeader > div {
+      vertical-align: top;
+      padding: 0 8px;
+    }
+    .chartHeader > div.chartTitle {
+      padding-top: 8px;
+      flex: 0 0 0;
+      max-width: 30%;
+    }
+    .chartHeader > div.chartLegend {
+      flex: 1 1;
+      min-width: 70%;
+    }
+    :root{
+      user-select: none;
+      -moz-user-select: none;
+      -webkit-user-select: none;
+      -ms-user-select: none;
+    }
+    .chartTooltip {
+      font-size: 90%;
+      opacity: 1;
+      position: absolute;
+      background: rgba(80, 80, 80, .9);
+      color: white;
+      border-radius: 3px;
+      pointer-events: none;
+      transform: translate(-50%, 12px);
+      z-index: 1000;
+      width: 200px;
+      transition: opacity 0.15s ease-in-out;
+    }
+    .chartLegend ul,
+    .chartTooltip ul {
+      display: inline-block;
+      padding: 0 0px;
+      margin: 5px 0 0 0;
+      width: 100%
+    }
+    .chartTooltip li {
+      display: block;
+      white-space: pre-line;
+    }
+    .chartTooltip .title {
+      text-align: center;
+      font-weight: 500;
+    }
+    .chartLegend li {
+      display: inline-block;
+      padding: 0 6px;
+      max-width: 49%;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      box-sizing: border-box;
+    }
+    .chartLegend li:nth-child(odd):last-of-type {
+      /* Make last item take full width if it is odd-numbered. */
+      max-width: 100%;
+    }
+    .chartLegend li[data-hidden] {
+      text-decoration: line-through;
+    }
+    .chartLegend em,
+    .chartTooltip em {
+      border-radius: 5px;
+      display: inline-block;
+      height: 10px;
+      margin-right: 4px;
+      width: 10px;
+    }
+    paper-icon-button {
+      color: var(--secondary-text-color);
+    }
+  </style>
+  <template is="dom-if" if="[[unit]]">
+    <div class="chartHeader">
+      <div class="chartTitle">[[unit]]</div>
+      <div class="chartLegend">
+        <ul>
+          <template is="dom-repeat" items="[[metas]]">
+            <li on-click="_legendClick" data-hidden\$="[[item.hidden]]">
+              <em style\$="background-color:[[item.bgColor]]"></em>
+              [[item.label]]
+            </li>
+          </template>
+        </ul>
+      </div>
+    </div>
+  </template>
+  <div id="chartTarget" style="height:40px; width:100%">
+    <canvas id="chartCanvas"></canvas>
+    <div class\$="chartTooltip [[tooltip.yAlign]]" style\$="opacity:[[tooltip.opacity]]; top:[[tooltip.top]]; left:[[tooltip.left]]; padding:[[tooltip.yPadding]]px [[tooltip.xPadding]]px">
+      <div class="title">[[tooltip.title]]</div>
+      <div>
+        <ul>
+          <template is="dom-repeat" items="[[tooltip.lines]]">
+            <li><em style\$="background-color:[[item.bgColor]]"></em>[[item.text]]</li>
+          </template>
+        </ul>
+      </div>
+    </div>
+  </div>
+`;
+  }
+
+  get chart() {
+    return this._chart;
+  }
+  static get is() { return 'ha-chart-base'; }
+  static get properties() {
+    return {
+      data: Object,
+      identifier: String,
+      rendered: {
+        type: Boolean,
+        notify: true,
+        value: false,
+        readOnly: true,
+      },
+      metas: {
+        type: Array,
+        value: () => [],
+      },
+      tooltip: {
+        type: Object,
+        value: () => ({
+          opacity: '0',
+          left: '0',
+          top: '0',
+          xPadding: '5',
+          yPadding: '3'
+        })
+      },
+      unit: Object,
+    };
+  }
+
+  static get observers() {
+    return ['onPropsChange(data)'];
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+    this._isAttached = true;
+    this.onPropsChange();
+    this._resizeListener = () => {
+      this._debouncer = Debouncer.debounce(
+        this._debouncer,
+        timeOut.after(10),
+        () => {
+          if (this._isAttached) {
+            this.resizeChart();
+          }
+        }
+      );
+    };
+
+    if (typeof ResizeObserver === 'function') {
+      this.resizeObserver = new ResizeObserver((entries) => {
+        entries.forEach(() => {
+          this._resizeListener();
+        });
+      });
+      this.resizeObserver.observe(this.$.chartTarget);
+    } else {
+      this.addEventListener('iron-resize', this._resizeListener);
+    }
+
+    if (scriptsLoaded === null) {
+      scriptsLoaded = import(/* webpackChunkName: "load_chart" */ '../../resources/ha-chart-scripts.js');
+    }
+    scriptsLoaded.then((ChartModule) => {
+      this.ChartClass = ChartModule.default;
+      this.onPropsChange();
+    });
+  }
+
+  disconnectedCallback() {
+    super.disconnectedCallback();
+    this._isAttached = false;
+    if (this.resizeObserver) {
+      this.resizeObserver.unobserve(this.$.chartTarget);
+    }
+
+    this.removeEventListener('iron-resize', this._resizeListener);
+
+    if (this._resizeTimer !== undefined) {
+      clearInterval(this._resizeTimer);
+      this._resizeTimer = undefined;
+    }
+  }
+  onPropsChange() {
+    if (!this._isAttached || !this.ChartClass || !this.data) {
+      return;
+    }
+    this.drawChart();
+  }
+  _customTooltips(tooltip) {
+    // Hide if no tooltip
+    if (tooltip.opacity === 0) {
+      this.set(['tooltip', 'opacity'], 0);
+      return;
+    }
+    // Set caret Position
+    if (tooltip.yAlign) {
+      this.set(['tooltip', 'yAlign'], tooltip.yAlign);
+    } else {
+      this.set(['tooltip', 'yAlign'], 'no-transform');
+    }
+
+    const title = tooltip.title ? tooltip.title[0] || '' : '';
+    this.set(['tooltip', 'title'], title);
+
+    const bodyLines = tooltip.body.map(n => n.lines);
+
+    // Set Text
+    if (tooltip.body) {
+      this.set(['tooltip', 'lines'], bodyLines.map((body, i) => {
+        const colors = tooltip.labelColors[i];
+        return {
+          color: colors.borderColor,
+          bgColor: colors.backgroundColor,
+          text: body.join('\n'),
+        };
+      }));
+    }
+    const parentWidth = this.$.chartTarget.clientWidth;
+    let positionX = tooltip.caretX;
+    const positionY = this._chart.canvas.offsetTop + tooltip.caretY;
+    if (tooltip.caretX + 100 > parentWidth) {
+      positionX = parentWidth - 100;
+    } else if (tooltip.caretX < 100) {
+      positionX = 100;
+    }
+    positionX += this._chart.canvas.offsetLeft;
+    // Display, position, and set styles for font
+    this.tooltip = Object.assign({}, this.tooltip, {
+      opacity: 1,
+      left: `${positionX}px`,
+      top: `${positionY}px`,
+    });
+  }
+
+  _legendClick(event) {
+    event = event || window.event;
+    event.stopPropagation();
+    let target = event.target || event.srcElement;
+    while (target.nodeName !== 'LI') { // user clicked child, find parent LI
+      target = target.parentElement;
+    }
+    const index = event.model.itemsIndex;
+
+    const meta = this._chart.getDatasetMeta(index);
+    meta.hidden = meta.hidden === null ? !this._chart.data.datasets[index].hidden : null;
+    this.set(['metas', index, 'hidden'], this._chart.isDatasetVisible(index) ? null : 'hidden');
+    this._chart.update();
+  }
+  _drawLegend() {
+    const chart = this._chart;
+    // New data for old graph. Keep metadata.
+    const preserveVisibility =
+        this._oldIdentifier && this.identifier === this._oldIdentifier;
+    this._oldIdentifier = this.identifier;
+    this.set('metas', this._chart.data.datasets.map((x, i) => ({
+      label: x.label,
+      color: x.color,
+      bgColor: x.backgroundColor,
+      hidden: preserveVisibility && i < this.metas.length ?
+        this.metas[i].hidden : !chart.isDatasetVisible(i),
+    })));
+    let updateNeeded = false;
+    if (preserveVisibility) {
+      for (let i = 0; i < this.metas.length; i++) {
+        const meta = chart.getDatasetMeta(i);
+        if (!!meta.hidden !== !!this.metas[i].hidden) updateNeeded = true;
+        meta.hidden = this.metas[i].hidden ? true : null;
+      }
+    }
+    if (updateNeeded) {
+      chart.update();
+    }
+    this.unit = this.data.unit;
+  }
+  _formatTickValue(value, index, values) {
+    if (values.length === 0) {
+      return value;
+    }
+    const date = new Date(values[index].value);
+    return window.hassUtil.formatTime(date);
+  }
+  drawChart() {
+    const data = this.data.data;
+    const ctx = this.$.chartCanvas;
+
+    if ((!data.datasets || !data.datasets.length) && !this._chart) {
+      return;
+    }
+    if (this.data.type !== 'timeline' && data.datasets.length > 0) {
+      const cnt = data.datasets.length;
+      const colors = this.constructor.getColorList(cnt);
+      for (let loopI = 0; loopI < cnt; loopI++) {
+        data.datasets[loopI].borderColor = colors[loopI].rgbString();
+        data.datasets[loopI].backgroundColor = colors[loopI].alpha(0.6).rgbaString();
+      }
+    }
+
+    if (this._chart) {
+      this._customTooltips({ opacity: 0 });
+      this._chart.data = data;
+      this._chart.update({ duration: 0 });
+      if (this.isTimeline !== true && this.data.legend === true) {
+        this._drawLegend();
+      }
+      this.resizeChart();
+    } else {
+      if (!data.datasets) {
+        return;
+      }
+      this._customTooltips({ opacity: 0 });
+      const plugins = [
+        { afterRender: () => this._setRendered(true) }
+      ];
+      let options = {
+        responsive: true,
+        maintainAspectRatio: false,
+        animation: {
+          duration: 0,
+        },
+        hover: {
+          animationDuration: 0,
+        },
+        responsiveAnimationDuration: 0,
+        tooltips: {
+          enabled: false,
+          custom: this._customTooltips.bind(this),
+        },
+        legend: {
+          display: false,
+        },
+        line: {
+          spanGaps: true,
+        },
+        elements: {
+          font: "12px 'Roboto', 'sans-serif'",
+        },
+        ticks: {
+          fontFamily: "'Roboto', 'sans-serif'",
+        }
+      };
+      options = Chart.helpers.merge(options, this.data.options);
+      options.scales.xAxes[0].ticks.callback = this._formatTickValue;
+      if (this.data.type === 'timeline') {
+        this.set('isTimeline', true);
+        if (this.data.colors !== undefined) {
+          this._colorFunc = this.constructor.getColorGenerator(
+            this.data.colors.staticColors,
+            this.data.colors.staticColorIndex
+          );
+        }
+        if (this._colorFunc !== undefined) {
+          options.colorFunction = this._colorFunc;
+        }
+        if (data.datasets.length === 1) {
+          if (options.scales.yAxes[0].ticks) {
+            options.scales.yAxes[0].ticks.display = false;
+          } else {
+            options.scales.yAxes[0].ticks = { display: false };
+          }
+        }
+      }
+      this.$.chartTarget.style.height = '160px';
+      this.$.chartTarget.height = '160px';
+      const chartData = {
+        type: this.data.type,
+        data: this.data.data,
+        options: options,
+        plugins: plugins,
+      };
+      // Async resize after dom update
+      this._chart = new this.ChartClass(ctx, chartData);
+      if (this.isTimeline !== true && this.data.legend === true) {
+        this._drawLegend();
+      }
+      this.resizeChart();
+    }
+  }
+
+  resizeChart() {
+    if (!this._chart) return;
+    // Chart not ready
+    if (this.$.chartTarget.clientWidth === 0) {
+      if (this._resizeTimer === undefined) {
+        this._resizeTimer = setInterval(this.resizeChart.bind(this), 10);
+        return;
+      }
+    }
+
+    clearInterval(this._resizeTimer);
+    this._resizeTimer = undefined;
+
+    this._resizeChart();
+  }
+
+  _resizeChart() {
+    const chartTarget = this.$.chartTarget;
+
+    const options = this.data;
+    const data = options.data;
+
+    if (data.datasets.length === 0) {
+      return;
+    }
+
+    if (!this.isTimeline) {
+      this._chart.resize();
+      return;
+    }
+
+    // Recalculate chart height for Timeline chart
+    var axis = this._chart.boxes.filter(x => x.position === 'bottom')[0];
+    if (axis && axis.height > 0) {
+      this._axisHeight = axis.height;
+    }
+    if (!this._axisHeight) {
+      chartTarget.style.height = '100px';
+      chartTarget.height = '100px';
+      this._chart.resize();
+      axis = this._chart.boxes.filter(x => x.position === 'bottom')[0];
+      if (axis && axis.height > 0) {
+        this._axisHeight = axis.height;
+      }
+    }
+    if (this._axisHeight) {
+      const cnt = data.datasets.length;
+      const targetHeight = ((30 * cnt) + this._axisHeight) + 'px';
+      if (chartTarget.style.height !== targetHeight) {
+        chartTarget.style.height = targetHeight;
+        chartTarget.height = targetHeight;
+      }
+      this._chart.resize();
+    }
+  }
+
+  // Get HSL distributed color list
+  static getColorList(count) {
+    let processL = false;
+    if (count > 10) {
+      processL = true;
+      count = Math.ceil(count / 2);
+    }
+    const h1 = 360 / count;
+    const result = [];
+    for (let loopI = 0; loopI < count; loopI++) {
+      result[loopI] = Color().hsl(h1 * loopI, 80, 38);
+      if (processL) {
+        result[loopI + count] = Color().hsl(h1 * loopI, 80, 62);
+      }
+    }
+    return result;
+  }
+  static getColorGenerator(staticColors, startIndex) {
+    // Known colors for static data,
+    // should add for very common state string manually.
+    // Palette modified from http://google.github.io/palette.js/ mpn65, Apache 2.0
+    const palette = [
+      'ff0029', '66a61e', '377eb8', '984ea3', '00d2d5', 'ff7f00', 'af8d00',
+      '7f80cd', 'b3e900', 'c42e60', 'a65628', 'f781bf', '8dd3c7', 'bebada',
+      'fb8072', '80b1d3', 'fdb462', 'fccde5', 'bc80bd', 'ffed6f', 'c4eaff',
+      'cf8c00', '1b9e77', 'd95f02', 'e7298a', 'e6ab02', 'a6761d', '0097ff',
+      '00d067', 'f43600', '4ba93b', '5779bb', '927acc', '97ee3f', 'bf3947',
+      '9f5b00', 'f48758', '8caed6', 'f2b94f', 'eff26e', 'e43872', 'd9b100',
+      '9d7a00', '698cff', 'd9d9d9', '00d27e', 'd06800', '009f82', 'c49200',
+      'cbe8ff', 'fecddf', 'c27eb6', '8cd2ce', 'c4b8d9', 'f883b0', 'a49100',
+      'f48800', '27d0df', 'a04a9b'];
+    function getColorIndex(idx) {
+      // Reuse the color if index too large.
+      return Color('#' + palette[idx % palette.length]);
+    }
+    const colorDict = {};
+    let colorIndex = 0;
+    if (startIndex > 0) colorIndex = startIndex;
+    if (staticColors) {
+      Object.keys(staticColors).forEach((c) => {
+        const c1 = staticColors[c];
+        if (isFinite(c1)) {
+          colorDict[c.toLowerCase()] = getColorIndex(c1);
+        } else {
+          colorDict[c.toLowerCase()] = Color(staticColors[c]);
+        }
+      });
+    }
+    // Custom color assign
+    function getColor(__, data) {
+      let ret;
+      const name = data[3];
+      if (name === null) return Color().hsl(0, 40, 38);
+      if (name === undefined) return Color().hsl(120, 40, 38);
+      const name1 = name.toLowerCase();
+      if (ret === undefined) {
+        ret = colorDict[name1];
+      }
+      if (ret === undefined) {
+        ret = getColorIndex(colorIndex);
+        colorIndex++;
+        colorDict[name1] = ret;
+      }
+      return ret;
+    }
+    return getColor;
+  }
+}
+customElements.define(HaChartBase.is, HaChartBase);
diff --git a/src/components/entity/ha-entity-picker.html b/src/components/entity/ha-entity-picker.js
similarity index 59%
rename from src/components/entity/ha-entity-picker.html
rename to src/components/entity/ha-entity-picker.js
index 10ffa37e12..e356c32fb8 100644
--- a/src/components/entity/ha-entity-picker.html
+++ b/src/components/entity/ha-entity-picker.js
@@ -1,16 +1,20 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/vaadin-combo-box/vaadin-combo-box-light.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-icon-item.html">
-<link rel="import" href="../../../bower_components/paper-item/paper-item-body.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-icon-item.js';
+import '@polymer/paper-item/paper-item-body.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import '@vaadin/vaadin-combo-box/vaadin-combo-box-light.js';
 
-<link rel='import' href='../../../src/util/hass-mixins.html'>
+import '../../util/hass-mixins.js';
+import './state-badge.js';
 
-<link rel="import" href="./state-badge.html">
-
-<dom-module id="ha-entity-picker">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class HaEntityPicker extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       paper-input > paper-icon-button {
         width: 24px;
@@ -22,34 +26,10 @@
         display: none;
       }
     </style>
-    <vaadin-combo-box-light
-      items='[[_states]]'
-      item-value-path='entity_id'
-      item-label-path='entity_id'
-      value='{{value}}'
-      opened='{{opened}}'
-      allow-custom-value='[[allowCustomEntity]]'
-    >
-      <paper-input
-        autofocus="[[autofocus]]"
-        label="[[_computeLabel(label, localize)]]"
-        class="input"
-        value='[[value]]'
-        disabled='[[disabled]]'
-      >
-        <paper-icon-button
-          slot="suffix"
-          class="clear-button"
-          icon="mdi:close"
-          no-ripple
-          hidden$='[[!value]]'
-        >Clear</paper-icon-button>
-        <paper-icon-button
-          slot="suffix"
-          class="toggle-button"
-          icon='[[_computeToggleIcon(opened)]]'
-          hidden='[[!_states.length]]'
-        >Toggle</paper-icon-button>
+    <vaadin-combo-box-light items="[[_states]]" item-value-path="entity_id" item-label-path="entity_id" value="{{value}}" opened="{{opened}}" allow-custom-value="[[allowCustomEntity]]">
+      <paper-input autofocus="[[autofocus]]" label="[[_computeLabel(label, localize)]]" class="input" value="[[value]]" disabled="[[disabled]]">
+        <paper-icon-button slot="suffix" class="clear-button" icon="mdi:close" no-ripple="" hidden\$="[[!value]]">Clear</paper-icon-button>
+        <paper-icon-button slot="suffix" class="toggle-button" icon="[[_computeToggleIcon(opened)]]" hidden="[[!_states.length]]">Toggle</paper-icon-button>
       </paper-input>
       <template>
         <style>
@@ -58,22 +38,17 @@
           }
         </style>
         <paper-icon-item>
-          <state-badge state-obj="[[item]]" slot='item-icon'></state-badge>
-          <paper-item-body two-line>
+          <state-badge state-obj="[[item]]" slot="item-icon"></state-badge>
+          <paper-item-body two-line="">
             <div>[[computeStateName(item)]]</div>
-            <div secondary>[[item.entity_id]]</div>
+            <div secondary="">[[item.entity_id]]</div>
           </paper-item-body>
         </paper-icon-item>
       </template>
     </vaadin-combo-box-light>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class HaEntityPicker extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'ha-entity-picker'; }
 
   static get properties() {
@@ -162,4 +137,3 @@ class HaEntityPicker extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(HaEntityPicker.is, HaEntityPicker);
-</script>
diff --git a/src/components/entity/ha-entity-toggle.html b/src/components/entity/ha-entity-toggle.js
similarity index 81%
rename from src/components/entity/ha-entity-toggle.html
rename to src/components/entity/ha-entity-toggle.js
index 0e9b41a96a..397a762b19 100644
--- a/src/components/entity/ha-entity-toggle.html
+++ b/src/components/entity/ha-entity-toggle.js
@@ -1,9 +1,11 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/paper-toggle-button/paper-toggle-button.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-toggle-button/paper-toggle-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="ha-entity-toggle">
-  <template>
+class HaEntityToggle extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       :host {
         white-space: nowrap;
@@ -24,20 +26,16 @@
       }
     </style>
 
-    <template is='dom-if' if='[[stateObj.attributes.assumed_state]]'>
-      <paper-icon-button icon="mdi:flash-off" on-click="turnOff" state-active$='[[!isOn]]'></paper-icon-button>
-      <paper-icon-button icon="mdi:flash" on-click="turnOn" state-active$='[[isOn]]'></paper-icon-button>
+    <template is="dom-if" if="[[stateObj.attributes.assumed_state]]">
+      <paper-icon-button icon="mdi:flash-off" on-click="turnOff" state-active\$="[[!isOn]]"></paper-icon-button>
+      <paper-icon-button icon="mdi:flash" on-click="turnOn" state-active\$="[[isOn]]"></paper-icon-button>
     </template>
-    <template is='dom-if' if='[[!stateObj.attributes.assumed_state]]'>
-      <paper-toggle-button
-        checked="[[toggleChecked]]"
-        on-change="toggleChanged"></paper-toggle-button>
+    <template is="dom-if" if="[[!stateObj.attributes.assumed_state]]">
+      <paper-toggle-button checked="[[toggleChecked]]" on-change="toggleChanged"></paper-toggle-button>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaEntityToggle extends Polymer.Element {
   static get is() { return 'ha-entity-toggle'; }
 
   static get properties() {
@@ -150,4 +148,3 @@ class HaEntityToggle extends Polymer.Element {
 }
 
 customElements.define(HaEntityToggle.is, HaEntityToggle);
-</script>
diff --git a/src/components/entity/ha-state-icon.html b/src/components/entity/ha-state-icon.html
deleted file mode 100644
index beaf990185..0000000000
--- a/src/components/entity/ha-state-icon.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="../../../bower_components/iron-icon/iron-icon.html">
-
-<dom-module id="ha-state-icon">
-  <template>
-    <iron-icon icon="[[computeIcon(stateObj)]]"></iron-icon>
-  </template>
-</dom-module>
-
-<script>
-class HaStateIcon extends Polymer.Element {
-  static get is() { return 'ha-state-icon'; }
-
-  static get properties() {
-    return {
-      stateObj: {
-        type: Object,
-      },
-    };
-  }
-
-  computeIcon(stateObj) {
-    return window.hassUtil.stateIcon(stateObj);
-  }
-}
-
-customElements.define(HaStateIcon.is, HaStateIcon);
-</script>
diff --git a/src/components/entity/ha-state-icon.js b/src/components/entity/ha-state-icon.js
new file mode 100644
index 0000000000..fc81c7cdbf
--- /dev/null
+++ b/src/components/entity/ha-state-icon.js
@@ -0,0 +1,29 @@
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import stateIcon from '../../../js/common/entity/state_icon.js';
+
+class HaStateIcon extends PolymerElement {
+  static get template() {
+    return html`
+    <iron-icon icon="[[computeIcon(stateObj)]]"></iron-icon>
+`;
+  }
+
+  static get is() { return 'ha-state-icon'; }
+
+  static get properties() {
+    return {
+      stateObj: {
+        type: Object,
+      },
+    };
+  }
+
+  computeIcon(stateObj) {
+    return stateIcon(stateObj);
+  }
+}
+
+customElements.define(HaStateIcon.is, HaStateIcon);
diff --git a/src/components/entity/ha-state-label-badge.html b/src/components/entity/ha-state-label-badge.js
similarity index 88%
rename from src/components/entity/ha-state-label-badge.html
rename to src/components/entity/ha-state-label-badge.js
index 77ec20089e..7833fdc6f7 100644
--- a/src/components/entity/ha-state-label-badge.html
+++ b/src/components/entity/ha-state-label-badge.js
@@ -1,12 +1,18 @@
-<link rel='import' href='../../../bower_components/polymer/polymer-element.html'>
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../src/util/hass-mixins.html'>
-<link rel="import" href="../../../src/util/hass-util.html">
+import '../../util/hass-mixins.js';
+import '../../util/hass-util.js';
+import '../ha-label-badge.js';
 
-<link rel='import' href='../ha-label-badge.html'>
-
-<dom-module id='ha-state-label-badge'>
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaStateLabelBadge extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(PolymerElement)) {
+  static get template() {
+    return html`
     <style>
       :host {
         cursor: pointer;
@@ -45,23 +51,10 @@
       }
     </style>
 
-    <ha-label-badge class$='[[computeClassNames(state)]]'
-      value='[[computeValue(localize, state)]]'
-      icon='[[computeIcon(state)]]'
-      image='[[computeImage(state)]]'
-      label='[[computeLabel(localize, state, timerTimeRemaining)]]'
-      description='[[computeDescription(state)]]'
-    ></ha-label-badge>
-  </template>
-</dom-module>
+    <ha-label-badge class\$="[[computeClassNames(state)]]" value="[[computeValue(localize, state)]]" icon="[[computeIcon(state)]]" image="[[computeImage(state)]]" label="[[computeLabel(localize, state, timerTimeRemaining)]]" description="[[computeDescription(state)]]"></ha-label-badge>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaStateLabelBadge extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.EventsMixin(Polymer.Element)) {
   static get is() { return 'ha-state-label-badge'; }
 
   static get properties() {
@@ -211,4 +204,3 @@ class HaStateLabelBadge extends
 }
 
 customElements.define(HaStateLabelBadge.is, HaStateLabelBadge);
-</script>
diff --git a/src/components/entity/state-badge.html b/src/components/entity/state-badge.js
similarity index 80%
rename from src/components/entity/state-badge.html
rename to src/components/entity/state-badge.js
index b3b25fe59d..ba16bad9d5 100644
--- a/src/components/entity/state-badge.html
+++ b/src/components/entity/state-badge.js
@@ -1,9 +1,12 @@
-<link rel='import' href='../../../bower_components/polymer/polymer-element.html'>
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='./ha-state-icon.html'>
+import './ha-state-icon.js';
+import computeStateDomain from '../../../js/common/entity/compute_state_domain.js';
 
-<dom-module id='state-badge'>
-  <template>
+class StateBadge extends PolymerElement {
+  static get template() {
+    return html`
     <style>
     :host {
       position: relative;
@@ -36,17 +39,10 @@
     }
     </style>
 
-    <ha-state-icon
-      id='icon'
-      state-obj='[[stateObj]]'
-      data-domain$='[[computeDomain(stateObj)]]'
-      data-state$='[[stateObj.state]]'
-    ></ha-state-icon>
-  </template>
-</dom-module>
+    <ha-state-icon id="icon" state-obj="[[stateObj]]" data-domain\$="[[computeDomain(stateObj)]]" data-state\$="[[stateObj.state]]"></ha-state-icon>
+`;
+  }
 
-<script>
-class StateBadge extends Polymer.Element {
   static get is() { return 'state-badge'; }
   static get properties() {
     return {
@@ -58,7 +54,7 @@ class StateBadge extends Polymer.Element {
   }
 
   computeDomain(stateObj) {
-    return window.hassUtil.computeDomain(stateObj);
+    return computeStateDomain(stateObj);
   }
 
 
@@ -92,4 +88,3 @@ class StateBadge extends Polymer.Element {
   }
 }
 customElements.define(StateBadge.is, StateBadge);
-</script>
diff --git a/src/components/entity/state-info.html b/src/components/entity/state-info.js
similarity index 53%
rename from src/components/entity/state-info.html
rename to src/components/entity/state-info.js
index 3b28819f04..667a1c7452 100644
--- a/src/components/entity/state-info.html
+++ b/src/components/entity/state-info.js
@@ -1,11 +1,13 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="./state-badge.html">
-<link rel="import" href="../ha-relative-time.html">
-<link rel="import" href="../../util/hass-util.html">
+import '../ha-relative-time.js';
+import './state-badge.js';
+import computeStateName from '../../../js/common/entity/compute_state_name.js';
 
-<dom-module id="state-info">
-  <template>
+class StateInfo extends PolymerElement {
+  static get template() {
+    return html`
     <style>
     :host {
       @apply --paper-font-body1;
@@ -37,27 +39,25 @@
     }
     </style>
 
-      <state-badge state-obj='[[stateObj]]'></state-badge>
+      <state-badge state-obj="[[stateObj]]"></state-badge>
 
-      <div class='info'>
-        <div class='name' in-dialog$='[[inDialog]]'>[[computeStateName(stateObj)]]</div>
+      <div class="info">
+        <div class="name" in-dialog\$="[[inDialog]]">[[computeStateName(stateObj)]]</div>
 
-        <template is='dom-if' if='[[inDialog]]'>
-          <div class='time-ago'>
-            <ha-relative-time datetime='[[stateObj.last_changed]]'></ha-relative-time>
+        <template is="dom-if" if="[[inDialog]]">
+          <div class="time-ago">
+            <ha-relative-time datetime="[[stateObj.last_changed]]"></ha-relative-time>
           </div>
         </template>
-        <template is='dom-if' if='[[!inDialog]]'>
-          <div class='extra-info'>
+        <template is="dom-if" if="[[!inDialog]]">
+          <div class="extra-info">
             <slot>
-          </div>
+          </slot></div>
         </template>
       </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class StateInfo extends Polymer.Element {
   static get is() { return 'state-info'; }
 
   static get properties() {
@@ -78,9 +78,8 @@ class StateInfo extends Polymer.Element {
   }
 
   computeStateName(stateObj) {
-    return window.hassUtil.computeStateName(stateObj);
+    return computeStateName(stateObj);
   }
 }
 
 customElements.define(StateInfo.is, StateInfo);
-</script>
diff --git a/src/components/ha-attributes.html b/src/components/ha-attributes.js
similarity index 67%
rename from src/components/ha-attributes.html
rename to src/components/ha-attributes.js
index 8cf7d6c061..c05b9dad31 100644
--- a/src/components/ha-attributes.html
+++ b/src/components/ha-attributes.js
@@ -1,11 +1,12 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../util/hass-attributes-util.js';
 
-<link rel="import" href="../util/hass-attributes-util.html">
-
-<dom-module id="ha-attributes">
-  <template>
+class HaAttributes extends PolymerElement {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       .data-entry .value {
@@ -17,20 +18,18 @@
       }
     </style>
 
-    <div class='layout vertical'>
-      <template is='dom-repeat' items="[[computeDisplayAttributes(stateObj, filtersArray)]]" as="attribute">
-        <div class='data-entry layout justified horizontal'>
-          <div class='key'>[[formatAttribute(attribute)]]</div>
-          <div class='value'>[[formatAttributeValue(stateObj, attribute)]]</div>
+    <div class="layout vertical">
+      <template is="dom-repeat" items="[[computeDisplayAttributes(stateObj, filtersArray)]]" as="attribute">
+        <div class="data-entry layout justified horizontal">
+          <div class="key">[[formatAttribute(attribute)]]</div>
+          <div class="value">[[formatAttributeValue(stateObj, attribute)]]</div>
         </div>
       </template>
-      <div class='attribution' hidden$='[[!computeAttribution(stateObj)]]'>[[computeAttribution(stateObj)]]</div>
+      <div class="attribution" hidden\$="[[!computeAttribution(stateObj)]]">[[computeAttribution(stateObj)]]</div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaAttributes extends Polymer.Element {
   static get is() { return 'ha-attributes'; }
 
   static get properties() {
@@ -81,4 +80,3 @@ class HaAttributes extends Polymer.Element {
 }
 
 customElements.define(HaAttributes.is, HaAttributes);
-</script>
diff --git a/src/components/ha-card.html b/src/components/ha-card.js
similarity index 52%
rename from src/components/ha-card.html
rename to src/components/ha-card.js
index 2d59ed3923..b812c40451 100644
--- a/src/components/ha-card.html
+++ b/src/components/ha-card.js
@@ -1,14 +1,16 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../bower_components/paper-material/paper-material.html">
+import '@polymer/paper-styles/element-styles/paper-material-styles.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='ha-card'>
-  <template>
-    <style include="paper-material">
+class HaCard extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="paper-material-styles">
       :host {
+        @apply --paper-material-elevation-1;
         display: block;
         border-radius: 2px;
         transition: all 0.30s ease-out;
-
         background-color: var(--paper-card-background-color, white);
       }
       .header {
@@ -20,15 +22,13 @@
       }
     </style>
 
-    <template is='dom-if' if='[[header]]'>
-      <div class='header'>[[header]]</div>
+    <template is="dom-if" if="[[header]]">
+      <div class="header">[[header]]</div>
     </template>
     <slot></slot>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaCard extends Polymer.Element {
   static get is() { return 'ha-card'; }
 
   static get properties() {
@@ -36,17 +36,8 @@ class HaCard extends Polymer.Element {
       header: {
         type: String,
       },
-      /**
-       * The z-depth of the card, from 0-5.
-       */
-      elevation: {
-        type: Number,
-        value: 1,
-        reflectToAttribute: true,
-      },
     };
   }
 }
 
 customElements.define(HaCard.is, HaCard);
-</script>
diff --git a/src/components/ha-cards.html b/src/components/ha-cards.js
similarity index 86%
rename from src/components/ha-cards.html
rename to src/components/ha-cards.js
index e951eb5b75..1637f7bf34 100644
--- a/src/components/ha-cards.html
+++ b/src/components/ha-cards.js
@@ -1,84 +1,14 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/polymer/lib/utils/debounce.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { timeOut } from '@polymer/polymer/lib/utils/async.js';
+import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../cards/ha-badges-card.js';
+import '../cards/ha-card-chooser.js';
+import '../util/hass-util.js';
+import './ha-demo-badge.js';
 
-<link rel="import" href="./ha-demo-badge.html">
-<link rel="import" href="../cards/ha-badges-card.html">
-<link rel="import" href="../cards/ha-card-chooser.html">
-
-<link rel="import" href="../util/hass-util.html">
-
-<dom-module id="ha-cards">
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-factors"></style>
-    <style>
-      :host {
-        display: block;
-        padding-top: 8px;
-        padding-right: 8px;
-        transform: translateZ(0);
-        position: relative;
-      }
-
-      .badges {
-        font-size: 85%;
-        text-align: center;
-      }
-
-      .column {
-        max-width: 500px;
-        overflow-x: hidden;
-      }
-
-      ha-card-chooser {
-        display: block;
-        margin-left: 8px;
-        margin-bottom: 8px;
-      }
-
-      @media (max-width: 500px) {
-        :host {
-          padding-right: 0;
-        }
-
-        ha-card-chooser {
-          margin-left: 0;
-        }
-      }
-
-      @media (max-width: 599px) {
-        .column {
-          max-width: 600px;
-        }
-      }
-    </style>
-
-    <div id='main'>
-      <template is='dom-if' if='[[cards.badges]]'>
-        <div class='badges'>
-          <template is='dom-if' if='[[cards.demo]]'>
-            <ha-demo-badge></ha-demo-badge>
-          </template>
-
-          <ha-badges-card states='[[cards.badges]]' hass='[[hass]]'></ha-badges-card>
-        </div>
-      </template>
-
-      <div class='horizontal layout center-justified'>
-        <template is='dom-repeat' items='[[cards.columns]]' as='column'>
-          <div class='column flex-1'>
-            <template is='dom-repeat' items='[[column]]' as='card'>
-              <ha-card-chooser card-data='[[card]]'></ha-card-chooser>
-            </template>
-          </div>
-        </template>
-    </div>
-  </template>
-
-</dom-module>
-
-<script>
 {
   // mapping domain to size of the card.
   const DOMAINS_WITH_CARD = {
@@ -145,7 +75,76 @@
 
   const computeDomain = window.hassUtil.computeDomain;
 
-  class HaCards extends Polymer.Element {
+  class HaCards extends PolymerElement {
+    static get template() {
+      return html`
+    <style is="custom-style" include="iron-flex iron-flex-factors"></style>
+    <style>
+      :host {
+        display: block;
+        padding-top: 8px;
+        padding-right: 8px;
+        transform: translateZ(0);
+        position: relative;
+      }
+
+      .badges {
+        font-size: 85%;
+        text-align: center;
+      }
+
+      .column {
+        max-width: 500px;
+        overflow-x: hidden;
+      }
+
+      ha-card-chooser {
+        display: block;
+        margin-left: 8px;
+        margin-bottom: 8px;
+      }
+
+      @media (max-width: 500px) {
+        :host {
+          padding-right: 0;
+        }
+
+        ha-card-chooser {
+          margin-left: 0;
+        }
+      }
+
+      @media (max-width: 599px) {
+        .column {
+          max-width: 600px;
+        }
+      }
+    </style>
+
+    <div id="main">
+      <template is="dom-if" if="[[cards.badges]]">
+        <div class="badges">
+          <template is="dom-if" if="[[cards.demo]]">
+            <ha-demo-badge></ha-demo-badge>
+          </template>
+
+          <ha-badges-card states="[[cards.badges]]" hass="[[hass]]"></ha-badges-card>
+        </div>
+      </template>
+
+      <div class="horizontal layout center-justified">
+        <template is="dom-repeat" items="[[cards.columns]]" as="column">
+          <div class="column flex-1">
+            <template is="dom-repeat" items="[[column]]" as="card">
+              <ha-card-chooser card-data="[[card]]"></ha-card-chooser>
+            </template>
+          </div>
+        </template>
+    </div>
+  </div>
+`;
+    }
+
     static get is() { return 'ha-cards'; }
     static get properties() {
       return {
@@ -192,9 +191,9 @@
       } else if (!this.$.main.parentNode && this.$.main._parentNode) {
         this.$.main._parentNode.appendChild(this.$.main);
       }
-      this._debouncer = Polymer.Debouncer.debounce(
+      this._debouncer = Debouncer.debounce(
         this._debouncer,
-        Polymer.Async.timeOut.after(10),
+        timeOut.after(10),
         () => {
           // Things might have changed since it got scheduled.
           if (this.panelVisible && this.viewVisible) {
@@ -367,4 +366,3 @@
   }
   customElements.define(HaCards.is, HaCards);
 }
-</script>
diff --git a/src/components/ha-climate-control.html b/src/components/ha-climate-control.js
similarity index 86%
rename from src/components/ha-climate-control.html
rename to src/components/ha-climate-control.js
index 7ce1dcb9ca..97e641b3d5 100644
--- a/src/components/ha-climate-control.html
+++ b/src/components/ha-climate-control.js
@@ -1,11 +1,13 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../util/hass-mixins.html'>
+import '../util/hass-mixins.js';
 
-<dom-module id="ha-climate-control">
-  <template>
+class HaClimateControl extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       /* local DOM styles go here */
@@ -43,10 +45,9 @@
         <paper-icon-button icon="mdi:chevron-down" on-click="decrementValue"></paper-icon-button>
       </div>
     </div>
-  </template>
-</dom-module>
-<script>
-class HaClimateControl extends window.hassMixins.EventsMixin(Polymer.Element) {
+`;
+  }
+
   static get is() { return 'ha-climate-control'; }
 
   static get properties() {
@@ -123,4 +124,3 @@ class HaClimateControl extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaClimateControl.is, HaClimateControl);
-</script>
diff --git a/src/components/ha-climate-state.html b/src/components/ha-climate-state.js
similarity index 87%
rename from src/components/ha-climate-state.html
rename to src/components/ha-climate-state.js
index 962b054298..eab9ada201 100644
--- a/src/components/ha-climate-state.html
+++ b/src/components/ha-climate-state.js
@@ -1,7 +1,9 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="ha-climate-state">
-  <template>
+class HaClimateState extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       :host {
         display: flex;
@@ -24,23 +26,21 @@
       }
     </style>
 
-    <div class='target'>
+    <div class="target">
       <span class="state-label">
         [[stateObj.state]]
       </span>
       [[computeTarget(stateObj)]]
     </div>
 
-    <template is='dom-if' if='[[currentStatus]]'>
-      <div class='current'>
+    <template is="dom-if" if="[[currentStatus]]">
+      <div class="current">
         Currently: [[currentStatus]]
       </div>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaClimateState extends Polymer.Element {
   static get is() { return 'ha-climate-state'; }
 
   static get properties() {
@@ -81,4 +81,3 @@ class HaClimateState extends Polymer.Element {
   }
 }
 customElements.define(HaClimateState.is, HaClimateState);
-</script>
diff --git a/src/components/ha-color-picker.html b/src/components/ha-color-picker.js
similarity index 97%
rename from src/components/ha-color-picker.html
rename to src/components/ha-color-picker.js
index 4154b4a91b..be1ddefaf5 100644
--- a/src/components/ha-color-picker.html
+++ b/src/components/ha-color-picker.js
@@ -1,9 +1,14 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../util/hass-mixins.js';
 
-<dom-module id='ha-color-picker'>
-  <template>
+/**
+ * Color-picker custom element
+ */
+class HaColorPicker extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       :host {
         user-select: none;
@@ -55,29 +60,24 @@
       }
 
     </style>
-    <div id='canvas'>
-      <svg id='interactionLayer'>
+    <div id="canvas">
+      <svg id="interactionLayer">
         <defs>
           <filter id="marker-shadow" x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox">
-             <feOffset result="offOut" in="SourceAlpha" dx="2" dy="2" />
-             <feGaussianBlur result="blurOut" in="offOut" stdDeviation="2" />
+             <feOffset result="offOut" in="SourceAlpha" dx="2" dy="2"></feOffset>
+             <feGaussianBlur result="blurOut" in="offOut" stdDeviation="2"></feGaussianBlur>
              <feComponentTransfer in="blurOut" result="alphaOut">
-               <feFuncA type="linear" slope="0.3" />
+               <feFuncA type="linear" slope="0.3"></feFuncA>
              </feComponentTransfer>
-             <feBlend in="SourceGraphic" in2="alphaOut" mode="normal" />
+             <feBlend in="SourceGraphic" in2="alphaOut" mode="normal"></feBlend>
           </filter>
         </defs>
       </svg>
-      <canvas id='backgroundLayer'></canvas>
+      <canvas id="backgroundLayer"></canvas>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/**
- * Color-picker custom element
- */
-class HaColorPicker extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-color-picker'; }
 
   static get properties() {
@@ -526,4 +526,3 @@ class HaColorPicker extends window.hassMixins.EventsMixin(Polymer.Element) {
   }
 }
 customElements.define(HaColorPicker.is, HaColorPicker);
-</script>
diff --git a/src/components/ha-combo-box.html b/src/components/ha-combo-box.js
similarity index 52%
rename from src/components/ha-combo-box.html
rename to src/components/ha-combo-box.js
index 4f5e5e9c06..9a0ada87ce 100644
--- a/src/components/ha-combo-box.html
+++ b/src/components/ha-combo-box.js
@@ -1,11 +1,13 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/vaadin-combo-box/vaadin-combo-box-light.html">
-<link rel="import" href="../../bower_components/paper-item/paper-item.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-item.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import '@vaadin/vaadin-combo-box/vaadin-combo-box-light.js';
 
-<dom-module id="ha-combo-box">
-  <template>
+class HaComboBox extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       paper-input > paper-icon-button {
         width: 24px;
@@ -17,32 +19,10 @@
         display: none;
       }
     </style>
-    <vaadin-combo-box-light
-      items='[[_items]]'
-      item-value-path='[[itemValuePath]]'
-      item-label-path='[[itemLabelPath]]'
-      value='{{value}}'
-      opened='{{opened}}'
-      allow-custom-value='[[allowCustomValue]]'
-    >
-      <paper-input
-        autofocus="[[autofocus]]"
-        label="[[label]]"
-        class="input"
-        value='[[value]]'
-      >
-        <paper-icon-button
-          slot="suffix"
-          class="clear-button"
-          icon="mdi:close"
-          hidden$='[[!value]]'
-        >Clear</paper-icon-button>
-        <paper-icon-button
-          slot="suffix"
-          class="toggle-button"
-          icon='[[_computeToggleIcon(opened)]]'
-          hidden$='[[!items.length]]'
-          >Toggle</paper-icon-button>
+    <vaadin-combo-box-light items="[[_items]]" item-value-path="[[itemValuePath]]" item-label-path="[[itemLabelPath]]" value="{{value}}" opened="{{opened}}" allow-custom-value="[[allowCustomValue]]">
+      <paper-input autofocus="[[autofocus]]" label="[[label]]" class="input" value="[[value]]">
+        <paper-icon-button slot="suffix" class="clear-button" icon="mdi:close" hidden\$="[[!value]]">Clear</paper-icon-button>
+        <paper-icon-button slot="suffix" class="toggle-button" icon="[[_computeToggleIcon(opened)]]" hidden\$="[[!items.length]]">Toggle</paper-icon-button>
       </paper-input>
       <template>
         <style>
@@ -53,11 +33,9 @@
         <paper-item>[[_computeItemLabel(item, itemLabelPath)]]</paper-item>
       </template>
     </vaadin-combo-box-light>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaComboBox extends Polymer.Element {
   static get is() { return 'ha-combo-box'; }
 
   static get properties() {
@@ -106,4 +84,3 @@ class HaComboBox extends Polymer.Element {
 }
 
 customElements.define(HaComboBox.is, HaComboBox);
-</script>
diff --git a/src/components/ha-cover-controls.html b/src/components/ha-cover-controls.js
similarity index 56%
rename from src/components/ha-cover-controls.html
rename to src/components/ha-cover-controls.js
index a3459e592f..c429654142 100644
--- a/src/components/ha-cover-controls.html
+++ b/src/components/ha-cover-controls.js
@@ -1,10 +1,12 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../util/cover-model.html">
+import '../util/cover-model.js';
 
-<dom-module id="ha-cover-controls">
-  <template>
+class HaCoverControls extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       .state {
         white-space: nowrap;
@@ -14,21 +16,14 @@
       }
     </style>
 
-    <div class='state'>
-      <paper-icon-button icon="mdi:arrow-up" on-click='onOpenTap'
-        invisible$='[[!entityObj.supportsOpen]]'
-        disabled='[[computeOpenDisabled(stateObj, entityObj)]]'></paper-icon-button>
-      <paper-icon-button icon="mdi:stop" on-click='onStopTap'
-        invisible$='[[!entityObj.supportsStop]]'></paper-icon-button>
-      <paper-icon-button icon="mdi:arrow-down" on-click='onCloseTap'
-        invisible$='[[!entityObj.supportsClose]]'
-        disabled='[[computeClosedDisabled(stateObj, entityObj)]]'></paper-icon-button>
+    <div class="state">
+      <paper-icon-button icon="mdi:arrow-up" on-click="onOpenTap" invisible\$="[[!entityObj.supportsOpen]]" disabled="[[computeOpenDisabled(stateObj, entityObj)]]"></paper-icon-button>
+      <paper-icon-button icon="mdi:stop" on-click="onStopTap" invisible\$="[[!entityObj.supportsStop]]"></paper-icon-button>
+      <paper-icon-button icon="mdi:arrow-down" on-click="onCloseTap" invisible\$="[[!entityObj.supportsClose]]" disabled="[[computeClosedDisabled(stateObj, entityObj)]]"></paper-icon-button>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaCoverControls extends Polymer.Element {
   static get is() { return 'ha-cover-controls'; }
 
   static get properties() {
@@ -71,4 +66,3 @@ class HaCoverControls extends Polymer.Element {
 }
 
 customElements.define(HaCoverControls.is, HaCoverControls);
-</script>
diff --git a/src/components/ha-cover-tilt-controls.html b/src/components/ha-cover-tilt-controls.js
similarity index 54%
rename from src/components/ha-cover-tilt-controls.html
rename to src/components/ha-cover-tilt-controls.js
index f751964791..3e9b04f6a9 100644
--- a/src/components/ha-cover-tilt-controls.html
+++ b/src/components/ha-cover-tilt-controls.js
@@ -1,12 +1,13 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
+import '../util/cover-model.js';
 
-<link rel='import' href='../util/cover-model.html'>
-
-<dom-module id='ha-cover-tilt-controls'>
-  <template>
+class HaCoverTiltControls extends PolymerElement {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex"></style>
     <style>
       :host {
@@ -16,22 +17,12 @@
         visibility: hidden !important;
       }
     </style>
-    <paper-icon-button icon="mdi:arrow-top-right" 
-      on-click='onOpenTiltTap' title='Open tilt'
-      invisible$='[[!entityObj.supportsOpenTilt]]'
-      disabled='[[computeOpenDisabled(stateObj, entityObj)]]'></paper-icon-button>
-    <paper-icon-button icon="mdi:stop" on-click='onStopTiltTap'
-      invisible$='[[!entityObj.supportsStopTilt]]'
-      title='Stop tilt'></paper-icon-button>
-    <paper-icon-button icon="mdi:arrow-bottom-left"
-      on-click='onCloseTiltTap' title='Close tilt'
-      invisible$='[[!entityObj.supportsCloseTilt]]'
-      disabled='[[computeClosedDisabled(stateObj, entityObj)]]'></paper-icon-button>
-  </template>
-</dom-module>
+    <paper-icon-button icon="mdi:arrow-top-right" on-click="onOpenTiltTap" title="Open tilt" invisible\$="[[!entityObj.supportsOpenTilt]]" disabled="[[computeOpenDisabled(stateObj, entityObj)]]"></paper-icon-button>
+    <paper-icon-button icon="mdi:stop" on-click="onStopTiltTap" invisible\$="[[!entityObj.supportsStopTilt]]" title="Stop tilt"></paper-icon-button>
+    <paper-icon-button icon="mdi:arrow-bottom-left" on-click="onCloseTiltTap" title="Close tilt" invisible\$="[[!entityObj.supportsCloseTilt]]" disabled="[[computeClosedDisabled(stateObj, entityObj)]]"></paper-icon-button>
+`;
+  }
 
-<script>
-class HaCoverTiltControls extends Polymer.Element {
   static get is() { return 'ha-cover-tilt-controls'; }
 
   static get properties() {
@@ -74,4 +65,3 @@ class HaCoverTiltControls extends Polymer.Element {
 }
 
 customElements.define(HaCoverTiltControls.is, HaCoverTiltControls);
-</script>
diff --git a/src/components/ha-demo-badge.html b/src/components/ha-demo-badge.html
deleted file mode 100644
index cf91b895b1..0000000000
--- a/src/components/ha-demo-badge.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-
-<link rel='import' href='./ha-label-badge.html'>
-
-<dom-module id='ha-demo-badge'>
-  <template>
-    <style>
-      :host {
-        --ha-label-badge-color: #dac90d;
-      }
-    </style>
-
-    <ha-label-badge
-      icon='mdi:emoticon'
-      label='Demo'
-      description=''
-    ></ha-label-badge>
-  </template>
-</dom-module>
-
-<script>
-class HaDemoBadge extends Polymer.Element {
-  static get is() { return 'ha-demo-badge'; }
-}
-
-customElements.define(HaDemoBadge.is, HaDemoBadge);
-</script>
diff --git a/src/components/ha-demo-badge.js b/src/components/ha-demo-badge.js
new file mode 100644
index 0000000000..38e98e1166
--- /dev/null
+++ b/src/components/ha-demo-badge.js
@@ -0,0 +1,22 @@
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import './ha-label-badge.js';
+
+class HaDemoBadge extends PolymerElement {
+  static get template() {
+    return html`
+    <style>
+      :host {
+        --ha-label-badge-color: #dac90d;
+      }
+    </style>
+
+    <ha-label-badge icon="mdi:emoticon" label="Demo" description=""></ha-label-badge>
+`;
+  }
+
+  static get is() { return 'ha-demo-badge'; }
+}
+
+customElements.define(HaDemoBadge.is, HaDemoBadge);
diff --git a/src/components/ha-form.html b/src/components/ha-form.html
deleted file mode 100644
index c2e2fba804..0000000000
--- a/src/components/ha-form.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<link rel="import" href='../../bower_components/polymer/polymer-element.html'>
-
-<link rel="import" href='../../bower_components/paper-input/paper-input.html'>
-<link rel="import" href='../../bower_components/paper-checkbox/paper-checkbox.html'>
-<link rel='import' href='../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html'>
-<link rel='import' href='../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../bower_components/paper-item/paper-item.html'>
-
-<link rel='import' href='../util/hass-mixins.html'>
-<link rel="import" href='./ha-paper-slider.html'>
-
-
-<dom-module id="ha-form">
-  <template>
-    <style>
-      .error {
-        color: red;
-      }
-    </style>
-    <template is='dom-if' if='[[_isArray(schema)]]' restamp>
-      <template is='dom-if' if='[[error.base]]'>
-          [[computeError(error.base, schema)]]
-      </template>
-
-      <template is='dom-repeat' items='[[schema]]'>
-        <ha-form
-          data='[[_getValue(data, item)]]'
-          schema='[[item]]'
-          error='[[_getValue(error, item)]]'
-          on-data-changed='_valueChanged'
-          compute-label='[[computeLabel]]'
-          compute-error='[[computeError]]'
-        ></ha-form>
-      </template>
-    </template>
-    <template is='dom-if' if='[[!_isArray(schema)]]' restamp>
-      <template is='dom-if' if='[[error]]'>
-        <div class='error'>[[computeError(error, schema)]]</div>
-      </template>
-
-      <template is='dom-if' if='[[_equals(schema.type, "string")]]' restamp>
-        <paper-input
-          label='[[computeLabel(schema)]]'
-          value='{{data}}'
-        ></paper-input>
-      </template>
-
-      <template is='dom-if' if='[[_equals(schema.type, "integer")]]' restamp>
-        <template is='dom-if' if='[[_isRange(schema)]]' restamp>
-          <div>
-            [[computeLabel(schema)]]
-            <ha-paper-slider
-              pin
-              value='{{data}}'
-              min='[[schema.valueMin]]'
-              max='[[schema.valueMax]]'
-            ></ha-paper-slider>
-          </div>
-        </template>
-        <template is='dom-if' if='[[!_isRange(schema)]]' restamp>
-          <paper-input
-            label='[[computeLabel(schema)]]'
-            value='{{data}}'
-            type='number'
-          ></paper-input>
-        </template>
-      </template>
-
-      <template is='dom-if' if='[[_equals(schema.type, "float")]]' restamp>
-        <!--TODO-->
-        <paper-input
-          label='[[computeLabel(schema)]]'
-          value='{{data}}'
-        ></paper-input>
-      </template>
-
-      <template is='dom-if' if='[[_equals(schema.type, "boolean")]]' restamp>
-        <paper-checkbox
-          checked='{{data}}'
-        >[[computeLabel(schema)]]</paper-checkbox>
-      </template>
-
-      <template is='dom-if' if='[[_equals(schema.type, "select")]]' restamp>
-        <paper-dropdown-menu label='[[computeLabel(schema)]]'>
-          <paper-listbox
-            slot="dropdown-content"
-            attr-for-selected="item-name"
-            selected="{{data}}"
-          >
-            <template is='dom-repeat'
-                      items='[[schema.options]]'>
-              <paper-item item-name$='[[item]]'>[[item]]</paper-item>
-            </template>
-          </paper-listbox>
-        </paper-dropdown-menu>
-      </template>
-
-    </template>
-  </template>
-</dom-module>
-
-<script>
-class HaForm extends window.hassMixins.EventsMixin(Polymer.Element) {
-  static get is() { return 'ha-form'; }
-
-  static get properties() {
-    return {
-      data: {
-        type: Object,
-        notify: true,
-      },
-      schema: Object,
-      error: Object,
-
-      // A function that will computes the label to be displayed for a given
-      // schema object.
-      computeLabel: {
-        type: Function,
-        value: () => schema => schema && schema.name,
-      },
-
-      // A function that will computes an error message to be displayed for a
-      // given error ID, and relevant schema object
-      computeError: {
-        type: Function,
-        value: () => (error, schema) => error, // eslint-disable-line no-unused-vars
-      },
-    };
-  }
-
-  _isArray(val) {
-    return Array.isArray(val);
-  }
-
-  _isRange(schema) {
-    return ('valueMin' in schema) && ('valueMax' in schema);
-  }
-
-  _equals(a, b) {
-    return a === b;
-  }
-
-  _getValue(obj, item) {
-    return obj[item.name];
-  }
-
-  _valueChanged(ev) {
-    this.set(['data', ev.model.item.name], ev.detail.value);
-  }
-}
-
-customElements.define(HaForm.is, HaForm);
-</script>
diff --git a/src/components/ha-form.js b/src/components/ha-form.js
new file mode 100644
index 0000000000..311160dae9
--- /dev/null
+++ b/src/components/ha-form.js
@@ -0,0 +1,121 @@
+import '@polymer/paper-checkbox/paper-checkbox.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../util/hass-mixins.js';
+import './ha-paper-slider.js';
+
+class HaForm extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style>
+      .error {
+        color: red;
+      }
+    </style>
+    <template is="dom-if" if="[[_isArray(schema)]]" restamp="">
+      <template is="dom-if" if="[[error.base]]">
+          [[computeError(error.base, schema)]]
+      </template>
+
+      <template is="dom-repeat" items="[[schema]]">
+        <ha-form data="[[_getValue(data, item)]]" schema="[[item]]" error="[[_getValue(error, item)]]" on-data-changed="_valueChanged" compute-label="[[computeLabel]]" compute-error="[[computeError]]"></ha-form>
+      </template>
+    </template>
+    <template is="dom-if" if="[[!_isArray(schema)]]" restamp="">
+      <template is="dom-if" if="[[error]]">
+        <div class="error">[[computeError(error, schema)]]</div>
+      </template>
+
+      <template is="dom-if" if="[[_equals(schema.type, &quot;string&quot;)]]" restamp="">
+        <paper-input label="[[computeLabel(schema)]]" value="{{data}}"></paper-input>
+      </template>
+
+      <template is="dom-if" if="[[_equals(schema.type, &quot;integer&quot;)]]" restamp="">
+        <template is="dom-if" if="[[_isRange(schema)]]" restamp="">
+          <div>
+            [[computeLabel(schema)]]
+            <ha-paper-slider pin="" value="{{data}}" min="[[schema.valueMin]]" max="[[schema.valueMax]]"></ha-paper-slider>
+          </div>
+        </template>
+        <template is="dom-if" if="[[!_isRange(schema)]]" restamp="">
+          <paper-input label="[[computeLabel(schema)]]" value="{{data}}" type="number"></paper-input>
+        </template>
+      </template>
+
+      <template is="dom-if" if="[[_equals(schema.type, &quot;float&quot;)]]" restamp="">
+        <!--TODO-->
+        <paper-input label="[[computeLabel(schema)]]" value="{{data}}"></paper-input>
+      </template>
+
+      <template is="dom-if" if="[[_equals(schema.type, &quot;boolean&quot;)]]" restamp="">
+        <paper-checkbox checked="{{data}}">[[computeLabel(schema)]]</paper-checkbox>
+      </template>
+
+      <template is="dom-if" if="[[_equals(schema.type, &quot;select&quot;)]]" restamp="">
+        <paper-dropdown-menu label="[[computeLabel(schema)]]">
+          <paper-listbox slot="dropdown-content" attr-for-selected="item-name" selected="{{data}}">
+            <template is="dom-repeat" items="[[schema.options]]">
+              <paper-item item-name\$="[[item]]">[[item]]</paper-item>
+            </template>
+          </paper-listbox>
+        </paper-dropdown-menu>
+      </template>
+
+    </template>
+`;
+  }
+
+  static get is() { return 'ha-form'; }
+
+  static get properties() {
+    return {
+      data: {
+        type: Object,
+        notify: true,
+      },
+      schema: Object,
+      error: Object,
+
+      // A function that will computes the label to be displayed for a given
+      // schema object.
+      computeLabel: {
+        type: Function,
+        value: () => schema => schema && schema.name,
+      },
+
+      // A function that will computes an error message to be displayed for a
+      // given error ID, and relevant schema object
+      computeError: {
+        type: Function,
+        value: () => (error, schema) => error, // eslint-disable-line no-unused-vars
+      },
+    };
+  }
+
+  _isArray(val) {
+    return Array.isArray(val);
+  }
+
+  _isRange(schema) {
+    return ('valueMin' in schema) && ('valueMax' in schema);
+  }
+
+  _equals(a, b) {
+    return a === b;
+  }
+
+  _getValue(obj, item) {
+    return obj[item.name];
+  }
+
+  _valueChanged(ev) {
+    this.set(['data', ev.model.item.name], ev.detail.value);
+  }
+}
+
+customElements.define(HaForm.is, HaForm);
diff --git a/src/components/ha-iconset-svg.js b/src/components/ha-iconset-svg.js
new file mode 100644
index 0000000000..73b991f382
--- /dev/null
+++ b/src/components/ha-iconset-svg.js
@@ -0,0 +1,35 @@
+import '@polymer/iron-iconset-svg/iron-iconset-svg.js';
+
+const IronIconsetClass = customElements.get('iron-iconset-svg');
+
+class HaIconset extends IronIconsetClass {
+  /**
+   * Fire 'iron-iconset-added' event at next microtask.
+   */
+  _fireIronIconsetAdded() {
+    this.async(function () {
+      this.fire('iron-iconset-added', this, { node: window });
+    });
+  }
+
+  /**
+   *
+   * When name is changed, register iconset metadata
+   *
+   */
+  _nameChanged() {
+    this._meta.value = null;
+    this._meta.key = this.name;
+    this._meta.value = this;
+    if (this.ownerDocument && this.ownerDocument.readyState === 'loading') {
+      // Document still loading. It could be that not all icons in the iconset are parsed yet.
+      this.ownerDocument.addEventListener('DOMContentLoaded', function () {
+        this._fireIronIconsetAdded();
+      }.bind(this));
+    } else {
+      this._fireIronIconsetAdded();
+    }
+  }
+}
+
+customElements.define('ha-iconset-svg', HaIconset);
diff --git a/src/components/ha-label-badge.html b/src/components/ha-label-badge.js
similarity index 81%
rename from src/components/ha-label-badge.html
rename to src/components/ha-label-badge.js
index dd9c9f25cc..c70f0ba3aa 100644
--- a/src/components/ha-label-badge.html
+++ b/src/components/ha-label-badge.js
@@ -1,8 +1,10 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='ha-label-badge'>
-  <template>
+class HaLabelBadge extends PolymerElement {
+  static get template() {
+    return html`
     <style>
     .badge-container {
       display: inline-block;
@@ -78,23 +80,21 @@
     }
     </style>
 
-    <div class='badge-container'>
-      <div class='label-badge' id='badge'>
-        <div class$='[[computeValueClasses(value)]]'>
-          <iron-icon icon='[[icon]]' hidden$='[[computeHideIcon(icon, value, image)]]'></iron-icon>
-          <span hidden$='[[computeHideValue(value, image)]]'>[[value]]</span>
+    <div class="badge-container">
+      <div class="label-badge" id="badge">
+        <div class\$="[[computeValueClasses(value)]]">
+          <iron-icon icon="[[icon]]" hidden\$="[[computeHideIcon(icon, value, image)]]"></iron-icon>
+          <span hidden\$="[[computeHideValue(value, image)]]">[[value]]</span>
         </div>
-        <div hidden$='[[computeHideLabel(label)]]' class$='[[computeLabelClasses(label)]]'>
+        <div hidden\$="[[computeHideLabel(label)]]" class\$="[[computeLabelClasses(label)]]">
           <span>[[label]]</span>
         </div>
       </div>
-      <div class='title' hidden$='[[!description]]'>[[description]]</div>
+      <div class="title" hidden\$="[[!description]]">[[description]]</div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaLabelBadge extends Polymer.Element {
   static get is() { return 'ha-label-badge'; }
   static get properties() {
     return {
@@ -135,4 +135,3 @@ class HaLabelBadge extends Polymer.Element {
   }
 }
 customElements.define(HaLabelBadge.is, HaLabelBadge);
-</script>
diff --git a/src/components/ha-labeled-slider.html b/src/components/ha-labeled-slider.js
similarity index 59%
rename from src/components/ha-labeled-slider.html
rename to src/components/ha-labeled-slider.js
index 0f39600a72..84f7704570 100644
--- a/src/components/ha-labeled-slider.html
+++ b/src/components/ha-labeled-slider.js
@@ -1,9 +1,12 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
-<link rel="import" href='./ha-paper-slider.html'>
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='ha-labeled-slider'>
-  <template>
+import './ha-paper-slider.js';
+
+class HaLabeledSlider extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       :host {
         display: block;
@@ -30,17 +33,15 @@
       }
     </style>
 
-    <div class='title'>[[caption]]</div>
-    <iron-icon icon='[[icon]]'></iron-icon>
-    <div class='slider-container'>
-      <ha-paper-slider min='[[min]]' max='[[max]]' value='{{value}}' ignore-bar-touch='[[ignoreBarTouch]]'>
+    <div class="title">[[caption]]</div>
+    <iron-icon icon="[[icon]]"></iron-icon>
+    <div class="slider-container">
+      <ha-paper-slider min="[[min]]" max="[[max]]" value="{{value}}" ignore-bar-touch="[[ignoreBarTouch]]">
       </ha-paper-slider>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaLabeledSlider extends Polymer.Element {
   static get is() { return 'ha-labeled-slider'; }
 
   static get properties() {
@@ -60,4 +61,3 @@ class HaLabeledSlider extends Polymer.Element {
 }
 
 customElements.define(HaLabeledSlider.is, HaLabeledSlider);
-</script>
diff --git a/src/components/ha-markdown.html b/src/components/ha-markdown.js
similarity index 77%
rename from src/components/ha-markdown.html
rename to src/components/ha-markdown.js
index 74a1d4d6d5..2b8818a596 100644
--- a/src/components/ha-markdown.html
+++ b/src/components/ha-markdown.js
@@ -1,12 +1,12 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import '../util/hass-mixins.js';
 
-<link rel='import' href='../util/hass-mixins.html'>
+let loaded = null;
 
-<script>
 /*
  * @appliesMixin window.hassMixins.EventsMixin
  */
-class HaMarkdown extends window.hassMixins.EventsMixin(Polymer.Element) {
+class HaMarkdown extends window.hassMixins.EventsMixin(PolymerElement) {
   static get is() { return 'ha-markdown'; }
 
   static get properties() {
@@ -24,11 +24,13 @@ class HaMarkdown extends window.hassMixins.EventsMixin(Polymer.Element) {
     this._renderScheduled = false;
     this._resize = () => this.fire('iron-resize');
 
-    Polymer.importHref(
-      '/static/markdown-js.html',
-      () => { this._scriptLoaded = 1; this._render(); },
-      () => { this._scriptLoaded = 2; this._render(); },
-    );
+    if (!loaded) {
+      loaded = import(/* webpackChunkName: "load_markdown" */ '../resources/load_markdown.js');
+    }
+    loaded.then(
+      () => { this._scriptLoaded = 1; },
+      () => { this._scriptLoaded = 2; },
+    ).then(() => this._render());
   }
 
   _render() {
@@ -71,4 +73,3 @@ class HaMarkdown extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaMarkdown.is, HaMarkdown);
-</script>
diff --git a/src/components/ha-menu-button.html b/src/components/ha-menu-button.js
similarity index 56%
rename from src/components/ha-menu-button.html
rename to src/components/ha-menu-button.js
index 2777b8bc5d..f6381562dc 100644
--- a/src/components/ha-menu-button.html
+++ b/src/components/ha-menu-button.js
@@ -1,25 +1,21 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../util/hass-mixins.js';
 
-<dom-module id='ha-menu-button'>
-  <template>
+class HaMenuButton extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       .invisible {
         visibility: hidden;
       }
     </style>
-    <paper-icon-button
-      icon='mdi:menu'
-      class$='[[computeMenuButtonClass(narrow, showMenu)]]'
-      on-click='toggleMenu'
-    ></paper-icon-button>
-  </template>
-</dom-module>
+    <paper-icon-button icon="mdi:menu" class\$="[[computeMenuButtonClass(narrow, showMenu)]]" on-click="toggleMenu"></paper-icon-button>
+`;
+  }
 
-<script>
-class HaMenuButton extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-menu-button'; }
 
   static get properties() {
@@ -47,4 +43,3 @@ class HaMenuButton extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(HaMenuButton.is, HaMenuButton);
-</script>
diff --git a/src/components/ha-paper-slider.html b/src/components/ha-paper-slider.js
similarity index 52%
rename from src/components/ha-paper-slider.html
rename to src/components/ha-paper-slider.js
index 516a516576..6572c23281 100644
--- a/src/components/ha-paper-slider.html
+++ b/src/components/ha-paper-slider.js
@@ -1,9 +1,12 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/paper-slider/paper-slider.html">
+import '@polymer/paper-slider/paper-slider.js';
+import { DomModule } from '@polymer/polymer/lib/elements/dom-module.js';
+import '@polymer/polymer/polymer-legacy.js';
 
+const documentContainer = document.createElement('template');
+documentContainer.setAttribute('style', 'display: none;');
 
-<dom-module id="ha-paper-slider">
-  <template strip-whitespace>
+documentContainer.innerHTML = `<dom-module id="ha-paper-slider">
+  <template strip-whitespace="">
     <style include="paper-slider">
       .pin > .slider-knob > .slider-knob-inner {
         font-size:  var(--ha-paper-slider-pin-font-size, 10px);
@@ -53,36 +56,36 @@
     </style>
   </template>
 
-  <script>
-    'use strict';
 
-    {
-      /**
-      * @polymer
-      * @customElement
-      * @appliesMixin paper-slider
-      */
-      const PaperSliderClass = customElements.get('paper-slider');
-      let myTemplate;
+</dom-module>`;
 
-      class HaPaperSlider extends PaperSliderClass {
-        static get is() { return 'ha-paper-slider'; }
+document.head.appendChild(documentContainer.content);
 
-        static get template() {
-          if (!myTemplate) {
-            // Retrieve this element's dom-module template
-            myTemplate = Polymer.DomModule.import(HaPaperSlider.is, 'template');
-            // Clone the contents of the superclass template
-            const superTemplateContents = document.importNode(PaperSliderClass.template.content, true);
-            // Remove the style from superclass contents, we already included them in our own <style>
-            superTemplateContents.querySelector('style').remove();
-            // Insert the superclass contents
-            myTemplate.content.append(superTemplateContents);
-          }
-          return myTemplate;
-        }
+{
+  /**
+  * @polymer
+  * @customElement
+  * @appliesMixin paper-slider
+  */
+  const PaperSliderClass = customElements.get('paper-slider');
+  let myTemplate;
+
+  class HaPaperSlider extends PaperSliderClass {
+    static get is() { return 'ha-paper-slider'; }
+
+    static get template() {
+      if (!myTemplate) {
+        // Retrieve this element's dom-module template
+        myTemplate = DomModule.import(HaPaperSlider.is, 'template');
+        // Clone the contents of the superclass template
+        const superTemplateContents = document.importNode(PaperSliderClass.template.content, true);
+        // Remove the style from superclass contents, we already included them in our own <style>
+        superTemplateContents.querySelector('style').remove();
+        // Insert the superclass contents
+        myTemplate.content.append(superTemplateContents);
       }
-      customElements.define(HaPaperSlider.is, HaPaperSlider);
+      return myTemplate;
     }
-  </script>
-</dom-module>
+  }
+  customElements.define(HaPaperSlider.is, HaPaperSlider);
+}
diff --git a/src/components/ha-push-notifications-toggle.html b/src/components/ha-push-notifications-toggle.js
similarity index 86%
rename from src/components/ha-push-notifications-toggle.html
rename to src/components/ha-push-notifications-toggle.js
index bd85a282e8..d9e08d5804 100644
--- a/src/components/ha-push-notifications-toggle.html
+++ b/src/components/ha-push-notifications-toggle.js
@@ -1,20 +1,16 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-toggle-button/paper-toggle-button.html">
+import '@polymer/paper-toggle-button/paper-toggle-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../util/hass-mixins.html'>
+import '../util/hass-mixins.js';
 
-<dom-module id='ha-push-notifications-toggle'>
-  <template>
-    <paper-toggle-button
-      hidden$='[[!pushSupported]]'
-      disabled='[[loading]]'
-      checked='{{pushChecked}}'
-    ></paper-toggle-button>
-  </template>
-</dom-module>
+class HaPushNotificationsToggle extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <paper-toggle-button hidden\$="[[!pushSupported]]" disabled="[[loading]]" checked="{{pushChecked}}"></paper-toggle-button>
+`;
+  }
 
-<script>
-class HaPushNotificationsToggle extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-push-notifications-toggle'; }
 
   static get properties() {
@@ -127,4 +123,3 @@ class HaPushNotificationsToggle extends window.hassMixins.EventsMixin(Polymer.El
 }
 
 customElements.define(HaPushNotificationsToggle.is, HaPushNotificationsToggle);
-</script>
diff --git a/src/components/ha-relative-time.html b/src/components/ha-relative-time.js
similarity index 76%
rename from src/components/ha-relative-time.html
rename to src/components/ha-relative-time.js
index 742d4c6db3..fc08bbe4bd 100644
--- a/src/components/ha-relative-time.html
+++ b/src/components/ha-relative-time.js
@@ -1,7 +1,9 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<script>
-class HaRelativeTime extends Polymer.Element {
+import relativeTime from '../../js/common/datetime/relative_time.js';
+
+class HaRelativeTime extends PolymerElement {
   static get is() { return 'ha-relative-time'; }
 
   static get properties() {
@@ -51,11 +53,10 @@ class HaRelativeTime extends Polymer.Element {
   }
 
   updateRelative() {
-    var root = Polymer.dom(this);
+    var root = dom(this);
     root.innerHTML = this.parsedDateTime ?
-      window.hassUtil.relativeTime(this.parsedDateTime) : 'never';
+      relativeTime(this.parsedDateTime) : 'never';
   }
 }
 
 customElements.define(HaRelativeTime.is, HaRelativeTime);
-</script>
diff --git a/src/components/ha-service-description.html b/src/components/ha-service-description.js
similarity index 70%
rename from src/components/ha-service-description.html
rename to src/components/ha-service-description.js
index f17567fc0b..e57c4a6fab 100644
--- a/src/components/ha-service-description.html
+++ b/src/components/ha-service-description.js
@@ -1,13 +1,13 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='ha-service-description'>
-  <template>
+class HaServiceDescription extends PolymerElement {
+  static get template() {
+    return html`
     [[_getDescription(hass, domain, service)]]
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaServiceDescription extends Polymer.Element {
   static get is() { return 'ha-service-description'; }
 
   static get properties() {
@@ -28,4 +28,3 @@ class HaServiceDescription extends Polymer.Element {
 }
 
 customElements.define(HaServiceDescription.is, HaServiceDescription);
-</script>
diff --git a/src/components/ha-service-picker.html b/src/components/ha-service-picker.js
similarity index 66%
rename from src/components/ha-service-picker.html
rename to src/components/ha-service-picker.js
index 3fb1a5836f..7cb2512e1b 100644
--- a/src/components/ha-service-picker.html
+++ b/src/components/ha-service-picker.js
@@ -1,25 +1,19 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../util/hass-mixins.html">
+import '../util/hass-mixins.js';
+import './ha-combo-box.js';
 
-<link rel="import" href="./ha-combo-box.html">
-
-<dom-module id="ha-service-picker">
-  <template>
-    <ha-combo-box
-      label="[[localize('ui.components.service-picker.service')]]"
-      items='[[_services]]'
-      value='{{value}}'
-      allow-custom-value
-    ></ha-combo-box>
-  </template>
-</dom-module>
-
-<script>
 /*
  * @appliesMixin window.hassMixins.LocalizeMixin
  */
-class HaServicePicker extends window.hassMixins.LocalizeMixin(Polymer.Element) {
+class HaServicePicker extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <ha-combo-box label="[[localize('ui.components.service-picker.service')]]" items="[[_services]]" value="{{value}}" allow-custom-value=""></ha-combo-box>
+`;
+  }
+
   static get is() { return 'ha-service-picker'; }
 
   static get properties() {
@@ -58,4 +52,3 @@ class HaServicePicker extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(HaServicePicker.is, HaServicePicker);
-</script>
diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.js
similarity index 54%
rename from src/components/ha-sidebar.html
rename to src/components/ha-sidebar.js
index 57946ec062..b401224f97 100644
--- a/src/components/ha-sidebar.html
+++ b/src/components/ha-sidebar.js
@@ -1,18 +1,24 @@
-<link rel="import" href='../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
-<link rel='import' href='../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href='../../bower_components/paper-item/paper-icon-item.html'>
-<link rel='import' href='../../bower_components/paper-icon-button/paper-icon-button.html'>
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-item/paper-icon-item.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
+import '../util/hass-mixins.js';
+import '../util/hass-translation.js';
 
-<link rel='import' href='../util/hass-mixins.html'>
-<link rel='import' href='../util/hass-translation.html'>
-
-<dom-module id='ha-sidebar'>
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ * @appliesMixin window.hassMixins.EventsMixin
+ */
+class HaSidebar extends
+  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+  static get template() {
+    return html`
     <style include="iron-flex iron-flex-alignment iron-positioning">
       :host {
         --sidebar-text: {
@@ -94,73 +100,48 @@
     </style>
 
     <app-toolbar>
-      <div main-title>Home Assistant</div>
-      <paper-icon-button icon='mdi:chevron-left' hidden$='[[narrow]]' on-click='toggleMenu'></paper-icon-button>
+      <div main-title="">Home Assistant</div>
+      <paper-icon-button icon="mdi:chevron-left" hidden\$="[[narrow]]" on-click="toggleMenu"></paper-icon-button>
     </app-toolbar>
 
-    <paper-listbox attr-for-selected='data-panel' selected='[[hass.panelUrl]]'>
-      <paper-icon-item on-click='menuClicked' data-panel='states'>
-        <iron-icon slot="item-icon" icon='mdi:apps'></iron-icon>
-        <span class='item-text'>[[localize('panel.states')]]</span>
+    <paper-listbox attr-for-selected="data-panel" selected="[[hass.panelUrl]]">
+      <paper-icon-item on-click="menuClicked" data-panel="states">
+        <iron-icon slot="item-icon" icon="mdi:apps"></iron-icon>
+        <span class="item-text">[[localize('panel.states')]]</span>
       </paper-icon-item>
 
-      <template is='dom-repeat' items='[[panels]]'>
-        <paper-icon-item on-click='menuClicked' data-panel$='[[item.url_path]]'>
-          <iron-icon slot="item-icon" icon='[[item.icon]]'></iron-icon>
-          <span class='item-text'>[[computePanelName(localize, item)]]</span>
+      <template is="dom-repeat" items="[[panels]]">
+        <paper-icon-item on-click="menuClicked">
+          <iron-icon slot="item-icon" icon="[[item.icon]]"></iron-icon>
+          <span class="item-text">[[computePanelName(localize, item)]]</span>
         </paper-icon-item>
       </template>
 
-      <paper-icon-item on-click='menuClicked' data-panel='logout' class='logout'>
-        <iron-icon slot="item-icon" icon='mdi:exit-to-app'></iron-icon>
-        <span class='item-text'>[[localize('ui.sidebar.log_out')]]</span>
+      <paper-icon-item on-click="menuClicked" data-panel="logout" class="logout">
+        <iron-icon slot="item-icon" icon="mdi:exit-to-app"></iron-icon>
+        <span class="item-text">[[localize('ui.sidebar.log_out')]]</span>
       </paper-icon-item>
     </paper-listbox>
 
     <div>
-      <div class='divider'></div>
+      <div class="divider"></div>
 
-      <div class='subheader'>[[localize('ui.sidebar.developer_tools')]]</div>
+      <div class="subheader">[[localize('ui.sidebar.developer_tools')]]</div>
 
-      <div class='dev-tools layout horizontal justified'>
-        <paper-icon-button
-          icon='mdi:remote' data-panel='dev-service'
-          alt="[[localize('panel.dev-services')]]" title="[[localize('panel.dev-services')]]"
-          on-click='menuClicked'></paper-icon-button>
-        <paper-icon-button
-          icon='mdi:code-tags' data-panel='dev-state'
-          alt="[[localize('panel.dev-states')]]" title="[[localize('panel.dev-states')]]"
-          on-click='menuClicked'></paper-icon-button>
-        <paper-icon-button
-          icon='mdi:radio-tower' data-panel='dev-event'
-          alt="[[localize('panel.dev-events')]]" title="[[localize('panel.dev-events')]]"
-          on-click='menuClicked'></paper-icon-button>
-        <paper-icon-button
-          icon='mdi:file-xml' data-panel='dev-template'
-          alt="[[localize('panel.dev-templates')]]" title="[[localize('panel.dev-templates')]]"
-          on-click='menuClicked'></paper-icon-button>
-        <template is='dom-if' if='[[_mqttLoaded(hass)]]'>
-          <paper-icon-button
-            icon='mdi:altimeter' data-panel='dev-mqtt'
-            alt="[[localize('panel.dev-mqtt')]]" title="[[localize('panel.dev-mqtt')]]"
-            on-click='menuClicked'></paper-icon-button>
+      <div class="dev-tools layout horizontal justified">
+        <paper-icon-button icon="mdi:remote" data-panel="dev-service" alt="[[localize('panel.dev-services')]]" title="[[localize('panel.dev-services')]]" on-click="menuClicked"></paper-icon-button>
+        <paper-icon-button icon="mdi:code-tags" data-panel="dev-state" alt="[[localize('panel.dev-states')]]" title="[[localize('panel.dev-states')]]" on-click="menuClicked"></paper-icon-button>
+        <paper-icon-button icon="mdi:radio-tower" data-panel="dev-event" alt="[[localize('panel.dev-events')]]" title="[[localize('panel.dev-events')]]" on-click="menuClicked"></paper-icon-button>
+        <paper-icon-button icon="mdi:file-xml" data-panel="dev-template" alt="[[localize('panel.dev-templates')]]" title="[[localize('panel.dev-templates')]]" on-click="menuClicked"></paper-icon-button>
+        <template is="dom-if" if="[[_mqttLoaded(hass)]]">
+          <paper-icon-button icon="mdi:altimeter" data-panel="dev-mqtt" alt="[[localize('panel.dev-mqtt')]]" title="[[localize('panel.dev-mqtt')]]" on-click="menuClicked"></paper-icon-button>
         </template>
-        <paper-icon-button
-          icon='mdi:information-outline' data-panel='dev-info'
-          alt="[[localize('panel.dev-info')]]" title="[[localize('panel.dev-info')]]"
-          on-click='menuClicked'></paper-icon-button>
+        <paper-icon-button icon="mdi:information-outline" data-panel="dev-info" alt="[[localize('panel.dev-info')]]" title="[[localize('panel.dev-info')]]" on-click="menuClicked"></paper-icon-button>
       </div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- * @appliesMixin window.hassMixins.EventsMixin
- */
-class HaSidebar extends
-  window.hassMixins.LocalizeMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
   static get is() { return 'ha-sidebar'; }
 
   static get properties() {
@@ -230,18 +211,23 @@ class HaSidebar extends
   }
 
   menuClicked(ev) {
-    var target = ev.target;
-    var checks = 5;
-    var attr = target.getAttribute('data-panel');
-
-    // find panel to select
-    while (checks && !attr) {
-      target = target.parentElement;
-      attr = target.getAttribute('data-panel');
-      checks--;
+    // Selection made inside dom-repeat
+    if (ev.model) {
+      this.selectPanel(ev.model.item.component_name);
+      return;
     }
 
-    if (checks) {
+    let target = ev.target;
+    let checks = 5;
+    let attr;
+
+    do {
+      attr = target.getAttribute('data-panel');
+      target = target.parentElement;
+      checks--;
+    } while (checks > 0 && target !== null && !attr);
+
+    if (checks > 0 && target !== null) {
       this.selectPanel(attr);
     }
   }
@@ -268,4 +254,3 @@ class HaSidebar extends
 }
 
 customElements.define(HaSidebar.is, HaSidebar);
-</script>
diff --git a/src/components/ha-start-voice-button.html b/src/components/ha-start-voice-button.js
similarity index 57%
rename from src/components/ha-start-voice-button.html
rename to src/components/ha-start-voice-button.js
index 95bd400132..be0948ab7f 100644
--- a/src/components/ha-start-voice-button.html
+++ b/src/components/ha-start-voice-button.js
@@ -1,20 +1,16 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import '../util/hass-mixins.js';
 
-<dom-module id='ha-start-voice-button'>
-  <template>
-    <paper-icon-button
-      icon="mdi:microphone" hidden$='[[!canListen]]'
-      on-click="handleListenClick"
-    ></paper-icon-button>
+class HaStartVoiceButton extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <paper-icon-button icon="mdi:microphone" hidden\$="[[!canListen]]" on-click="handleListenClick"></paper-icon-button>
+`;
+  }
 
-  </template>
-</dom-module>
-
-<script>
-class HaStartVoiceButton extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'ha-start-voice-button'; }
 
   static get properties() {
@@ -43,4 +39,3 @@ class HaStartVoiceButton extends window.hassMixins.EventsMixin(Polymer.Element)
 }
 
 customElements.define(HaStartVoiceButton.is, HaStartVoiceButton);
-</script>
diff --git a/src/components/hassio-card-content.html b/src/components/hassio-card-content.js
similarity index 63%
rename from src/components/hassio-card-content.html
rename to src/components/hassio-card-content.js
index b126577091..6540a7e7eb 100644
--- a/src/components/hassio-card-content.html
+++ b/src/components/hassio-card-content.js
@@ -1,11 +1,13 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/iron-icon/iron-icon.html'>
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='./ha-relative-time.html'>
-<link rel='import' href='../util/hass-util.html'>
+import '../util/hass-util.js';
+import './ha-relative-time.js';
 
-<dom-module id='hassio-card-content'>
-  <template>
+class HassioCardContent extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       iron-icon {
         margin-right: 16px;
@@ -41,23 +43,21 @@
         display: block;
       }
     </style>
-    <iron-icon icon='[[icon]]' class$='[[iconClass]]' title='[[iconTitle]]'></iron-icon>
+    <iron-icon icon="[[icon]]" class\$="[[iconClass]]" title="[[iconTitle]]"></iron-icon>
     <div>
-      <div class='title'>[[title]]</div>
-      <div class='addition'>
-        <template is='dom-if' if='[[description]]'>
+      <div class="title">[[title]]</div>
+      <div class="addition">
+        <template is="dom-if" if="[[description]]">
           [[description]]
         </template>
-        <template is='dom-if' if='[[datetime]]'>
-          <ha-relative-time class='addition' datetime='[[datetime]]'></ha-relative-time>
+        <template is="dom-if" if="[[datetime]]">
+          <ha-relative-time class="addition" datetime="[[datetime]]"></ha-relative-time>
         </template>
       </div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HassioCardContent extends Polymer.Element {
   static get is() { return 'hassio-card-content'; }
 
   static get properties() {
@@ -75,4 +75,3 @@ class HassioCardContent extends Polymer.Element {
   }
 }
 customElements.define(HassioCardContent.is, HassioCardContent);
-</script>
diff --git a/src/components/state-history-chart-line.html b/src/components/state-history-chart-line.js
similarity index 93%
rename from src/components/state-history-chart-line.html
rename to src/components/state-history-chart-line.js
index 889e8351dc..32f265345e 100644
--- a/src/components/state-history-chart-line.html
+++ b/src/components/state-history-chart-line.js
@@ -1,9 +1,12 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/polymer/lib/utils/debounce.html">
-<link rel="import" href="./entity/ha-chart-base.html">
+import '@polymer/polymer/lib/utils/debounce.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='state-history-chart-line'>
-  <template>
+import './entity/ha-chart-base.js';
+
+class StateHistoryChartLine extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       :host {
         display: block;
@@ -12,16 +15,10 @@
         transition: height 0.3s ease-in-out;
       }
     </style>
-      <ha-chart-base
-        id='chart'
-        data="[[chartData]]"
-        identifier="[[identifier]]"
-        rendered="{{rendered}}"
-      ></ha-chart-base>
-  </template>
-</dom-module>
-<script>
-class StateHistoryChartLine extends Polymer.Element {
+      <ha-chart-base id="chart" data="[[chartData]]" identifier="[[identifier]]" rendered="{{rendered}}"></ha-chart-base>
+`;
+  }
+
   static get is() { return 'state-history-chart-line'; }
   static get properties() {
     return {
@@ -299,4 +296,3 @@ class StateHistoryChartLine extends Polymer.Element {
   }
 }
 customElements.define(StateHistoryChartLine.is, StateHistoryChartLine);
-</script>
diff --git a/src/components/state-history-chart-timeline.html b/src/components/state-history-chart-timeline.js
similarity index 89%
rename from src/components/state-history-chart-timeline.html
rename to src/components/state-history-chart-timeline.js
index 04288f432a..fa10572327 100644
--- a/src/components/state-history-chart-timeline.html
+++ b/src/components/state-history-chart-timeline.js
@@ -1,9 +1,12 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../bower_components/polymer/lib/utils/debounce.html">
-<link rel='import' href='./entity/ha-chart-base.html'>
+import '@polymer/polymer/lib/utils/debounce.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id='state-history-chart-timeline'>
-  <template>
+import './entity/ha-chart-base.js';
+
+class StateHistoryChartTimeline extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       :host {
         display: block;
@@ -15,16 +18,10 @@
       }
 
     </style>
-    <ha-chart-base
-      data="[[chartData]]"
-      rendered="{{rendered}}"
-    ></ha-chart-base>
-  </template>
-</dom-module>
-<script>
-'use strict';
+    <ha-chart-base data="[[chartData]]" rendered="{{rendered}}"></ha-chart-base>
+`;
+  }
 
-class StateHistoryChartTimeline extends Polymer.Element {
   static get is() { return 'state-history-chart-timeline'; }
   static get properties() {
     return {
@@ -195,5 +192,3 @@ class StateHistoryChartTimeline extends Polymer.Element {
   }
 }
 customElements.define(StateHistoryChartTimeline.is, StateHistoryChartTimeline);
-
-</script>
diff --git a/src/components/state-history-charts.html b/src/components/state-history-charts.js
similarity index 53%
rename from src/components/state-history-charts.html
rename to src/components/state-history-charts.js
index 684f2298b2..79a05955d2 100644
--- a/src/components/state-history-charts.html
+++ b/src/components/state-history-charts.js
@@ -1,11 +1,13 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-spinner/paper-spinner.html">
+import '@polymer/paper-spinner/paper-spinner.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="./state-history-chart-timeline.html">
-<link rel="import" href="./state-history-chart-line.html">
+import './state-history-chart-line.js';
+import './state-history-chart-timeline.js';
 
-<dom-module id="state-history-charts">
-  <template>
+class StateHistoryCharts extends PolymerElement {
+  static get template() {
+    return html`
     <style>
     :host {
       display: block;
@@ -18,36 +20,26 @@
       color: var(--secondary-text-color);
     }
     </style>
-    <template is='dom-if' class='info' if='[[_computeIsLoading(isLoadingData)]]'>
-      <div class='info'>Loading state history...</div>
+    <template is="dom-if" class="info" if="[[_computeIsLoading(isLoadingData)]]">
+      <div class="info">Loading state history...</div>
     </template>
 
-    <template is='dom-if' class='info' if='[[_computeIsEmpty(isLoadingData, historyData)]]'>
-      <div class='info'>No state history found.</div>
+    <template is="dom-if" class="info" if="[[_computeIsEmpty(isLoadingData, historyData)]]">
+      <div class="info">No state history found.</div>
     </template>
 
-    <template is='dom-if' if='[[historyData.timeline.length]]'>
-      <state-history-chart-timeline
-        data='[[historyData.timeline]]'
-        end-time='[[_computeEndTime(endTime, upToNow, historyData)]]'
-        no-single='[[noSingle]]'>
+    <template is="dom-if" if="[[historyData.timeline.length]]">
+      <state-history-chart-timeline data="[[historyData.timeline]]" end-time="[[_computeEndTime(endTime, upToNow, historyData)]]" no-single="[[noSingle]]">
       </state-history-chart-timeline>
     </template>
 
-    <template is='dom-repeat' items='[[historyData.line]]'>
-      <state-history-chart-line
-        unit='[[item.unit]]'
-        data='[[item.data]]'
-        identifier='[[item.identifier]]'
-        is-single-device='[[_computeIsSingleLineChart(item.data, noSingle)]]'
-        end-time='[[_computeEndTime(endTime, upToNow, historyData)]]'>
+    <template is="dom-repeat" items="[[historyData.line]]">
+      <state-history-chart-line unit="[[item.unit]]" data="[[item.data]]" identifier="[[item.identifier]]" is-single-device="[[_computeIsSingleLineChart(item.data, noSingle)]]" end-time="[[_computeEndTime(endTime, upToNow, historyData)]]">
       </state-history-chart-line>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class StateHistoryCharts extends Polymer.Element {
   static get is() { return 'state-history-charts'; }
   static get properties() {
     return {
@@ -91,4 +83,3 @@ class StateHistoryCharts extends Polymer.Element {
   }
 }
 customElements.define(StateHistoryCharts.is, StateHistoryCharts);
-</script>
diff --git a/src/data/ha-state-history-data.html b/src/data/ha-state-history-data.js
similarity index 97%
rename from src/data/ha-state-history-data.html
rename to src/data/ha-state-history-data.js
index e95d0b4674..24a6a365cd 100644
--- a/src/data/ha-state-history-data.html
+++ b/src/data/ha-state-history-data.js
@@ -1,10 +1,9 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { timeOut } from '@polymer/polymer/lib/utils/async.js';
+import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
-<link rel='import' href='../../src/util/hass-util.html'>
-
-<script>
-'use strict';
+import '../util/hass-mixins.js';
+import '../util/hass-util.js';
 
 {
   const RECENT_THRESHOLD = 60000; // 1 minute
@@ -99,7 +98,7 @@
   /*
    * @appliesMixin window.hassMixins.LocalizeMixin
    */
-  class HaStateHistoryData extends window.hassMixins.LocalizeMixin(Polymer.Element) {
+  class HaStateHistoryData extends window.hassMixins.LocalizeMixin(PolymerElement) {
     static get is() { return 'ha-state-history-data'; }
     static get properties() {
       return {
@@ -165,9 +164,9 @@
     }
 
     filterChangedDebouncer(...args) {
-      this._debounceFilterChanged = Polymer.Debouncer.debounce(
+      this._debounceFilterChanged = Debouncer.debounce(
         this._debounceFilterChanged,
-        Polymer.Async.timeOut.after(0),
+        timeOut.after(0),
         () => {
           this.filterChanged(...args);
         }
@@ -385,4 +384,3 @@
   }
   customElements.define(HaStateHistoryData.is, HaStateHistoryData);
 }
-</script>
diff --git a/src/dialogs/ha-more-info-dialog.html b/src/dialogs/ha-more-info-dialog.js
similarity index 76%
rename from src/dialogs/ha-more-info-dialog.html
rename to src/dialogs/ha-more-info-dialog.js
index 64e8141d73..20fdd41cb6 100644
--- a/src/dialogs/ha-more-info-dialog.html
+++ b/src/dialogs/ha-more-info-dialog.js
@@ -1,15 +1,16 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/paper-dialog-behavior/paper-dialog-shared-styles.js';
+import '@polymer/paper-dialog-scrollable/paper-dialog-scrollable.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/paper-dialog-behavior/paper-dialog-shared-styles.html">
-<link rel="import" href="../../bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html">
-<link rel='import' href='../util/hass-mixins.html'>
-<link rel='import' href='../resources/ha-style.html'>
+import '../resources/ha-style.js';
+import '../util/hass-mixins.js';
+import './more-info/more-info-controls.js';
+import './more-info/more-info-settings.js';
 
-<link rel='import' href='./more-info/more-info-controls.html'>
-<link rel='import' href='./more-info/more-info-settings.html'>
-
-<dom-module id="ha-more-info-dialog">
-  <template>
+class HaMoreInfoDialog extends window.hassMixins.DialogMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="ha-style-dialog paper-dialog-shared-styles">
       :host {
         font-size: 14px;
@@ -64,29 +65,15 @@
       }
     </style>
 
-    <template is='dom-if' if='[[!_page]]'>
-      <more-info-controls
-        class='no-padding'
-        hass='[[hass]]'
-        state-obj='[[stateObj]]'
-        dialog-element='[[_dialogElement]]'
-        can-configure='[[_registryInfo]]'
-        large='{{large}}'
-      ></more-info-controls>
+    <template is="dom-if" if="[[!_page]]">
+      <more-info-controls class="no-padding" hass="[[hass]]" state-obj="[[stateObj]]" dialog-element="[[_dialogElement]]" can-configure="[[_registryInfo]]" large="{{large}}"></more-info-controls>
     </template>
-    <template is='dom-if' if='[[_equals(_page, "settings")]]'>
-      <more-info-settings
-        class='no-padding'
-        hass='[[hass]]'
-        state-obj='[[stateObj]]'
-        registry-info='{{_registryInfo}}'
-      ></more-info-settings>
+    <template is="dom-if" if="[[_equals(_page, &quot;settings&quot;)]]">
+      <more-info-settings class="no-padding" hass="[[hass]]" state-obj="[[stateObj]]" registry-info="{{_registryInfo}}"></more-info-settings>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class HaMoreInfoDialog extends window.hassMixins.DialogMixin(Polymer.Element) {
   static get is() { return 'ha-more-info-dialog'; }
   static get properties() {
     return {
@@ -176,4 +163,3 @@ class HaMoreInfoDialog extends window.hassMixins.DialogMixin(Polymer.Element) {
   }
 }
 customElements.define(HaMoreInfoDialog.is, HaMoreInfoDialog);
-</script>
diff --git a/src/dialogs/ha-voice-command-dialog.html b/src/dialogs/ha-voice-command-dialog.js
similarity index 83%
rename from src/dialogs/ha-voice-command-dialog.html
rename to src/dialogs/ha-voice-command-dialog.js
index bff3f6032a..a10f19f6e4 100644
--- a/src/dialogs/ha-voice-command-dialog.html
+++ b/src/dialogs/ha-voice-command-dialog.js
@@ -1,12 +1,12 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-dialog-behavior/paper-dialog-shared-styles.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/paper-dialog-behavior/paper-dialog-shared-styles.html">
-
-<link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-
-<dom-module id="ha-voice-command-dialog">
-  <template>
+class HaVoiceCommandDialog extends window.hassMixins.DialogMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style include="paper-dialog-shared-styles">
       iron-icon {
         margin-right: 8px;
@@ -105,34 +105,28 @@
       }
     </style>
 
-    <div class='content'>
-      <div class='messages' id='messages'>
-        <template is='dom-repeat' items='[[_conversation]]' as='message'>
-          <div class$='[[_computeMessageClasses(message)]]'>[[message.text]]</div>
+    <div class="content">
+      <div class="messages" id="messages">
+        <template is="dom-repeat" items="[[_conversation]]" as="message">
+          <div class\$="[[_computeMessageClasses(message)]]">[[message.text]]</div>
         </template>
       </div>
-      <template is='dom-if' if='[[results]]'>
-        <div class='messages'>
-          <div class='message user'>
+      <template is="dom-if" if="[[results]]">
+        <div class="messages">
+          <div class="message user">
             <span>{{results.final}}</span>
-            <span class='interimTranscript'>[[results.interim]]</span>
+            <span class="interimTranscript">[[results.interim]]</span>
             …
           </div>
         </div>
       </template>
-      <div class='icon' hidden$="[[results]]">
-        <paper-icon-button
-          icon="mdi:text-to-speech"
-          on-click='startListening'
-        ></paper-icon-button>
+      <div class="icon" hidden\$="[[results]]">
+        <paper-icon-button icon="mdi:text-to-speech" on-click="startListening"></paper-icon-button>
       </div>
     </div>
-  </template>
+`;
+  }
 
-</dom-module>
-
-<script>
-class HaVoiceCommandDialog extends window.hassMixins.DialogMixin(Polymer.Element) {
   static get is() { return 'ha-voice-command-dialog'; }
 
   static get properties() {
@@ -249,4 +243,3 @@ class HaVoiceCommandDialog extends window.hassMixins.DialogMixin(Polymer.Element
 }
 
 customElements.define(HaVoiceCommandDialog.is, HaVoiceCommandDialog);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-alarm_control_panel.html b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
similarity index 65%
rename from src/dialogs/more-info/controls/more-info-alarm_control_panel.html
rename to src/dialogs/more-info/controls/more-info-alarm_control_panel.js
index acad36ffb1..b5d5116f88 100644
--- a/src/dialogs/more-info/controls/more-info-alarm_control_panel.html
+++ b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js
@@ -1,45 +1,27 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../../bower_components/paper-button/paper-button.html'>
-<link rel='import' href='../../../../bower_components/paper-input/paper-input.html'>
+import '../../../util/hass-mixins.js';
 
-<link rel='import' href='../../../../src/util/hass-mixins.html'>
-
-<dom-module id='more-info-alarm_control_panel'>
-  <template>
+class MoreInfoAlarmControlPanel extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex"></style>
 
-    <div class='layout horizontal'>
-      <paper-input
-        label='code'
-        value='{{enteredCode}}'
-        pattern='[[codeFormat]]'
-        type='password'
-        hidden$='[[!codeFormat]]'
-        disabled='[[!codeInputEnabled]]'
-      ></paper-input>
+    <div class="layout horizontal">
+      <paper-input label="code" value="{{enteredCode}}" pattern="[[codeFormat]]" type="password" hidden\$="[[!codeFormat]]" disabled="[[!codeInputEnabled]]"></paper-input>
     </div>
-    <div class='layout horizontal'>
-      <paper-button
-        on-click='handleDisarmTap'
-        hidden$='[[!disarmButtonVisible]]'
-        disabled='[[!codeValid]]'
-      >Disarm</paper-button>
-      <paper-button
-        on-click='handleHomeTap'
-        hidden$='[[!armHomeButtonVisible]]'
-        disabled=[[!codeValid]]>Arm Home</paper-button>
-      <paper-button
-        on-click='handleAwayTap'
-        hidden$='[[!armAwayButtonVisible]]'
-        disabled='[[!codeValid]]'>Arm Away</paper-button>
+    <div class="layout horizontal">
+      <paper-button on-click="handleDisarmTap" hidden\$="[[!disarmButtonVisible]]" disabled="[[!codeValid]]">Disarm</paper-button>
+      <paper-button on-click="handleHomeTap" hidden\$="[[!armHomeButtonVisible]]" disabled="[[!codeValid]]">Arm Home</paper-button>
+      <paper-button on-click="handleAwayTap" hidden\$="[[!armAwayButtonVisible]]" disabled="[[!codeValid]]">Arm Away</paper-button>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoAlarmControlPanel extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'more-info-alarm_control_panel'; }
 
   static get properties() {
@@ -138,4 +120,3 @@ class MoreInfoAlarmControlPanel extends window.hassMixins.EventsMixin(Polymer.El
 }
 
 customElements.define(MoreInfoAlarmControlPanel.is, MoreInfoAlarmControlPanel);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-automation.html b/src/dialogs/more-info/controls/more-info-automation.js
similarity index 55%
rename from src/dialogs/more-info/controls/more-info-automation.html
rename to src/dialogs/more-info/controls/more-info-automation.js
index 4018cd0939..c2b793afc5 100644
--- a/src/dialogs/more-info/controls/more-info-automation.html
+++ b/src/dialogs/more-info/controls/more-info-automation.js
@@ -1,13 +1,13 @@
-<link rel="import" href="../../../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../../../components/ha-relative-time.js';
 
-<link rel="import" href="../../../../bower_components/paper-button/paper-button.html">
-
-<link rel="import" href="../../../components/ha-relative-time.html">
-
-<dom-module id="more-info-automation">
-  <template>
+class MoreInfoAutomation extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       paper-button {
         color: var(--primary-color);
@@ -22,13 +22,10 @@
       <ha-relative-time datetime="[[stateObj.attributes.last_triggered]]"></ha-relative-time>
     </p>
 
-    <paper-button on-click='handleTriggerTapped'>TRIGGER</paper-button>
+    <paper-button on-click="handleTriggerTapped">TRIGGER</paper-button>
+`;
+  }
 
-  </template>
-</dom-module>
-
-<script>
-class MoreInfoAutomation extends Polymer.Element {
   static get is() { return 'more-info-automation'; }
 
   static get properties() {
@@ -51,4 +48,3 @@ class MoreInfoAutomation extends Polymer.Element {
 }
 
 customElements.define(MoreInfoAutomation.is, MoreInfoAutomation);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-camera.html b/src/dialogs/more-info/controls/more-info-camera.js
similarity index 75%
rename from src/dialogs/more-info/controls/more-info-camera.html
rename to src/dialogs/more-info/controls/more-info-camera.js
index bb6dc95e63..4a8cfa6653 100644
--- a/src/dialogs/more-info/controls/more-info-camera.html
+++ b/src/dialogs/more-info/controls/more-info-camera.js
@@ -1,9 +1,11 @@
-<link rel="import" href="../../../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../../src/util/hass-mixins.html'>
+import '../../../util/hass-mixins.js';
 
-<dom-module id='more-info-camera'>
-  <template>
+class MoreInfoCamera extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       :host {
         max-width:640px;
@@ -14,13 +16,10 @@
       }
     </style>
 
-    <img class='camera-image' src="[[computeCameraImageUrl(hass, stateObj, isVisible)]]"
-         on-load='imageLoaded' alt='[[computeStateName(stateObj)]]' />
-  </template>
-</dom-module>
+    <img class="camera-image" src="[[computeCameraImageUrl(hass, stateObj, isVisible)]]" on-load="imageLoaded" alt="[[computeStateName(stateObj)]]">
+`;
+  }
 
-<script>
-class MoreInfoCamera extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'more-info-camera'; }
 
   static get properties() {
@@ -71,4 +70,3 @@ class MoreInfoCamera extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(MoreInfoCamera.is, MoreInfoCamera);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-climate.html b/src/dialogs/more-info/controls/more-info-climate.js
similarity index 68%
rename from src/dialogs/more-info/controls/more-info-climate.html
rename to src/dialogs/more-info/controls/more-info-climate.js
index ac0a614891..0d6f4d2312 100644
--- a/src/dialogs/more-info/controls/more-info-climate.html
+++ b/src/dialogs/more-info/controls/more-info-climate.js
@@ -1,20 +1,20 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../../../bower_components/polymer/lib/utils/debounce.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import '@polymer/paper-toggle-button/paper-toggle-button.js';
+import { timeOut } from '@polymer/polymer/lib/utils/async.js';
+import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../../../components/ha-climate-control.js';
+import '../../../components/ha-paper-slider.js';
+import '../../../util/hass-mixins.js';
 
-<link rel='import' href='../../../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href='../../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html'>
-<link rel='import' href='../../../../bower_components/paper-toggle-button/paper-toggle-button.html'>
-
-<link rel='import' href='../../../../src/util/hass-mixins.html'>
-
-<link rel="import" href='../../../components/ha-climate-control.html'>
-<link rel="import" href='../../../components/ha-paper-slider.html'>
-
-<dom-module id='more-info-climate'>
-  <template>
+class MoreInfoClimate extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex"></style>
     <style>
       :host {
@@ -105,87 +105,52 @@
       }
     </style>
 
-    <div class$='[[computeClassNames(stateObj)]]'>
+    <div class\$="[[computeClassNames(stateObj)]]">
 
-      <template is='dom-if' if='[[supportsOn(stateObj)]]'>
-        <div class='container-on'>
-          <div class='center horizontal layout single-row'>
-            <div class='flex'>On / Off</div>
-            <paper-toggle-button
-              checked='[[onToggleChecked]]'
-              on-change='onToggleChanged'>
+      <template is="dom-if" if="[[supportsOn(stateObj)]]">
+        <div class="container-on">
+          <div class="center horizontal layout single-row">
+            <div class="flex">On / Off</div>
+            <paper-toggle-button checked="[[onToggleChecked]]" on-change="onToggleChanged">
             </paper-toggle-button>
           </div>
         </div>
       </template>
 
-      <div class='container-temperature'>
-        <div class$='[[stateObj.attributes.operation_mode]]'>
-          <div hidden$='[[!supportsTemperatureControls(stateObj)]]'>Target
+      <div class="container-temperature">
+        <div class\$="[[stateObj.attributes.operation_mode]]">
+          <div hidden\$="[[!supportsTemperatureControls(stateObj)]]">Target
             Temperature</div>
-          <template is='dom-if' if='[[supportsTemperature(stateObj)]]'>
-            <ha-climate-control
-              value='[[stateObj.attributes.temperature]]'
-              units='[[stateObj.attributes.unit_of_measurement]]'
-              step='[[computeTemperatureStepSize(stateObj)]]'
-              min='[[stateObj.attributes.min_temp]]'
-              max='[[stateObj.attributes.max_temp]]'
-              on-change='targetTemperatureChanged'
-              >
+          <template is="dom-if" if="[[supportsTemperature(stateObj)]]">
+            <ha-climate-control value="[[stateObj.attributes.temperature]]" units="[[stateObj.attributes.unit_of_measurement]]" step="[[computeTemperatureStepSize(stateObj)]]" min="[[stateObj.attributes.min_temp]]" max="[[stateObj.attributes.max_temp]]" on-change="targetTemperatureChanged">
             </ha-climate-control>
           </template>
-          <template is='dom-if' if='[[supportsTemperatureRange(stateObj)]]'>
-            <ha-climate-control
-              value='[[stateObj.attributes.target_temp_low]]'
-              units='[[stateObj.attributes.unit_of_measurement]]'
-              step='[[computeTemperatureStepSize(stateObj)]]'
-              min='[[stateObj.attributes.min_temp]]'
-              max='[[stateObj.attributes.target_temp_high]]'
-              class='range-control-left'
-              on-change='targetTemperatureLowChanged'
-              >
+          <template is="dom-if" if="[[supportsTemperatureRange(stateObj)]]">
+            <ha-climate-control value="[[stateObj.attributes.target_temp_low]]" units="[[stateObj.attributes.unit_of_measurement]]" step="[[computeTemperatureStepSize(stateObj)]]" min="[[stateObj.attributes.min_temp]]" max="[[stateObj.attributes.target_temp_high]]" class="range-control-left" on-change="targetTemperatureLowChanged">
             </ha-climate-control>
-            <ha-climate-control
-              value='[[stateObj.attributes.target_temp_high]]'
-              units='[[stateObj.attributes.unit_of_measurement]]'
-              step='[[computeTemperatureStepSize(stateObj)]]'
-              min='[[stateObj.attributes.target_temp_low]]'
-              max='[[stateObj.attributes.max_temp]]'
-              class='range-control-right'
-              on-change='targetTemperatureHighChanged'
-              >
+            <ha-climate-control value="[[stateObj.attributes.target_temp_high]]" units="[[stateObj.attributes.unit_of_measurement]]" step="[[computeTemperatureStepSize(stateObj)]]" min="[[stateObj.attributes.target_temp_low]]" max="[[stateObj.attributes.max_temp]]" class="range-control-right" on-change="targetTemperatureHighChanged">
             </ha-climate-control>
           </template>
         </div>
       </div>
 
-      <template is='dom-if' if='[[supportsHumidity(stateObj)]]'>
-        <div class='container-humidity'>
+      <template is="dom-if" if="[[supportsHumidity(stateObj)]]">
+        <div class="container-humidity">
           <div>Target Humidity</div>
             <div class="single-row">
               <div class="target-humidity">[[stateObj.attributes.humidity]] %</div>
-              <ha-paper-slider
-                class='humidity'
-                min='[[stateObj.attributes.min_humidity]]'
-                max='[[stateObj.attributes.max_humidity]]'
-                secondary-progress='[[stateObj.attributes.max_humidity]]'
-                step='1' pin
-                value='[[stateObj.attributes.humidity]]'
-                on-change='targetHumiditySliderChanged'
-                ignore-bar-touch>
+              <ha-paper-slider class="humidity" min="[[stateObj.attributes.min_humidity]]" max="[[stateObj.attributes.max_humidity]]" secondary-progress="[[stateObj.attributes.max_humidity]]" step="1" pin="" value="[[stateObj.attributes.humidity]]" on-change="targetHumiditySliderChanged" ignore-bar-touch="">
               </ha-paper-slider>
           </div>
         </div>
       </template>
 
-      <template is='dom-if' if='[[supportsOperationMode(stateObj)]]'>
-        <div class='container-operation_list'>
-          <div class='controls'>
-            <paper-dropdown-menu class='capitalize' label-float dynamic-align label='Operation'>
+      <template is="dom-if" if="[[supportsOperationMode(stateObj)]]">
+        <div class="container-operation_list">
+          <div class="controls">
+            <paper-dropdown-menu class="capitalize" label-float="" dynamic-align="" label="Operation">
               <paper-listbox slot="dropdown-content" selected="{{operationIndex}}">
-                <template is='dom-repeat'
-                          items='[[stateObj.attributes.operation_list]]'
-                          on-dom-change='handleOperationListUpdate'>
+                <template is="dom-repeat" items="[[stateObj.attributes.operation_list]]" on-dom-change="handleOperationListUpdate">
                   <paper-item class="capitalize">[[item]]</paper-item>
                 </template>
               </paper-listbox>
@@ -194,13 +159,11 @@
         </div>
       </template>
 
-      <template is='dom-if' if='[[supportsFanMode(stateObj)]]'>
-        <div class='container-fan_list'>
-          <paper-dropdown-menu label-float dynamic-align label='Fan Mode'>
+      <template is="dom-if" if="[[supportsFanMode(stateObj)]]">
+        <div class="container-fan_list">
+          <paper-dropdown-menu label-float="" dynamic-align="" label="Fan Mode">
             <paper-listbox slot="dropdown-content" selected="{{fanIndex}}">
-              <template is='dom-repeat'
-                        items='[[stateObj.attributes.fan_list]]'
-                        on-dom-change='handleFanListUpdate'>
+              <template is="dom-repeat" items="[[stateObj.attributes.fan_list]]" on-dom-change="handleFanListUpdate">
                 <paper-item>[[item]]</paper-item>
               </template>
             </paper-listbox>
@@ -208,13 +171,11 @@
         </div>
       </template>
 
-      <template is='dom-if' if='[[supportsSwingMode(stateObj)]]'>
-        <div class='container-swing_list'>
-          <paper-dropdown-menu label-float dynamic-align label='Swing Mode'>
+      <template is="dom-if" if="[[supportsSwingMode(stateObj)]]">
+        <div class="container-swing_list">
+          <paper-dropdown-menu label-float="" dynamic-align="" label="Swing Mode">
             <paper-listbox slot="dropdown-content" selected="{{swingIndex}}">
-              <template is='dom-repeat'
-                        items='[[stateObj.attributes.swing_list]]'
-                        on-dom-change='handleSwingListUpdate'>
+              <template is="dom-repeat" items="[[stateObj.attributes.swing_list]]" on-dom-change="handleSwingListUpdate">
                 <paper-item>[[item]]</paper-item>
               </template>
             </paper-listbox>
@@ -222,35 +183,29 @@
         </div>
       </template>
 
-      <template is='dom-if' if='[[supportsAwayMode(stateObj)]]'>
-        <div class='container-away_mode'>
-          <div class='center horizontal layout single-row'>
-            <div class='flex'>Away Mode</div>
-            <paper-toggle-button
-              checked='[[awayToggleChecked]]'
-              on-change='awayToggleChanged'>
+      <template is="dom-if" if="[[supportsAwayMode(stateObj)]]">
+        <div class="container-away_mode">
+          <div class="center horizontal layout single-row">
+            <div class="flex">Away Mode</div>
+            <paper-toggle-button checked="[[awayToggleChecked]]" on-change="awayToggleChanged">
             </paper-toggle-button>
           </div>
         </div>
       </template>
 
-      <template is='dom-if' if='[[supportsAuxHeat(stateObj)]]'>
-        <div class='container-aux_heat'>
-          <div class='center horizontal layout single-row'>
-            <div class='flex'>Aux Heat</div>
-            <paper-toggle-button
-              checked='[[auxToggleChecked]]'
-              on-change='auxToggleChanged'>
+      <template is="dom-if" if="[[supportsAuxHeat(stateObj)]]">
+        <div class="container-aux_heat">
+          <div class="center horizontal layout single-row">
+            <div class="flex">Aux Heat</div>
+            <paper-toggle-button checked="[[auxToggleChecked]]" on-change="auxToggleChanged">
             </paper-toggle-button>
           </div>
         </div>
       </template>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoClimate extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'more-info-climate'; }
 
   static get properties() {
@@ -297,9 +252,9 @@ class MoreInfoClimate extends window.hassMixins.EventsMixin(Polymer.Element) {
     }
 
     if (oldVal) {
-      this._debouncer = Polymer.Debouncer.debounce(
+      this._debouncer = Debouncer.debounce(
         this._debouncer,
-        Polymer.Async.timeOut.after(500),
+        timeOut.after(500),
         () => {
           this.fire('iron-resize');
         }
@@ -504,4 +459,3 @@ class MoreInfoClimate extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(MoreInfoClimate.is, MoreInfoClimate);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-configurator.html b/src/dialogs/more-info/controls/more-info-configurator.js
similarity index 54%
rename from src/dialogs/more-info/controls/more-info-configurator.html
rename to src/dialogs/more-info/controls/more-info-configurator.js
index b14fef2aa0..ab97fb6e76 100644
--- a/src/dialogs/more-info/controls/more-info-configurator.html
+++ b/src/dialogs/more-info/controls/more-info-configurator.js
@@ -1,14 +1,16 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel='import' href='../../../../bower_components/iron-input/iron-input.html'>
-<link rel='import' href='../../../../bower_components/paper-spinner/paper-spinner.html'>
-<link rel='import' href='../../../../bower_components/paper-button/paper-button.html'>
-<link rel='import' href='../../../../bower_components/paper-input/paper-input.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/iron-input/iron-input.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-spinner/paper-spinner.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../components/ha-markdown.html'>
+import '../../../components/ha-markdown.js';
 
-<dom-module id='more-info-configurator'>
-  <template>
+class MoreInfoConfigurator extends PolymerElement {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex"></style>
     <style>
       p {
@@ -47,33 +49,21 @@
       }
     </style>
 
-    <div class='layout vertical'>
-      <template is='dom-if' if='[[isConfigurable]]'>
-        <ha-markdown content='[[stateObj.attributes.description]]'></ha-markdown>
+    <div class="layout vertical">
+      <template is="dom-if" if="[[isConfigurable]]">
+        <ha-markdown content="[[stateObj.attributes.description]]"></ha-markdown>
 
-        <p class='error' hidden$='[[!stateObj.attributes.errors]]'>
+        <p class="error" hidden\$="[[!stateObj.attributes.errors]]">
           [[stateObj.attributes.errors]]
         </p>
 
-        <template is='dom-repeat' items='[[stateObj.attributes.fields]]'>
-          <paper-input
-            label='[[item.name]]'
-            name='[[item.id]]'
-            type='[[item.type]]'
-            on-change='fieldChanged'
-          ></paper-input>
+        <template is="dom-repeat" items="[[stateObj.attributes.fields]]">
+          <paper-input label="[[item.name]]" name="[[item.id]]" type="[[item.type]]" on-change="fieldChanged"></paper-input>
         </template>
 
-        <p class='submit' hidden$='[[!stateObj.attributes.submit_caption]]'>
-          <paper-button
-            raised
-            disabled='[[isConfiguring]]'
-            on-click='submitClicked'
-          >
-            <paper-spinner
-              active='[[isConfiguring]]'
-              hidden='[[!isConfiguring]]'
-              alt='Configuring'></paper-spinner>
+        <p class="submit" hidden\$="[[!stateObj.attributes.submit_caption]]">
+          <paper-button raised="" disabled="[[isConfiguring]]" on-click="submitClicked">
+            <paper-spinner active="[[isConfiguring]]" hidden="[[!isConfiguring]]" alt="Configuring"></paper-spinner>
             [[stateObj.attributes.submit_caption]]
           </paper-button>
 
@@ -81,11 +71,9 @@
 
       </template>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoConfigurator extends Polymer.Element {
   static get is() { return 'more-info-configurator'; }
 
   static get properties() {
@@ -145,4 +133,3 @@ class MoreInfoConfigurator extends Polymer.Element {
 }
 
 customElements.define(MoreInfoConfigurator.is, MoreInfoConfigurator);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-content.html b/src/dialogs/more-info/controls/more-info-content.js
similarity index 50%
rename from src/dialogs/more-info/controls/more-info-content.html
rename to src/dialogs/more-info/controls/more-info-content.js
index 7235c50b9d..3692a24a0b 100644
--- a/src/dialogs/more-info/controls/more-info-content.html
+++ b/src/dialogs/more-info/controls/more-info-content.js
@@ -1,27 +1,26 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='more-info-alarm_control_panel.html'>
-<link rel='import' href='more-info-automation.html'>
-<link rel='import' href='more-info-camera.html'>
-<link rel='import' href='more-info-climate.html'>
-<link rel='import' href='more-info-configurator.html'>
-<link rel='import' href='more-info-cover.html'>
-<link rel='import' href='more-info-default.html'>
-<link rel='import' href='more-info-fan.html'>
-<link rel='import' href='more-info-history_graph.html'>
-<link rel='import' href='more-info-group.html'>
-<link rel='import' href='more-info-light.html'>
-<link rel='import' href='more-info-lock.html'>
-<link rel='import' href='more-info-media_player.html'>
-<link rel='import' href='more-info-script.html'>
-<link rel='import' href='more-info-sun.html'>
-<link rel='import' href='more-info-updater.html'>
-<link rel='import' href='more-info-vacuum.html'>
-<link rel='import' href='more-info-input_datetime.html'>
-<link rel='import' href='more-info-weather.html'>
+import './more-info-alarm_control_panel.js';
+import './more-info-automation.js';
+import './more-info-camera.js';
+import './more-info-climate.js';
+import './more-info-configurator.js';
+import './more-info-cover.js';
+import './more-info-default.js';
+import './more-info-fan.js';
+import './more-info-group.js';
+import './more-info-history_graph.js';
+import './more-info-input_datetime.js';
+import './more-info-light.js';
+import './more-info-lock.js';
+import './more-info-media_player.js';
+import './more-info-script.js';
+import './more-info-sun.js';
+import './more-info-updater.js';
+import './more-info-vacuum.js';
+import './more-info-weather.js';
 
-<script>
-class MoreInfoContent extends Polymer.Element {
+class MoreInfoContent extends PolymerElement {
   static get is() { return 'more-info-content'; }
 
   static get properties() {
@@ -69,4 +68,3 @@ class MoreInfoContent extends Polymer.Element {
 }
 
 customElements.define(MoreInfoContent.is, MoreInfoContent);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-cover.html b/src/dialogs/more-info/controls/more-info-cover.js
similarity index 59%
rename from src/dialogs/more-info/controls/more-info-cover.html
rename to src/dialogs/more-info/controls/more-info-cover.js
index d400f6f160..8099aa8cf3 100644
--- a/src/dialogs/more-info/controls/more-info-cover.html
+++ b/src/dialogs/more-info/controls/more-info-cover.js
@@ -1,14 +1,19 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../../../../bower_components/paper-icon-button/paper-icon-button.html">
+import '../../../components/ha-cover-tilt-controls.js';
+import '../../../components/ha-paper-slider.js';
+import '../../../util/cover-model.js';
 
-<link rel="import" href='../../../components/ha-paper-slider.html'>
-<link rel='import' href='../../../util/cover-model.html'>
-<link rel='import' href='../../../components/ha-cover-tilt-controls.html'>
-
-<dom-module id='more-info-cover'>
-  <template>
+{
+  const FEATURE_CLASS_NAMES = {
+    128: 'has-set_tilt_position',
+  };
+  class MoreInfoCover extends PolymerElement {
+    static get template() {
+      return html`
     <style is="custom-style" include="iron-flex"></style>
     <style>
       .current_position, .tilt {
@@ -26,44 +31,26 @@
         visibility: hidden !important;
       }
     </style>
-    <div class$='[[computeClassNames(stateObj)]]'>
+    <div class\$="[[computeClassNames(stateObj)]]">
 
-      <div class='current_position'>
+      <div class="current_position">
         <div>Position</div>
-        <ha-paper-slider
-          min='0' max='100'
-          value='{{coverPositionSliderValue}}'
-          step='1' pin
-          disabled='[[!entityObj.supportsSetPosition]]'
-          on-change='coverPositionSliderChanged'
-          ignore-bar-touch></ha-paper-slider>
+        <ha-paper-slider min="0" max="100" value="{{coverPositionSliderValue}}" step="1" pin="" disabled="[[!entityObj.supportsSetPosition]]" on-change="coverPositionSliderChanged" ignore-bar-touch=""></ha-paper-slider>
       </div>
 
-      <div class='tilt'>
+      <div class="tilt">
         <div>Tilt position</div>
         <div>
-          <ha-cover-tilt-controls hidden$="[[entityObj.isTiltOnly]]" hass="[[hass]]" state-obj="[[stateObj]]">
+          <ha-cover-tilt-controls hidden\$="[[entityObj.isTiltOnly]]" hass="[[hass]]" state-obj="[[stateObj]]">
           </ha-cover-tilt-controls>
         </div>
-        <ha-paper-slider
-          min='0' max='100'
-          value='{{coverTiltPositionSliderValue}}'
-          step='1' pin
-          disabled='[[!entityObj.supportsSetTiltPosition]]'
-          on-change='coverTiltPositionSliderChanged'
-          ignore-bar-touch></ha-paper-slider>
+        <ha-paper-slider min="0" max="100" value="{{coverTiltPositionSliderValue}}" step="1" pin="" disabled="[[!entityObj.supportsSetTiltPosition]]" on-change="coverTiltPositionSliderChanged" ignore-bar-touch=""></ha-paper-slider>
       </div>
 
     </div>
-  </template>
-</dom-module>
+`;
+    }
 
-<script>
-{
-  const FEATURE_CLASS_NAMES = {
-    128: 'has-set_tilt_position',
-  };
-  class MoreInfoCover extends Polymer.Element {
     static get is() { return 'more-info-cover'; }
 
     static get properties() {
@@ -125,4 +112,3 @@
 
   customElements.define(MoreInfoCover.is, MoreInfoCover);
 }
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-default.html b/src/dialogs/more-info/controls/more-info-default.html
deleted file mode 100644
index f469b7db29..0000000000
--- a/src/dialogs/more-info/controls/more-info-default.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<link rel="import" href="../../../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="../../../components/ha-attributes.html">
-
-<dom-module id="more-info-default">
-  <template>
-    <ha-attributes state-obj="[[stateObj]]"></ha-attributes>
-  </template>
-</dom-module>
-
-<script>
-class MoreInfoDefault extends Polymer.Element {
-  static get is() { return 'more-info-default'; }
-
-  static get properties() {
-    return {
-      stateObj: {
-        type: Object,
-      },
-    };
-  }
-}
-
-customElements.define(MoreInfoDefault.is, MoreInfoDefault);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-default.js b/src/dialogs/more-info/controls/more-info-default.js
new file mode 100644
index 0000000000..c67376ae59
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-default.js
@@ -0,0 +1,24 @@
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../components/ha-attributes.js';
+
+class MoreInfoDefault extends PolymerElement {
+  static get template() {
+    return html`
+    <ha-attributes state-obj="[[stateObj]]"></ha-attributes>
+`;
+  }
+
+  static get is() { return 'more-info-default'; }
+
+  static get properties() {
+    return {
+      stateObj: {
+        type: Object,
+      },
+    };
+  }
+}
+
+customElements.define(MoreInfoDefault.is, MoreInfoDefault);
diff --git a/src/dialogs/more-info/controls/more-info-fan.html b/src/dialogs/more-info/controls/more-info-fan.js
similarity index 60%
rename from src/dialogs/more-info/controls/more-info-fan.html
rename to src/dialogs/more-info/controls/more-info-fan.js
index a391d1367d..900f4d6f30 100644
--- a/src/dialogs/more-info/controls/more-info-fan.html
+++ b/src/dialogs/more-info/controls/more-info-fan.js
@@ -1,19 +1,19 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import '@polymer/paper-toggle-button/paper-toggle-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html'>
-<link rel='import' href='../../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html'>
-<link rel='import' href='../../../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href='../../../../bower_components/paper-toggle-button/paper-toggle-button.html'>
-<link rel='import' href='../../../../bower_components/paper-icon-button/paper-icon-button.html'>
+import '../../../components/ha-attributes.js';
+import '../../../util/hass-mixins.js';
 
-<link rel='import' href='../../../../src/util/hass-mixins.html'>
-
-<link rel="import" href="../../../components/ha-attributes.html">
-
-<dom-module id='more-info-fan'>
-  <template>
-    <style is='custom-style' include='iron-flex'></style>
+class MoreInfoFan extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style is="custom-style" include="iron-flex"></style>
     <style>
       .container-speed_list,
       .container-direction,
@@ -36,48 +36,39 @@
       }
     </style>
 
-    <div class$='[[computeClassNames(stateObj)]]'>
+    <div class\$="[[computeClassNames(stateObj)]]">
 
       <div class="container-speed_list">
-        <paper-dropdown-menu label-float dynamic-align label='Speed'>
-          <paper-listbox slot="dropdown-content" selected='{{speedIndex}}'>
-            <template is='dom-repeat'
-                      items='[[stateObj.attributes.speed_list]]'>
+        <paper-dropdown-menu label-float="" dynamic-align="" label="Speed">
+          <paper-listbox slot="dropdown-content" selected="{{speedIndex}}">
+            <template is="dom-repeat" items="[[stateObj.attributes.speed_list]]">
               <paper-item>[[item]]</paper-item>
             </template>
           </paper-listbox>
         </paper-dropdown-menu>
       </div>
 
-      <div class='container-oscillating'>
-        <div class='center horizontal layout single-row'>
-          <div class='flex'>Oscillate</div>
-          <paper-toggle-button
-            checked='[[oscillationToggleChecked]]'
-            on-change='oscillationToggleChanged'>
+      <div class="container-oscillating">
+        <div class="center horizontal layout single-row">
+          <div class="flex">Oscillate</div>
+          <paper-toggle-button checked="[[oscillationToggleChecked]]" on-change="oscillationToggleChanged">
           </paper-toggle-button>
         </div>
       </div>
 
-      <div class='container-direction'>
-        <div class='direction'>
+      <div class="container-direction">
+        <div class="direction">
           <div>Direction</div>
-          <paper-icon-button icon='mdi:rotate-left'
-            on-click='onDirectionLeft' title='Left'
-            disabled='[[computeIsRotatingLeft(stateObj)]]'></paper-icon-button>
-          <paper-icon-button icon='mdi:rotate-right'
-            on-click='onDirectionRight' title='Right'
-            disabled='[[computeIsRotatingRight(stateObj)]]'></paper-icon-button>
+          <paper-icon-button icon="mdi:rotate-left" on-click="onDirectionLeft" title="Left" disabled="[[computeIsRotatingLeft(stateObj)]]"></paper-icon-button>
+          <paper-icon-button icon="mdi:rotate-right" on-click="onDirectionRight" title="Right" disabled="[[computeIsRotatingRight(stateObj)]]"></paper-icon-button>
         </div>
       </div>
     </div>
 
     <ha-attributes state-obj="[[stateObj]]" extra-filters="speed,speed_list,oscillating,direction"></ha-attributes>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoFan extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'more-info-fan'; }
 
   static get properties() {
@@ -173,4 +164,3 @@ class MoreInfoFan extends window.hassMixins.EventsMixin(Polymer.Element) {
 }
 
 customElements.define(MoreInfoFan.is, MoreInfoFan);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-group.html b/src/dialogs/more-info/controls/more-info-group.js
similarity index 78%
rename from src/dialogs/more-info/controls/more-info-group.html
rename to src/dialogs/more-info/controls/more-info-group.js
index a03feb780b..c58096bd40 100644
--- a/src/dialogs/more-info/controls/more-info-group.html
+++ b/src/dialogs/more-info/controls/more-info-group.js
@@ -1,9 +1,12 @@
-<link rel="import" href="../../../../bower_components/polymer/polymer-element.html">
+import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../state-summary/state-card-content.html">
+import '../../../state-summary/state-card-content.js';
 
-<dom-module id="more-info-group">
-  <template>
+class MoreInfoGroup extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       .child-card {
         margin-bottom: 8px;
@@ -15,16 +18,14 @@
     </style>
 
     <div id="groupedControlDetails"></div>
-    <template is='dom-repeat' items="[[states]]" as='state'>
-      <div class='child-card'>
-        <state-card-content state-obj="[[state]]" hass='[[hass]]'></state-card-content>
+    <template is="dom-repeat" items="[[states]]" as="state">
+      <div class="child-card">
+        <state-card-content state-obj="[[state]]" hass="[[hass]]"></state-card-content>
       </div>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoGroup extends Polymer.Element {
   static get is() { return 'more-info-group'; }
 
   static get properties() {
@@ -90,7 +91,7 @@ class MoreInfoGroup extends Polymer.Element {
     }
 
     if (!groupDomainStateObj) {
-      const el = Polymer.dom(this.$.groupedControlDetails);
+      const el = dom(this.$.groupedControlDetails);
       if (el.lastChild) {
         el.removeChild(el.lastChild);
       }
@@ -105,4 +106,3 @@ class MoreInfoGroup extends Polymer.Element {
 }
 
 customElements.define(MoreInfoGroup.is, MoreInfoGroup);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-history_graph.html b/src/dialogs/more-info/controls/more-info-history_graph.html
deleted file mode 100644
index 3b9abf0868..0000000000
--- a/src/dialogs/more-info/controls/more-info-history_graph.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<link rel="import" href="../../../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="../../../cards/ha-history_graph-card.html">
-
-<link rel="import" href="../../../components/ha-attributes.html">
-
-<dom-module id="more-info-history_graph">
-  <template>
-    <style>
-    :host {
-      display: block;
-      margin-bottom: 6px;
-    }
-    </style>
-    <ha-history_graph-card
-        hass='[[hass]]'
-        state-obj='[[stateObj]]'
-        in-dialog
-    ></ha-graph-card>
-    <ha-attributes state-obj="[[stateObj]]"></ha-attributes>
-  </template>
-</dom-module>
-
-<script>
-class MoreInfoHistoryGraph extends Polymer.Element {
-  static get is() { return 'more-info-history_graph'; }
-  static get properties() {
-    return {
-      hass: Object,
-      stateObj: Object,
-    };
-  }
-}
-customElements.define(MoreInfoHistoryGraph.is, MoreInfoHistoryGraph);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-history_graph.js b/src/dialogs/more-info/controls/more-info-history_graph.js
new file mode 100644
index 0000000000..fd7fe69e51
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-history_graph.js
@@ -0,0 +1,30 @@
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../../../cards/ha-history_graph-card.js';
+import '../../../components/ha-attributes.js';
+
+class MoreInfoHistoryGraph extends PolymerElement {
+  static get template() {
+    return html`
+    <style>
+    :host {
+      display: block;
+      margin-bottom: 6px;
+    }
+    </style>
+    <ha-history_graph-card hass="[[hass]]" state-obj="[[stateObj]]" in-dialog="">
+    <ha-attributes state-obj="[[stateObj]]"></ha-attributes>
+  </ha-history_graph-card>
+`;
+  }
+
+  static get is() { return 'more-info-history_graph'; }
+  static get properties() {
+    return {
+      hass: Object,
+      stateObj: Object,
+    };
+  }
+}
+customElements.define(MoreInfoHistoryGraph.is, MoreInfoHistoryGraph);
diff --git a/src/dialogs/more-info/controls/more-info-input_datetime.html b/src/dialogs/more-info/controls/more-info-input_datetime.js
similarity index 65%
rename from src/dialogs/more-info/controls/more-info-input_datetime.html
rename to src/dialogs/more-info/controls/more-info-input_datetime.js
index fad93ad0b0..6a700df7c9 100644
--- a/src/dialogs/more-info/controls/more-info-input_datetime.html
+++ b/src/dialogs/more-info/controls/more-info-input_datetime.js
@@ -1,28 +1,34 @@
-<link rel="import" href="../../../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../../../components/ha-relative-time.html">
-<link rel="import" href="../../../../bower_components/vaadin-date-picker/vaadin-date-picker.html">
-<link rel="import" href="../../../../bower_components/paper-time-input/paper-time-input.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import '@polymer/polymer/polymer-legacy.js';
+import '@vaadin/vaadin-date-picker/vaadin-date-picker.js';
 
-<dom-module id="more-info-input_datetime">
-  <template>
-    <div class$='[[computeClassNames(stateObj)]]'>
-      <template is="dom-if" if="[[doesHaveDate(stateObj)]]" restamp>
+import '../../../components/ha-relative-time.js';
+
+class DatetimeInput extends PolymerElement {
+  static get template() {
+    return html`
+    <div class\$="[[computeClassNames(stateObj)]]">
+      <template is="dom-if" if="[[doesHaveDate(stateObj)]]" restamp="">
         <div>
           <vaadin-date-picker id="dateInput" on-value-changed="dateTimeChanged" label="Date" value="{{selectedDate}}"></vaadin-date-picker>
         </div>
       </template>
-      <template is="dom-if" if="[[doesHaveTime(stateObj)]]" restamp>
+      <template is="dom-if" if="[[doesHaveTime(stateObj)]]" restamp="">
         <div>
-          <paper-time-input hour="{{selectedHour}}" min="{{selectedMinute}}" format="24"></paper-time-input>
+          <paper-input
+            type='time'
+            label='time'
+            value='{{selectedTime}}'
+          ></paper-input>
         </div>
       </template>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class DatetimeInput extends Polymer.Element {
   static get is() {
     return 'more-info-input_datetime';
   }
@@ -43,18 +49,14 @@ class DatetimeInput extends Polymer.Element {
         observer: 'stateObjChanged',
       },
 
-      selectedHour: {
-        type: Number,
-        observer: 'dateTimeChanged',
-      },
-
-      selectedMinute: {
-        type: Number,
-        observer: 'dateTimeChanged',
-      },
-
       selectedDate: {
         type: String,
+        observer: 'dateTimeChanged',
+      },
+
+      selectedTime: {
+        type: String,
+        observer: 'dateTimeChanged',
       }
     };
   }
@@ -66,6 +68,9 @@ class DatetimeInput extends Polymer.Element {
 
   /* Convert the date in the stateObj into a string useable by vaadin-date-picker */
   getDateString(stateObj) {
+    if (stateObj.state === 'unknown') {
+      return '';
+    }
     var monthFiller;
     if (stateObj.attributes.month < 10) {
       monthFiller = '0';
@@ -91,31 +96,23 @@ class DatetimeInput extends Polymer.Element {
       return;
     }
 
-    var minuteFiller;
-    var changed = false;
+    let changed = false;
 
-    var serviceData = {
+    const serviceData = {
       entity_id: this.stateObj.entity_id
     };
 
     if (this.stateObj.attributes.has_time) {
-      changed |= (parseInt(this.selectedMinute) !== this.stateObj.attributes.minute);
-      changed |= (parseInt(this.selectedHour) !== this.stateObj.attributes.hour);
-
-      if (this.selectedMinute < 10) {
-        minuteFiller = '0';
-      } else {
-        minuteFiller = '';
-      }
-
-      var timeStr = this.selectedHour + ':' + minuteFiller + this.selectedMinute;
-
-      serviceData.time = timeStr;
+      changed |= this.selectedTime !== `${this.stateObj.attributes.hour}:${this.stateObj.attributes.minute}`;
+      serviceData.time = this.selectedTime;
     }
 
     if (this.stateObj.attributes.has_date) {
-      const dateInput = this.shadowRoot.querySelector('#dateInput');
-      const dateValInput = new Date(dateInput.value);
+      if (this.selectedDate.length === 0) {
+        return; // Date was not set
+      }
+
+      const dateValInput = new Date(this.selectedDate);
       const dateValState = new Date(
         this.stateObj.attributes.year,
         this.stateObj.attributes.month - 1,
@@ -124,10 +121,7 @@ class DatetimeInput extends Polymer.Element {
 
       changed |= (dateValState !== dateValInput);
 
-      serviceData.date = dateInput.value;
-      if (dateInput.value.length < 1) {
-        return; // Date was not set
-      }
+      serviceData.date = this.selectedDate;
     }
 
     if (changed) {
@@ -165,4 +159,3 @@ class DatetimeInput extends Polymer.Element {
 }
 
 customElements.define(DatetimeInput.is, DatetimeInput);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-light.html b/src/dialogs/more-info/controls/more-info-light.js
similarity index 73%
rename from src/dialogs/more-info/controls/more-info-light.html
rename to src/dialogs/more-info/controls/more-info-light.js
index ade233e574..faeabc7477 100644
--- a/src/dialogs/more-info/controls/more-info-light.html
+++ b/src/dialogs/more-info/controls/more-info-light.js
@@ -1,18 +1,26 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../../../../bower_components/paper-listbox/paper-listbox.html">
-<link rel="import" href="../../../../bower_components/paper-item/paper-item.html">
+import '../../../components/ha-attributes.js';
+import '../../../components/ha-color-picker.js';
+import '../../../components/ha-labeled-slider.js';
+import '../../../util/hass-mixins.js';
 
-<link rel='import' href='../../../../src/util/hass-mixins.html'>
-
-<link rel='import' href='../../../components/ha-labeled-slider.html'>
-<link rel='import' href='../../../components/ha-color-picker.html'>
-<link rel='import' href='../../../components/ha-attributes.html'>
-
-<dom-module id='more-info-light'>
-  <template>
+{
+  const FEATURE_CLASS_NAMES = {
+    1: 'has-brightness',
+    2: 'has-color_temp',
+    4: 'has-effect_list',
+    16: 'has-color',
+    128: 'has-white_value',
+  };
+  class MoreInfoLight extends window.hassMixins.EventsMixin(PolymerElement) {
+    static get template() {
+      return html`
     <style is="custom-style" include="iron-flex"></style>
     <style>
       .effect_list {
@@ -66,48 +74,27 @@
       }
     </style>
 
-    <div class$='[[computeClassNames(stateObj)]]'>
+    <div class\$="[[computeClassNames(stateObj)]]">
 
-      <div class='control brightness'>
-        <ha-labeled-slider
-          caption='Brightness' icon='mdi:brightness-5' max='255'
-          value='{{brightnessSliderValue}}'
-          on-change='brightnessSliderChanged'
-          ignore-bar-touch></ha-labeled-slider>
+      <div class="control brightness">
+        <ha-labeled-slider caption="Brightness" icon="mdi:brightness-5" max="255" value="{{brightnessSliderValue}}" on-change="brightnessSliderChanged" ignore-bar-touch=""></ha-labeled-slider>
       </div>
 
-      <div class='control color_temp'>
-        <ha-labeled-slider
-          caption='Color Temperature' icon='mdi:thermometer'
-          min='[[stateObj.attributes.min_mireds]]' max='[[stateObj.attributes.max_mireds]]'
-          value='{{ctSliderValue}}'
-          on-change='ctSliderChanged'
-          ignore-bar-touch></ha-labeled-slider>
+      <div class="control color_temp">
+        <ha-labeled-slider caption="Color Temperature" icon="mdi:thermometer" min="[[stateObj.attributes.min_mireds]]" max="[[stateObj.attributes.max_mireds]]" value="{{ctSliderValue}}" on-change="ctSliderChanged" ignore-bar-touch=""></ha-labeled-slider>
       </div>
 
-      <div class='control white_value'>
-        <ha-labeled-slider
-          caption='White Value' icon='mdi:file-word-box' max='255'
-          value='{{wvSliderValue}}'
-          on-change='wvSliderChanged'
-          ignore-bar-touch></ha-labeled-slider>
+      <div class="control white_value">
+        <ha-labeled-slider caption="White Value" icon="mdi:file-word-box" max="255" value="{{wvSliderValue}}" on-change="wvSliderChanged" ignore-bar-touch=""></ha-labeled-slider>
       </div>
 
-      <ha-color-picker
-        class='control color'
-        on-colorselected='colorPicked'
-        desired-hs-color='{{colorPickerColor}}'
-        throttle='500'
-        hue-segments='24'
-        saturation-segments='8'
-      >
+      <ha-color-picker class="control color" on-colorselected="colorPicked" desired-hs-color="{{colorPickerColor}}" throttle="500" hue-segments="24" saturation-segments="8">
       </ha-color-picker>
 
-      <div class='control effect_list'>
-        <paper-dropdown-menu label-float dynamic-align label='Effect'>
+      <div class="control effect_list">
+        <paper-dropdown-menu label-float="" dynamic-align="" label="Effect">
           <paper-listbox slot="dropdown-content" selected="{{effectIndex}}">
-            <template is='dom-repeat'
-                      items='[[stateObj.attributes.effect_list]]'>
+            <template is="dom-repeat" items="[[stateObj.attributes.effect_list]]">
               <paper-item>[[item]]</paper-item>
             </template>
           </paper-listbox>
@@ -116,19 +103,9 @@
 
       <ha-attributes state-obj="[[stateObj]]" extra-filters="brightness,color_temp,white_value,effect_list,effect,hs_color,rgb_color,xy_color,min_mireds,max_mireds"></ha-attributes>
     </div>
-  </template>
-</dom-module>
+`;
+    }
 
-<script>
-{
-  const FEATURE_CLASS_NAMES = {
-    1: 'has-brightness',
-    2: 'has-color_temp',
-    4: 'has-effect_list',
-    16: 'has-color',
-    128: 'has-white_value',
-  };
-  class MoreInfoLight extends window.hassMixins.EventsMixin(Polymer.Element) {
     static get is() { return 'more-info-light'; }
 
     static get properties() {
@@ -282,4 +259,3 @@
 
   customElements.define(MoreInfoLight.is, MoreInfoLight);
 }
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-lock.html b/src/dialogs/more-info/controls/more-info-lock.js
similarity index 50%
rename from src/dialogs/more-info/controls/more-info-lock.html
rename to src/dialogs/more-info/controls/more-info-lock.js
index 35ee6d8f43..713e035347 100644
--- a/src/dialogs/more-info/controls/more-info-lock.html
+++ b/src/dialogs/more-info/controls/more-info-lock.js
@@ -1,28 +1,28 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../../bower_components/paper-button/paper-button.html'>
-<link rel='import' href='../../../../bower_components/paper-input/paper-input.html'>
-<link rel='import' href='../../../components/ha-attributes.html'>
+import '../../../components/ha-attributes.js';
 
-<dom-module id='more-info-lock'>
-  <template>
+class MoreInfoLock extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       paper-input {
         display: inline-block;
       }
     </style>
 
-    <div hidden$='[[!stateObj.attributes.code_format]]'>
-      <paper-input label='code' value='{{enteredCode}}' pattern='[[stateObj.attributes.code_format]]' type='password'></paper-input>
-      <paper-button on-click='handleUnlockTap' hidden$='[[!isLocked]]'>Unlock</paper-button>
-      <paper-button on-click='handleLockTap' hidden$=[[isLocked]]>Lock</paper-button>
+    <div hidden\$="[[!stateObj.attributes.code_format]]">
+      <paper-input label="code" value="{{enteredCode}}" pattern="[[stateObj.attributes.code_format]]" type="password"></paper-input>
+      <paper-button on-click="handleUnlockTap" hidden\$="[[!isLocked]]">Unlock</paper-button>
+      <paper-button on-click="handleLockTap" hidden\$="[[isLocked]]">Lock</paper-button>
     </div>
-    <ha-attributes state-obj='[[stateObj]]' extra-filters='code_format'></ha-attributes>
-  </template>
-</dom-module>
+    <ha-attributes state-obj="[[stateObj]]" extra-filters="code_format"></ha-attributes>
+`;
+  }
 
-<script>
-class MoreInfoLock extends Polymer.Element {
   static get is() { return 'more-info-lock'; }
 
   static get properties() {
@@ -65,4 +65,3 @@ class MoreInfoLock extends Polymer.Element {
 }
 
 customElements.define(MoreInfoLock.is, MoreInfoLock);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-media_player.html b/src/dialogs/more-info/controls/more-info-media_player.js
similarity index 62%
rename from src/dialogs/more-info/controls/more-info-media_player.html
rename to src/dialogs/more-info/controls/more-info-media_player.js
index 05c5a91694..a17fd46b41 100644
--- a/src/dialogs/more-info/controls/more-info-media_player.html
+++ b/src/dialogs/more-info/controls/more-info-media_player.js
@@ -1,20 +1,20 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../../../components/ha-paper-slider.js';
+import '../../../util/hass-media-player-model.js';
+import '../../../util/hass-mixins.js';
 
-<link rel='import' href='../../../../bower_components/iron-icon/iron-icon.html'>
-
-<link rel='import' href='../../../../bower_components/paper-icon-button/paper-icon-button.html'>
-<link rel='import' href='../../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html'>
-<link rel='import' href='../../../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../../../bower_components/paper-item/paper-item.html'>
-
-<link rel="import" href='../../../../src/components/ha-paper-slider.html'>
-<link rel='import' href='../../../../src/util/hass-mixins.html'>
-<link rel='import' href='../../../../src/util/hass-media-player-model.html'>
-
-<dom-module id='more-info-media_player'>
-  <template>
+{
+  class MoreInfoMediaPlayer extends window.hassMixins.EventsMixin(PolymerElement) {
+    static get template() {
+      return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       .media-state {
@@ -55,78 +55,50 @@
       }
     </style>
 
-    <div class$='[[computeClassNames(stateObj)]]'>
-      <div class='layout horizontal'>
-        <div class='flex'>
-          <paper-icon-button icon='mdi:power' highlight$='[[playerObj.isOff]]'
-            on-click='handleTogglePower'
-            hidden$='[[computeHidePowerButton(playerObj)]]'
-          ></paper-icon-button>
+    <div class\$="[[computeClassNames(stateObj)]]">
+      <div class="layout horizontal">
+        <div class="flex">
+          <paper-icon-button icon="mdi:power" highlight\$="[[playerObj.isOff]]" on-click="handleTogglePower" hidden\$="[[computeHidePowerButton(playerObj)]]"></paper-icon-button>
         </div>
         <div>
-          <template is='dom-if' if='[[computeShowPlaybackControls(playerObj)]]'>
-            <paper-icon-button icon='mdi:skip-previous' on-click='handlePrevious'
-              hidden$='[[!playerObj.supportsPreviousTrack]]'></paper-icon-button>
-            <paper-icon-button icon='[[computePlaybackControlIcon(playerObj)]]'
-              on-click='handlePlaybackControl'
-              hidden$='[[!computePlaybackControlIcon(playerObj)]]' highlight></paper-icon-button>
-            <paper-icon-button icon='mdi:skip-next' on-click='handleNext'
-              hidden$='[[!playerObj.supportsNextTrack]]'></paper-icon-button>
+          <template is="dom-if" if="[[computeShowPlaybackControls(playerObj)]]">
+            <paper-icon-button icon="mdi:skip-previous" on-click="handlePrevious" hidden\$="[[!playerObj.supportsPreviousTrack]]"></paper-icon-button>
+            <paper-icon-button icon="[[computePlaybackControlIcon(playerObj)]]" on-click="handlePlaybackControl" hidden\$="[[!computePlaybackControlIcon(playerObj)]]" highlight=""></paper-icon-button>
+            <paper-icon-button icon="mdi:skip-next" on-click="handleNext" hidden\$="[[!playerObj.supportsNextTrack]]"></paper-icon-button>
           </template>
         </div>
       </div>
       <!-- VOLUME -->
-      <div class='volume_buttons center horizontal layout'
-          hidden$='[[computeHideVolumeButtons(playerObj)]]'>
-        <paper-icon-button on-click="handleVolumeTap"
-          icon="mdi:volume-off"></paper-icon-button>
-        <paper-icon-button id="volumeDown" disabled$='[[playerObj.isMuted]]'
-          on-mousedown="handleVolumeDown" on-touchstart="handleVolumeDown"
-          icon="mdi:volume-medium"></paper-icon-button>
-        <paper-icon-button id="volumeUp" disabled$='[[playerObj.isMuted]]'
-          on-mousedown="handleVolumeUp" on-touchstart="handleVolumeUp"
-          icon="mdi:volume-high"></paper-icon-button>
+      <div class="volume_buttons center horizontal layout" hidden\$="[[computeHideVolumeButtons(playerObj)]]">
+        <paper-icon-button on-click="handleVolumeTap" icon="mdi:volume-off"></paper-icon-button>
+        <paper-icon-button id="volumeDown" disabled\$="[[playerObj.isMuted]]" on-mousedown="handleVolumeDown" on-touchstart="handleVolumeDown" icon="mdi:volume-medium"></paper-icon-button>
+        <paper-icon-button id="volumeUp" disabled\$="[[playerObj.isMuted]]" on-mousedown="handleVolumeUp" on-touchstart="handleVolumeUp" icon="mdi:volume-high"></paper-icon-button>
       </div>
-      <div class='volume center horizontal layout' hidden$='[[!playerObj.supportsVolumeSet]]'>
-        <paper-icon-button on-click="handleVolumeTap"
-          hidden$="[[playerObj.supportsVolumeButtons]]"
-          icon="[[computeMuteVolumeIcon(playerObj)]]"></paper-icon-button>
-        <ha-paper-slider disabled$='[[playerObj.isMuted]]'
-          min='0' max='100' value='[[playerObj.volumeSliderValue]]'
-          on-change='volumeSliderChanged' class='flex'
-          ignore-bar-touch>
+      <div class="volume center horizontal layout" hidden\$="[[!playerObj.supportsVolumeSet]]">
+        <paper-icon-button on-click="handleVolumeTap" hidden\$="[[playerObj.supportsVolumeButtons]]" icon="[[computeMuteVolumeIcon(playerObj)]]"></paper-icon-button>
+        <ha-paper-slider disabled\$="[[playerObj.isMuted]]" min="0" max="100" value="[[playerObj.volumeSliderValue]]" on-change="volumeSliderChanged" class="flex" ignore-bar-touch="">
         </ha-paper-slider>
       </div>
       <!-- SOURCE PICKER -->
-      <div class='controls layout horizontal justified'
-           hidden$='[[computeHideSelectSource(playerObj)]]'>
+      <div class="controls layout horizontal justified" hidden\$="[[computeHideSelectSource(playerObj)]]">
         <iron-icon class="source-input" icon="mdi:login-variant"></iron-icon>
-        <paper-dropdown-menu class="flex source-input" dynamic-align label-float label='Source'>
+        <paper-dropdown-menu class="flex source-input" dynamic-align="" label-float="" label="Source">
           <paper-listbox slot="dropdown-content" selected="{{sourceIndex}}">
-            <template is='dom-repeat' items='[[playerObj.sourceList]]'>
+            <template is="dom-repeat" items="[[playerObj.sourceList]]">
               <paper-item>[[item]]</paper-item>
             </template>
           </paper-listbox>
         </paper-dropdown-menu>
       </div>
       <!-- TTS -->
-      <div hidden$='[[computeHideTTS(ttsLoaded, playerObj)]]' class='layout horizontal end'>
-        <paper-input
-          id='ttsInput'
-          label='Text to speak'
-          class='flex'
-          value='{{ttsMessage}}'
-          on-keydown="ttsCheckForEnter"
-        ></paper-input>
-        <paper-icon-button icon='mdi:send' on-click='sendTTS'></paper-icon-button>
+      <div hidden\$="[[computeHideTTS(ttsLoaded, playerObj)]]" class="layout horizontal end">
+        <paper-input id="ttsInput" label="Text to speak" class="flex" value="{{ttsMessage}}" on-keydown="ttsCheckForEnter"></paper-input>
+        <paper-icon-button icon="mdi:send" on-click="sendTTS"></paper-icon-button>
       </div>
     </div>
-  </template>
-</dom-module>
+`;
+    }
 
-<script>
-{
-  class MoreInfoMediaPlayer extends window.hassMixins.EventsMixin(Polymer.Element) {
     static get is() { return 'more-info-media_player'; }
 
     static get properties() {
@@ -312,4 +284,3 @@
 
   customElements.define(MoreInfoMediaPlayer.is, MoreInfoMediaPlayer);
 }
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-script.html b/src/dialogs/more-info/controls/more-info-script.html
deleted file mode 100644
index c09d76e045..0000000000
--- a/src/dialogs/more-info/controls/more-info-script.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<dom-module id='more-info-script'>
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-
-    <div class='layout vertical'>
-      <div class='data-entry layout justified horizontal'>
-        <div class='key'>Last Action</div>
-        <div class='value'>[[stateObj.attributes.last_action]]</div>
-      </div>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-class MoreInfoScript extends Polymer.Element {
-  static get is() { return 'more-info-script'; }
-
-  static get properties() {
-    return {
-      stateObj: {
-        type: Object,
-      },
-    };
-  }
-}
-
-customElements.define(MoreInfoScript.is, MoreInfoScript);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-script.js b/src/dialogs/more-info/controls/more-info-script.js
new file mode 100644
index 0000000000..2f797ff56d
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-script.js
@@ -0,0 +1,30 @@
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+class MoreInfoScript extends PolymerElement {
+  static get template() {
+    return html`
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+
+    <div class="layout vertical">
+      <div class="data-entry layout justified horizontal">
+        <div class="key">Last Action</div>
+        <div class="value">[[stateObj.attributes.last_action]]</div>
+      </div>
+    </div>
+`;
+  }
+
+  static get is() { return 'more-info-script'; }
+
+  static get properties() {
+    return {
+      stateObj: {
+        type: Object,
+      },
+    };
+  }
+}
+
+customElements.define(MoreInfoScript.is, MoreInfoScript);
diff --git a/src/dialogs/more-info/controls/more-info-sun.html b/src/dialogs/more-info/controls/more-info-sun.js
similarity index 60%
rename from src/dialogs/more-info/controls/more-info-sun.html
rename to src/dialogs/more-info/controls/more-info-sun.js
index dfe47b747d..63e155c90c 100644
--- a/src/dialogs/more-info/controls/more-info-sun.html
+++ b/src/dialogs/more-info/controls/more-info-sun.js
@@ -1,31 +1,30 @@
-<link rel="import" href="../../../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../../../components/ha-relative-time.js';
 
-<link rel="import" href="../../../components/ha-relative-time.html">
-
-<dom-module id="more-info-sun">
-  <template>
+class MoreInfoSun extends PolymerElement {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
 
-    <template is='dom-repeat' items='[[computeOrder(risingDate, settingDate)]]'>
-      <div class='data-entry layout justified horizontal'>
-        <div class='key'>
+    <template is="dom-repeat" items="[[computeOrder(risingDate, settingDate)]]">
+      <div class="data-entry layout justified horizontal">
+        <div class="key">
           <span>[[itemCaption(item)]]</span>
           <ha-relative-time datetime-obj="[[itemDate(item)]]"></ha-relative-time>
         </div>
-        <div class='value'>[[itemValue(item)]]</div>
+        <div class="value">[[itemValue(item)]]</div>
       </div>
     </template>
-      <div class='data-entry layout justified horizontal'>
-        <div class='key'>Elevation</div>
-        <div class='value'>[[stateObj.attributes.elevation]]</div>
+      <div class="data-entry layout justified horizontal">
+        <div class="key">Elevation</div>
+        <div class="value">[[stateObj.attributes.elevation]]</div>
      </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoSun extends Polymer.Element {
   static get is() { return 'more-info-sun'; }
 
   static get properties() {
@@ -72,4 +71,3 @@ class MoreInfoSun extends Polymer.Element {
 }
 
 customElements.define(MoreInfoSun.is, MoreInfoSun);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-updater.html b/src/dialogs/more-info/controls/more-info-updater.js
similarity index 56%
rename from src/dialogs/more-info/controls/more-info-updater.html
rename to src/dialogs/more-info/controls/more-info-updater.js
index 0cefff3465..ebaa2c0442 100644
--- a/src/dialogs/more-info/controls/more-info-updater.html
+++ b/src/dialogs/more-info/controls/more-info-updater.js
@@ -1,7 +1,9 @@
-<link rel="import" href="../../../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="more-info-updater">
-  <template>
+class MoreInfoUpdater extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       .link {
         color: #03A9F4;
@@ -9,13 +11,11 @@
     </style>
 
     <div>
-      <a class='link' href='https://www.home-assistant.io/docs/installation/updating/' target='_blank'>Update Instructions</a>
+      <a class="link" href="https://www.home-assistant.io/docs/installation/updating/" target="_blank">Update Instructions</a>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoUpdater extends Polymer.Element {
   static get is() { return 'more-info-updater'; }
 
   static get properties() {
@@ -33,4 +33,3 @@ class MoreInfoUpdater extends Polymer.Element {
 }
 
 customElements.define(MoreInfoUpdater.is, MoreInfoUpdater);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-vacuum.html b/src/dialogs/more-info/controls/more-info-vacuum.js
similarity index 63%
rename from src/dialogs/more-info/controls/more-info-vacuum.html
rename to src/dialogs/more-info/controls/more-info-vacuum.js
index 0f0c5e8d93..073fdba2db 100644
--- a/src/dialogs/more-info/controls/more-info-vacuum.html
+++ b/src/dialogs/more-info/controls/more-info-vacuum.js
@@ -1,18 +1,17 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../../../components/ha-attributes.js';
 
-<link rel='import' href='../../../../bower_components/iron-icon/iron-icon.html'>
-
-<link rel='import' href='../../../../bower_components/paper-icon-button/paper-icon-button.html'>
-<link rel='import' href='../../../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../../../bower_components/paper-item/paper-item.html'>
-<link rel='import' href='../../../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html'>
-
-<link rel="import" href="../../../components/ha-attributes.html">
-
-<dom-module id='more-info-vacuum'>
-  <template>
+class MoreInfoVacuum extends PolymerElement {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       :host {
@@ -30,47 +29,41 @@
 
     </style>
 
-    <div class='horizontal justified layout'>
-      <div hidden$='[[!supportsStatus(stateObj)]]'>
+    <div class="horizontal justified layout">
+      <div hidden\$="[[!supportsStatus(stateObj)]]">
         <span class="status-subtitle">Status: </span><span><strong>[[stateObj.attributes.status]]</strong></span>
       </div>
-      <div hidden$='[[!supportsBattery(stateObj)]]'>
+      <div hidden\$="[[!supportsBattery(stateObj)]]">
         <span><iron-icon icon="[[stateObj.attributes.battery_icon]]"></iron-icon> [[stateObj.attributes.battery_level]] %</span>
       </div>
     </div>
-    <div hidden$='[[!supportsCommandBar(stateObj)]]'>
+    <div hidden\$="[[!supportsCommandBar(stateObj)]]">
       <p></p>
       <div class="status-subtitle">Vacuum cleaner commands:</div>
-      <div class='horizontal justified layout'>
-        <div hidden$='[[!supportsPause(stateObj)]]'>
-          <paper-icon-button icon='mdi:play-pause'
-            on-click='onPlayPause' title='Start/Pause'></paper-icon-button>
+      <div class="horizontal justified layout">
+        <div hidden\$="[[!supportsPause(stateObj)]]">
+          <paper-icon-button icon="mdi:play-pause" on-click="onPlayPause" title="Start/Pause"></paper-icon-button>
         </div>
-        <div hidden$='[[!supportsStop(stateObj)]]'>
-          <paper-icon-button icon='mdi:stop'
-            on-click='onStop' title='Stop'></paper-icon-button>
+        <div hidden\$="[[!supportsStop(stateObj)]]">
+          <paper-icon-button icon="mdi:stop" on-click="onStop" title="Stop"></paper-icon-button>
         </div>
-        <div hidden$='[[!supportsCleanSpot(stateObj)]]'>
-        <paper-icon-button icon='mdi:broom'
-            on-click='onCleanSpot' title='Clean spot'></paper-icon-button>
+        <div hidden\$="[[!supportsCleanSpot(stateObj)]]">
+        <paper-icon-button icon="mdi:broom" on-click="onCleanSpot" title="Clean spot"></paper-icon-button>
         </div>
-        <div hidden$='[[!supportsLocate(stateObj)]]'>
-        <paper-icon-button icon='mdi:map-marker'
-            on-click='onLocate' title='Locate'></paper-icon-button>
+        <div hidden\$="[[!supportsLocate(stateObj)]]">
+        <paper-icon-button icon="mdi:map-marker" on-click="onLocate" title="Locate"></paper-icon-button>
         </div>
-        <div hidden$='[[!supportsReturnHome(stateObj)]]'>
-        <paper-icon-button icon='mdi:home-map-marker'
-            on-click='onReturnHome' title='Return home'></paper-icon-button>
+        <div hidden\$="[[!supportsReturnHome(stateObj)]]">
+        <paper-icon-button icon="mdi:home-map-marker" on-click="onReturnHome" title="Return home"></paper-icon-button>
         </div>
       </div>
     </div>
 
-    <div hidden$='[[!supportsFanSpeed(stateObj)]]'>
-      <div class='horizontal justified layout'>
-        <paper-dropdown-menu label-float dynamic-align label='Fan speed'>
-          <paper-listbox slot="dropdown-content" selected='{{fanSpeedIndex}}'>
-            <template is='dom-repeat'
-                      items='[[stateObj.attributes.fan_speed_list]]'>
+    <div hidden\$="[[!supportsFanSpeed(stateObj)]]">
+      <div class="horizontal justified layout">
+        <paper-dropdown-menu label-float="" dynamic-align="" label="Fan speed">
+          <paper-listbox slot="dropdown-content" selected="{{fanSpeedIndex}}">
+            <template is="dom-repeat" items="[[stateObj.attributes.fan_speed_list]]">
               <paper-item>[[item]]</paper-item>
             </template>
           </paper-listbox>
@@ -82,11 +75,9 @@
       <p></p>
     </div>
     <ha-attributes state-obj="[[stateObj]]" extra-filters="fan_speed,fan_speed_list,status,battery_level,battery_icon"></ha-attributes>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoVacuum extends Polymer.Element {
   static get is() { return 'more-info-vacuum'; }
 
   static get properties() {
@@ -202,4 +193,3 @@ class MoreInfoVacuum extends Polymer.Element {
 }
 
 customElements.define(MoreInfoVacuum.is, MoreInfoVacuum);
-</script>
diff --git a/src/dialogs/more-info/controls/more-info-weather.html b/src/dialogs/more-info/controls/more-info-weather.js
similarity index 93%
rename from src/dialogs/more-info/controls/more-info-weather.html
rename to src/dialogs/more-info/controls/more-info-weather.js
index 68e8663485..09bca29e4b 100644
--- a/src/dialogs/more-info/controls/more-info-weather.html
+++ b/src/dialogs/more-info/controls/more-info-weather.js
@@ -1,10 +1,15 @@
-<link rel='import' href='../../../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../../../bower_components/iron-icon/iron-icon.html'>
+import '@polymer/iron-icon/iron-icon.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../../util/hass-mixins.html'>
+import '../../../util/hass-mixins.js';
 
-<dom-module id='more-info-weather'>
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class MoreInfoWeather extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       iron-icon {
         color: var(--paper-item-icon-color);
@@ -78,7 +83,7 @@
 
     <template is="dom-if" if="[[stateObj.attributes.forecast]]">
       <div class="section">[[localize('ui.card.weather.forecast')]]:</div>
-      <template is='dom-repeat' items='[[stateObj.attributes.forecast]]'>
+      <template is="dom-repeat" items="[[stateObj.attributes.forecast]]">
         <div class="flex">
           <template is="dom-if" if="[[item.condition]]">
             <iron-icon icon="[[getWeatherIcon(item.condition)]]"></iron-icon>
@@ -95,14 +100,9 @@
     <template is="dom-if" if="stateObj.attributes.attribution">
       <div class="attribution">[[stateObj.attributes.attribution]]</div>
     </template>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class MoreInfoWeather extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'more-info-weather'; }
 
   static get properties() {
@@ -183,4 +183,3 @@ class MoreInfoWeather extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(MoreInfoWeather.is, MoreInfoWeather);
-</script>
diff --git a/src/dialogs/more-info/more-info-controls.html b/src/dialogs/more-info/more-info-controls.js
similarity index 56%
rename from src/dialogs/more-info/more-info-controls.html
rename to src/dialogs/more-info/more-info-controls.js
index aa31748e6f..4afaf69ede 100644
--- a/src/dialogs/more-info/more-info-controls.html
+++ b/src/dialogs/more-info/more-info-controls.js
@@ -1,17 +1,26 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../components/state-history-charts.html">
-<link rel="import" href="../../data/ha-state-history-data.html">
-<link rel="import" href="../../state-summary/state-card-content.html">
-<link rel='import' href='../../util/hass-mixins.html'>
-<link rel='import' href='../../resources/ha-style.html'>
-<link rel="import" href="./controls/more-info-content.html">
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-dialog-scrollable/paper-dialog-scrollable.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<dom-module id="more-info-controls">
-  <template>
-    <style include='ha-style-dialog'>
+import '../../components/state-history-charts.js';
+import '../../data/ha-state-history-data.js';
+import '../../resources/ha-style.js';
+import '../../state-summary/state-card-content.js';
+import '../../util/hass-mixins.js';
+import './controls/more-info-content.js';
+
+{
+  const DOMAINS_NO_INFO = [
+    'camera',
+    'configurator',
+    'history_graph',
+  ];
+  class MoreInfoControls extends window.hassMixins.EventsMixin(PolymerElement) {
+    static get template() {
+      return html`
+    <style include="ha-style-dialog">
       app-toolbar {
         color: var(--more-info-header-color);
         background-color: var(--more-info-header-background);
@@ -44,56 +53,26 @@
     </style>
 
     <app-toolbar>
-      <paper-icon-button
-        icon='mdi:close'
-        dialog-dismiss
-      ></paper-icon-button>
-      <div class="main-title" main-title on-click="enlarge">[[_computeStateName(stateObj)]]</div>
-      <template is='dom-if' if='[[canConfigure]]'>
-        <paper-icon-button
-          icon='mdi:settings'
-          on-click='_gotoSettings'
-        ></paper-icon-button>
+      <paper-icon-button icon="mdi:close" dialog-dismiss=""></paper-icon-button>
+      <div class="main-title" main-title="" on-click="enlarge">[[_computeStateName(stateObj)]]</div>
+      <template is="dom-if" if="[[canConfigure]]">
+        <paper-icon-button icon="mdi:settings" on-click="_gotoSettings"></paper-icon-button>
       </template>
     </app-toolbar>
 
-    <template is='dom-if' if="[[_computeShowStateInfo(stateObj)]]" restamp>
-      <state-card-content
-        state-obj="[[stateObj]]"
-        hass='[[hass]]' in-dialog></state-card-content>
+    <template is="dom-if" if="[[_computeShowStateInfo(stateObj)]]" restamp="">
+      <state-card-content state-obj="[[stateObj]]" hass="[[hass]]" in-dialog=""></state-card-content>
     </template>
-    <paper-dialog-scrollable dialog-element='[[dialogElement]]'>
-      <template is='dom-if' if="[[_computeShowHistoryComponent(hass, stateObj)]]" restamp>
-        <ha-state-history-data
-          hass='[[hass]]'
-          filter-type='recent-entity'
-          entity-id='[[stateObj.entity_id]]'
-          data='{{_stateHistory}}'
-          is-loading='{{_stateHistoryLoading}}'
-          cache-config='[[_cacheConfig]]'
-        ></ha-state-history-data>
-        <state-history-charts
-          history-data="[[_stateHistory]]"
-          is-loading-data="[[_stateHistoryLoading]]"
-          up-to-now
-          no-single=[[large]]
-        ></state-history-charts>
+    <paper-dialog-scrollable dialog-element="[[dialogElement]]">
+      <template is="dom-if" if="[[_computeShowHistoryComponent(hass, stateObj)]]" restamp="">
+        <ha-state-history-data hass="[[hass]]" filter-type="recent-entity" entity-id="[[stateObj.entity_id]]" data="{{_stateHistory}}" is-loading="{{_stateHistoryLoading}}" cache-config="[[_cacheConfig]]"></ha-state-history-data>
+        <state-history-charts history-data="[[_stateHistory]]" is-loading-data="[[_stateHistoryLoading]]" up-to-now="" no-single="[[large]]"></state-history-charts>
       </template>
-      <more-info-content
-        state-obj="[[stateObj]]" hass='[[hass]]'
-      ></more-info-content>
+      <more-info-content state-obj="[[stateObj]]" hass="[[hass]]"></more-info-content>
     </paper-dialog-scrollable>
-  </template>
-</dom-module>
+`;
+    }
 
-<script>
-{
-  const DOMAINS_NO_INFO = [
-    'camera',
-    'configurator',
-    'history_graph',
-  ];
-  class MoreInfoControls extends window.hassMixins.EventsMixin(Polymer.Element) {
     static get is() { return 'more-info-controls'; }
     static get properties() {
       return {
@@ -174,4 +153,3 @@
   }
   customElements.define(MoreInfoControls.is, MoreInfoControls);
 }
-</script>
diff --git a/src/dialogs/more-info/more-info-settings.html b/src/dialogs/more-info/more-info-settings.js
similarity index 64%
rename from src/dialogs/more-info/more-info-settings.html
rename to src/dialogs/more-info/more-info-settings.js
index 7282ec0b74..ad48dd46ac 100644
--- a/src/dialogs/more-info/more-info-settings.html
+++ b/src/dialogs/more-info/more-info-settings.js
@@ -1,13 +1,15 @@
-<link rel="import" href="../../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../../bower_components/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="../../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../../bower_components/paper-button/paper-button.html">
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../util/hass-mixins.html'>
+import '../../util/hass-mixins.js';
 
-<dom-module id="more-info-settings">
-  <template>
+class MoreInfoSettings extends window.hassMixins.EventsMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
       app-toolbar {
         color: var(--more-info-header-color);
@@ -32,25 +34,17 @@
     </style>
 
     <app-toolbar>
-      <paper-icon-button
-        icon='mdi:arrow-left'
-        on-click='_backTapped'
-      ></paper-icon-button>
-      <div main-title>[[_computeStateName(stateObj)]]</div>
-      <paper-button on-click='_save'>Save</paper-button>
+      <paper-icon-button icon="mdi:arrow-left" on-click="_backTapped"></paper-icon-button>
+      <div main-title="">[[_computeStateName(stateObj)]]</div>
+      <paper-button on-click="_save">Save</paper-button>
     </app-toolbar>
 
-    <div class='form'>
-      <paper-input
-        value='{{_name}}'
-        label='Name'
-      ></paper-input>
+    <div class="form">
+      <paper-input value="{{_name}}" label="Name"></paper-input>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class MoreInfoSettings extends window.hassMixins.EventsMixin(Polymer.Element) {
   static get is() { return 'more-info-settings'; }
   static get properties() {
     return {
@@ -106,4 +100,3 @@ class MoreInfoSettings extends window.hassMixins.EventsMixin(Polymer.Element) {
   }
 }
 customElements.define(MoreInfoSettings.is, MoreInfoSettings);
-</script>
diff --git a/src/entrypoint.html b/src/entrypoint.html
deleted file mode 100644
index e2d3ae0b36..0000000000
--- a/src/entrypoint.html
+++ /dev/null
@@ -1 +0,0 @@
-<!--unused, but required for polymer-build-->
diff --git a/src/home-assistant.html b/src/home-assistant.js
similarity index 78%
rename from src/home-assistant.html
rename to src/home-assistant.js
index efdc9963fb..ea8a8b4f92 100644
--- a/src/home-assistant.html
+++ b/src/home-assistant.js
@@ -1,61 +1,38 @@
-<link rel="import" href='../bower_components/polymer/polymer-element.html'>
-<script>
-  Polymer.setPassiveTouchGestures(true);
-  /* LastPass createElement workaround. See #428 */
-  document.createElement = Document.prototype.createElement;
-</script>
-<link rel='import' href='./util/roboto.html'>
-<link rel='import' href='../bower_components/paper-styles/typography.html'>
-<link rel='import' href='../bower_components/iron-flex-layout/iron-flex-layout-classes.html'>
-<link rel='import' href='../bower_components/app-route/app-route.html'>
-<link rel='import' href='../bower_components/app-route/app-location.html'>
+import 'web-animations-js/web-animations-next-lite.min.js';
 
-<!--polyfill for paper-dropdown-->
-<link rel="import" href="../bower_components/neon-animation/web-animations.html">
+import '@polymer/app-route/app-location.js';
+import '@polymer/app-route/app-route.js';
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-styles/typography.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { setPassiveTouchGestures } from '@polymer/polymer/lib/utils/settings.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../build-translations/translationMetadata.html' />
-<link rel='import' href='./util/hass-translation.html'>
-<link rel='import' href='./util/hass-util.html'>
-<link rel='import' href='./util/ha-pref-storage.html'>
-<link rel='import' href='./util/hass-call-api.html'>
-<link rel='import' href='./layouts/login-form.html'>
-<link rel='import' href='./layouts/home-assistant-main.html'>
-<link rel='import' href='./resources/ha-style.html'>
-<link rel="import" href="./resources/panel-imports.html">
-<link rel='import' href='./managers/notification-manager.html'>
+import translationMetadata from '../build-translations/translationMetadata.json';
+import './layouts/home-assistant-main.js';
+import './layouts/login-form.js';
+import './managers/notification-manager.js';
+import './resources/ha-style.js';
+import './resources/html-import/polyfill.js';
+import './resources/panel-imports.js';
+import './util/ha-pref-storage.js';
+import './util/hass-call-api.js';
+import './util/hass-translation.js';
+import './util/hass-util.js';
+import './util/legacy-support';
+import './util/roboto.js';
+// For mdi icons.
+import './components/ha-iconset-svg.js';
 
-<dom-module id='home-assistant'>
-  <template>
-    <ha-pref-storage hass='[[hass]]' id='storage'></ha-pref-storage>
-    <notification-manager id='notifications' hass='[[hass]]'></notification-manager>
-    <app-location route="{{route}}"></app-location>
-    <app-route
-      route="{{route}}"
-      pattern="/:panel"
-      data="{{routeData}}"
-    ></app-route>
-    <template is='dom-if' if='[[showMain]]' restamp>
-      <home-assistant-main
-        on-hass-more-info='handleMoreInfo'
-        on-hass-dock-sidebar='handleDockSidebar'
-        on-hass-notification='handleNotification'
-        on-hass-logout='handleLogout'
-        hass='[[hass]]'
-        route='{{route}}'
-      ></home-assistant-main>
-    </template>
-
-    <template is='dom-if' if='[[!showMain]]' restamp>
-      <login-form
-        hass='[[hass]]'
-        connection-promise='{{connectionPromise}}'
-        show-loading='[[computeShowLoading(connectionPromise, hass)]]'>
-      </login-form>
-    </template>
-  </template>
-</dom-module>
-
-<script>
+setPassiveTouchGestures(true);
+/* LastPass createElement workaround. See #428 */
+document.createElement = Document.prototype.createElement;
+/* polyfill for paper-dropdown */
+/*
+  FIXME(polymer-modulizer): the above comments were extracted
+  from HTML and may be out of place here. Review them and
+  then delete this comment!
+*/
 window.removeInitMsg = function () {
   var initMsg = document.getElementById('ha-init-skeleton');
   if (initMsg) {
@@ -63,7 +40,24 @@ window.removeInitMsg = function () {
   }
 };
 
-class HomeAssistant extends Polymer.Element {
+class HomeAssistant extends PolymerElement {
+  static get template() {
+    return html`
+    <ha-pref-storage hass="[[hass]]" id="storage"></ha-pref-storage>
+    <notification-manager id="notifications" hass="[[hass]]"></notification-manager>
+    <app-location route="{{route}}"></app-location>
+    <app-route route="{{route}}" pattern="/:panel" data="{{routeData}}"></app-route>
+    <template is="dom-if" if="[[showMain]]" restamp="">
+      <home-assistant-main on-hass-more-info="handleMoreInfo" on-hass-dock-sidebar="handleDockSidebar" on-hass-notification="handleNotification" on-hass-logout="handleLogout" hass="[[hass]]" route="{{route}}"></home-assistant-main>
+    </template>
+
+    <template is="dom-if" if="[[!showMain]]" restamp="">
+      <login-form hass="[[hass]]" connection-promise="{{connectionPromise}}" show-loading="[[computeShowLoading(connectionPromise, hass)]]">
+      </login-form>
+    </template>
+`;
+  }
+
   static get is() { return 'home-assistant'; }
 
   static get properties() {
@@ -177,7 +171,7 @@ class HomeAssistant extends Polymer.Element {
       // If resources are already loaded, don't discard them
       resources: (this.hass && this.hass.resources) || null,
 
-      translationMetadata: window.translationMetadata,
+      translationMetadata: translationMetadata,
       dockedSidebar: false,
       moreInfoEntityId: null,
       callService: (domain, service, serviceData) =>
@@ -352,7 +346,7 @@ class HomeAssistant extends Polymer.Element {
   }
 
   loadTranslationFragment(panelUrl) {
-    if (window.translationMetadata.fragments.includes(panelUrl)) {
+    if (translationMetadata.fragments.includes(panelUrl)) {
       this.loadResources(panelUrl);
     }
   }
@@ -363,4 +357,3 @@ class HomeAssistant extends Polymer.Element {
 }
 
 customElements.define(HomeAssistant.is, HomeAssistant);
-</script>
diff --git a/src/layouts/ha-app-layout.html b/src/layouts/ha-app-layout.js
similarity index 84%
rename from src/layouts/ha-app-layout.html
rename to src/layouts/ha-app-layout.js
index 94d570e424..43028ce555 100644
--- a/src/layouts/ha-app-layout.html
+++ b/src/layouts/ha-app-layout.js
@@ -1,6 +1,4 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<!--
+/**
 @license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@@ -8,23 +6,31 @@ The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
 The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-
-<!--
+*/
+/*
 This code is copied from app-header-layout.
 'fullbleed' support is removed as Home Assisstant doesn't use it.
 transform: translate(0) is added.
--->
+*/
+/*
+  FIXME(polymer-modulizer): the above comments were extracted
+  from HTML and may be out of place here. Review them and
+  then delete this comment!
+*/
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import '@polymer/polymer/polymer-element.js';
 
-<dom-module id="ha-app-layout">
-  <template>
+class HaAppLayout extends customElements.get('app-header-layout') {
+  static get template() {
+    return html`
     <style>
       :host {
         display: block;
         /**
          * Force app-header-layout to have its own stacking context so that its parent can
          * control the stacking of it relative to other elements (e.g. app-drawer-layout).
-         * This could be done using `isolation: isolate`, but that's not well supported
+         * This could be done using \`isolation: isolate\`, but that's not well supported
          * across browsers.
          */
         position: relative;
@@ -87,13 +93,9 @@ transform: translate(0) is added.
       </div>
       <slot id="fab" name="fab"></slot>
     </div>
+`;
+  }
 
-  </template>
-</dom-module>
-
-<script>
-class HaAppLayout extends customElements.get('app-header-layout') {
   static get is() { return 'ha-app-layout'; }
 }
 customElements.define(HaAppLayout.is, HaAppLayout);
-</script>
diff --git a/src/layouts/hass-error-screen.html b/src/layouts/hass-error-screen.html
deleted file mode 100644
index 4a734f190d..0000000000
--- a/src/layouts/hass-error-screen.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel='import' href='../../bower_components/paper-button/paper-button.html'>
-
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-
-<dom-module id='hass-error-screen'>
-  <template>
-    <style include='iron-flex ha-style'>
-      .placeholder {
-        height: 100%;
-      }
-
-      .layout {
-        height: calc(100% - 64px);
-      }
-
-      paper-button {
-        font-weight: bold;
-        color: var(--primary-color);
-      }
-    </style>
-
-    <div class='placeholder'>
-      <app-toolbar>
-        <div main-title>[[title]]</div>
-      </app-toolbar>
-      <div class='layout vertical center-center'>
-        <h3>[[error]]</h3>
-        <paper-button on-click='backTapped'>go back</paper-button>
-      </div>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-class HassErrorScreen extends Polymer.Element {
-  static get is() { return 'hass-error-screen'; }
-
-  static get properties() {
-    return {
-      title: {
-        type: String,
-        value: 'Home Assistant',
-      },
-
-      error: {
-        type: String,
-        value: 'Oops! It looks like something went wrong.'
-      },
-    };
-  }
-
-  backTapped() {
-    history.back();
-  }
-}
-
-customElements.define(HassErrorScreen.is, HassErrorScreen);
-</script>
diff --git a/src/layouts/hass-error-screen.js b/src/layouts/hass-error-screen.js
new file mode 100644
index 0000000000..37e2d9ec5b
--- /dev/null
+++ b/src/layouts/hass-error-screen.js
@@ -0,0 +1,58 @@
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+class HassErrorScreen extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style">
+      .placeholder {
+        height: 100%;
+      }
+
+      .layout {
+        height: calc(100% - 64px);
+      }
+
+      paper-button {
+        font-weight: bold;
+        color: var(--primary-color);
+      }
+    </style>
+
+    <div class="placeholder">
+      <app-toolbar>
+        <div main-title="">[[title]]</div>
+      </app-toolbar>
+      <div class="layout vertical center-center">
+        <h3>[[error]]</h3>
+        <paper-button on-click="backTapped">go back</paper-button>
+      </div>
+    </div>
+`;
+  }
+
+  static get is() { return 'hass-error-screen'; }
+
+  static get properties() {
+    return {
+      title: {
+        type: String,
+        value: 'Home Assistant',
+      },
+
+      error: {
+        type: String,
+        value: 'Oops! It looks like something went wrong.'
+      },
+    };
+  }
+
+  backTapped() {
+    history.back();
+  }
+}
+
+customElements.define(HassErrorScreen.is, HassErrorScreen);
diff --git a/src/layouts/hass-loading-screen.html b/src/layouts/hass-loading-screen.html
deleted file mode 100644
index b4ca9b497e..0000000000
--- a/src/layouts/hass-loading-screen.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel='import' href='../../bower_components/paper-spinner/paper-spinner.html'>
-
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-
-<link rel="import" href="../components/ha-menu-button.html">
-
-<dom-module id='hass-loading-screen'>
-  <template>
-    <style include='iron-flex ha-style'>
-      .placeholder {
-        height: 100%;
-      }
-
-      .layout {
-        height: calc(100% - 64px);
-      }
-    </style>
-
-    <div class='placeholder'>
-      <app-toolbar>
-        <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
-        <div main-title>[[title]]</div>
-      </app-toolbar>
-      <div class='layout horizontal center-center'>
-        <paper-spinner active></paper-spinner>
-      </div>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-class HassLoadingScreen extends Polymer.Element {
-  static get is() { return 'hass-loading-screen'; }
-
-  static get properties() {
-    return {
-      narrow: {
-        type: Boolean,
-        value: false,
-      },
-
-      showMenu: {
-        type: Boolean,
-        value: false,
-      },
-
-      title: {
-        type: String,
-        value: '',
-      },
-    };
-  }
-}
-
-customElements.define(HassLoadingScreen.is, HassLoadingScreen);
-</script>
diff --git a/src/layouts/hass-loading-screen.js b/src/layouts/hass-loading-screen.js
new file mode 100644
index 0000000000..524b3c59d8
--- /dev/null
+++ b/src/layouts/hass-loading-screen.js
@@ -0,0 +1,56 @@
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-spinner/paper-spinner.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../components/ha-menu-button.js';
+
+class HassLoadingScreen extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="iron-flex ha-style">
+      .placeholder {
+        height: 100%;
+      }
+
+      .layout {
+        height: calc(100% - 64px);
+      }
+    </style>
+
+    <div class="placeholder">
+      <app-toolbar>
+        <ha-menu-button narrow="[[narrow]]" show-menu="[[showMenu]]"></ha-menu-button>
+        <div main-title="">[[title]]</div>
+      </app-toolbar>
+      <div class="layout horizontal center-center">
+        <paper-spinner active=""></paper-spinner>
+      </div>
+    </div>
+`;
+  }
+
+  static get is() { return 'hass-loading-screen'; }
+
+  static get properties() {
+    return {
+      narrow: {
+        type: Boolean,
+        value: false,
+      },
+
+      showMenu: {
+        type: Boolean,
+        value: false,
+      },
+
+      title: {
+        type: String,
+        value: '',
+      },
+    };
+  }
+}
+
+customElements.define(HassLoadingScreen.is, HassLoadingScreen);
diff --git a/src/layouts/hass-subpage.html b/src/layouts/hass-subpage.html
deleted file mode 100644
index c8365722ad..0000000000
--- a/src/layouts/hass-subpage.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<link rel="import" href='../../bower_components/polymer/polymer-element.html'>
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-
-<dom-module id="hass-subpage">
-  <template>
-    <style include="ha-style"></style>
-    <app-header-layout has-scrolling-region>
-      <app-header slot="header" fixed>
-        <app-toolbar>
-          <paper-icon-button
-            icon='mdi:arrow-left'
-            on-click='_backTapped'
-          ></paper-icon-button>
-          <div main-title>[[header]]</div>
-        </app-toolbar>
-      </app-header>
-
-      <slot></slot>
-    </app-header-layout>
-  </template>
-</dom-module>
-
-<script>
-class HassSubpage extends Polymer.Element {
-  static get is() { return 'hass-subpage'; }
-
-  static get properties() {
-    return {
-      header: String
-    };
-  }
-
-  _backTapped() {
-    history.back();
-  }
-}
-
-customElements.define(HassSubpage.is, HassSubpage);
-</script>
diff --git a/src/layouts/hass-subpage.js b/src/layouts/hass-subpage.js
new file mode 100644
index 0000000000..7b41ff177b
--- /dev/null
+++ b/src/layouts/hass-subpage.js
@@ -0,0 +1,38 @@
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/paper-icon-button/paper-icon-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+class HassSubpage extends PolymerElement {
+  static get template() {
+    return html`
+    <style include="ha-style"></style>
+    <app-header-layout has-scrolling-region="">
+      <app-header slot="header" fixed="">
+        <app-toolbar>
+          <paper-icon-button icon="mdi:arrow-left" on-click="_backTapped"></paper-icon-button>
+          <div main-title="">[[header]]</div>
+        </app-toolbar>
+      </app-header>
+
+      <slot></slot>
+    </app-header-layout>
+`;
+  }
+
+  static get is() { return 'hass-subpage'; }
+
+  static get properties() {
+    return {
+      header: String
+    };
+  }
+
+  _backTapped() {
+    history.back();
+  }
+}
+
+customElements.define(HassSubpage.is, HassSubpage);
diff --git a/src/layouts/home-assistant-main.html b/src/layouts/home-assistant-main.html
deleted file mode 100644
index e451d9449e..0000000000
--- a/src/layouts/home-assistant-main.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/app-layout/app-drawer-layout/app-drawer-layout.html'>
-<link rel='import' href='../../bower_components/app-layout/app-drawer/app-drawer.html'>
-<link rel='import' href='../../bower_components/iron-media-query/iron-media-query.html'>
-<link rel='import' href='../../bower_components/iron-pages/iron-pages.html'>
-<link rel='import' href='../../bower_components/app-route/app-route.html'>
-
-<link rel='import' href='../layouts/partial-cards.html'>
-<link rel='import' href='../layouts/partial-panel-resolver.html'>
-<link rel="import" href="../dialogs/ha-more-info-dialog.html">
-<link rel="import" href="../dialogs/ha-voice-command-dialog.html">
-<link rel='import' href='../util/ha-url-sync.html'>
-
-<link rel='import' href='../components/ha-sidebar.html'>
-<link rel='import' href='../util/hass-mixins.html'>
-<link rel='import' href='../util/hass-util.html'>
-
-<dom-module id='home-assistant-main'>
-  <template>
-    <style>
-      :host {
-        color: var(--primary-text-color);
-        /* remove the grey tap highlights in iOS on the fullscreen touch targets */
-        -webkit-tap-highlight-color: rgba(0,0,0,0);
-      }
-      iron-pages, ha-sidebar {
-        /* allow a light tap highlight on the actual interface elements  */
-        -webkit-tap-highlight-color: rgba(0,0,0,0.1);
-      }
-      iron-pages {
-        height: 100%;
-      }
-    </style>
-    <ha-more-info-dialog hass='[[hass]]'></ha-more-info-dialog>
-    <ha-url-sync hass='[[hass]]'></ha-url-sync>
-    <app-route
-      route="{{route}}"
-      pattern="/states"
-      tail="{{statesRouteTail}}"
-    ></app-route>
-    <ha-voice-command-dialog
-      hass='[[hass]]'
-      id='voiceDialog'
-    ></ha-voice-command-dialog>
-    <iron-media-query query="(max-width: 870px)" query-matches="{{narrow}}">
-    </iron-media-query>
-
-    <app-drawer-layout
-      fullbleed
-      force-narrow='[[computeForceNarrow(narrow, dockedSidebar)]]'
-      responsive-width='0'
-    >
-      <app-drawer
-        id='drawer'
-        slot="drawer"
-        disable-swipe='[[_computeDisableSwipe(hass)]]'
-        swipe-open='[[!_computeDisableSwipe(hass)]]'
-        persistent='[[dockedSidebar]]'
-      >
-        <ha-sidebar
-          narrow='[[narrow]]'
-          hass='[[hass]]'
-        ></ha-sidebar>
-      </app-drawer>
-
-      <iron-pages
-        attr-for-selected='id'
-        fallback-selection='panel-resolver'
-        selected='[[hass.panelUrl]]'
-        selected-attribute='panel-visible'
-      >
-        <partial-cards
-          id='states'
-          narrow='[[narrow]]'
-          hass='[[hass]]'
-          show-menu='[[dockedSidebar]]'
-          route='[[statesRouteTail]]'
-          show-tabs
-        ></partial-cards>
-
-        <partial-panel-resolver
-          id='panel-resolver'
-          narrow='[[narrow]]'
-          hass='[[hass]]'
-          route='[[route]]'
-          show-menu='[[dockedSidebar]]'
-        ></partial-panel-resolver>
-
-      </iron-pages>
-    </app-drawer-layout>
-
-  </template>
-</dom-module>
-
-<script>
-{
-  const NON_SWIPABLE_PANELS = ['kiosk', 'map'];
-
-  class HomeAssistantMain extends window.hassMixins.EventsMixin(Polymer.Element) {
-    static get is() { return 'home-assistant-main'; }
-
-    static get properties() {
-      return {
-        hass: Object,
-        narrow: Boolean,
-        route: {
-          type: Object,
-          observer: '_routeChanged',
-        },
-        statesRouteTail: Object,
-        dockedSidebar: {
-          type: Boolean,
-          computed: 'computeDockedSidebar(hass)',
-        },
-      };
-    }
-
-    ready() {
-      super.ready();
-      this.addEventListener('hass-open-menu', () => this.handleOpenMenu());
-      this.addEventListener('hass-close-menu', () => this.handleCloseMenu());
-      this.addEventListener('hass-start-voice', ev => this.handleStartVoice(ev));
-    }
-
-    _routeChanged() {
-      if (this.narrow) {
-        this.$.drawer.close();
-      }
-    }
-
-    handleStartVoice(ev) {
-      ev.stopPropagation();
-      this.$.voiceDialog.opened = true;
-    }
-
-    handleOpenMenu() {
-      if (this.narrow) {
-        this.$.drawer.open();
-      } else {
-        this.fire('hass-dock-sidebar', { dock: true });
-      }
-    }
-
-    handleCloseMenu() {
-      this.$.drawer.close();
-      if (this.dockedSidebar) {
-        this.fire('hass-dock-sidebar', { dock: false });
-      }
-    }
-
-    connectedCallback() {
-      super.connectedCallback();
-      window.removeInitMsg();
-      if (document.location.pathname === '/') {
-        history.replaceState(null, null, '/states');
-      }
-    }
-
-    computeForceNarrow(narrow, dockedSidebar) {
-      return narrow || !dockedSidebar;
-    }
-
-    computeDockedSidebar(hass) {
-      return hass.dockedSidebar;
-    }
-
-    _computeDisableSwipe(hass) {
-      return NON_SWIPABLE_PANELS.indexOf(hass.panelUrl) !== -1;
-    }
-  }
-
-  customElements.define(HomeAssistantMain.is, HomeAssistantMain);
-}
-</script>
diff --git a/src/layouts/home-assistant-main.js b/src/layouts/home-assistant-main.js
new file mode 100644
index 0000000000..17a58b6d64
--- /dev/null
+++ b/src/layouts/home-assistant-main.js
@@ -0,0 +1,133 @@
+import '@polymer/app-layout/app-drawer-layout/app-drawer-layout.js';
+import '@polymer/app-layout/app-drawer/app-drawer.js';
+import '@polymer/app-route/app-route.js';
+import '@polymer/iron-media-query/iron-media-query.js';
+import '@polymer/iron-pages/iron-pages.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../components/ha-sidebar.js';
+import '../dialogs/ha-more-info-dialog.js';
+import '../dialogs/ha-voice-command-dialog.js';
+import '../util/ha-url-sync.js';
+import '../util/hass-mixins.js';
+import '../util/hass-util.js';
+import './partial-cards.js';
+import './partial-panel-resolver.js';
+
+{
+  const NON_SWIPABLE_PANELS = ['kiosk', 'map'];
+
+  class HomeAssistantMain extends window.hassMixins.EventsMixin(PolymerElement) {
+    static get template() {
+      return html`
+    <style>
+      :host {
+        color: var(--primary-text-color);
+        /* remove the grey tap highlights in iOS on the fullscreen touch targets */
+        -webkit-tap-highlight-color: rgba(0,0,0,0);
+      }
+      iron-pages, ha-sidebar {
+        /* allow a light tap highlight on the actual interface elements  */
+        -webkit-tap-highlight-color: rgba(0,0,0,0.1);
+      }
+      iron-pages {
+        height: 100%;
+      }
+    </style>
+    <ha-more-info-dialog hass="[[hass]]"></ha-more-info-dialog>
+    <ha-url-sync hass="[[hass]]"></ha-url-sync>
+    <app-route route="{{route}}" pattern="/states" tail="{{statesRouteTail}}"></app-route>
+    <ha-voice-command-dialog hass="[[hass]]" id="voiceDialog"></ha-voice-command-dialog>
+    <iron-media-query query="(max-width: 870px)" query-matches="{{narrow}}">
+    </iron-media-query>
+
+    <app-drawer-layout fullbleed="" force-narrow="[[computeForceNarrow(narrow, dockedSidebar)]]" responsive-width="0">
+      <app-drawer id="drawer" slot="drawer" disable-swipe="[[_computeDisableSwipe(hass)]]" swipe-open="[[!_computeDisableSwipe(hass)]]" persistent="[[dockedSidebar]]">
+        <ha-sidebar narrow="[[narrow]]" hass="[[hass]]"></ha-sidebar>
+      </app-drawer>
+
+      <iron-pages attr-for-selected="id" fallback-selection="panel-resolver" selected="[[hass.panelUrl]]" selected-attribute="panel-visible">
+        <partial-cards id="states" narrow="[[narrow]]" hass="[[hass]]" show-menu="[[dockedSidebar]]" route="[[statesRouteTail]]" show-tabs=""></partial-cards>
+
+        <partial-panel-resolver id="panel-resolver" narrow="[[narrow]]" hass="[[hass]]" route="[[route]]" show-menu="[[dockedSidebar]]"></partial-panel-resolver>
+
+      </iron-pages>
+    </app-drawer-layout>
+`;
+    }
+
+    static get is() { return 'home-assistant-main'; }
+
+    static get properties() {
+      return {
+        hass: Object,
+        narrow: Boolean,
+        route: {
+          type: Object,
+          observer: '_routeChanged',
+        },
+        statesRouteTail: Object,
+        dockedSidebar: {
+          type: Boolean,
+          computed: 'computeDockedSidebar(hass)',
+        },
+      };
+    }
+
+    ready() {
+      super.ready();
+      this.addEventListener('hass-open-menu', () => this.handleOpenMenu());
+      this.addEventListener('hass-close-menu', () => this.handleCloseMenu());
+      this.addEventListener('hass-start-voice', ev => this.handleStartVoice(ev));
+    }
+
+    _routeChanged() {
+      if (this.narrow) {
+        this.$.drawer.close();
+      }
+    }
+
+    handleStartVoice(ev) {
+      ev.stopPropagation();
+      this.$.voiceDialog.opened = true;
+    }
+
+    handleOpenMenu() {
+      if (this.narrow) {
+        this.$.drawer.open();
+      } else {
+        this.fire('hass-dock-sidebar', { dock: true });
+      }
+    }
+
+    handleCloseMenu() {
+      this.$.drawer.close();
+      if (this.dockedSidebar) {
+        this.fire('hass-dock-sidebar', { dock: false });
+      }
+    }
+
+    connectedCallback() {
+      super.connectedCallback();
+      window.removeInitMsg();
+      if (document.location.pathname === '/') {
+        history.replaceState(null, null, '/states');
+      }
+    }
+
+    computeForceNarrow(narrow, dockedSidebar) {
+      return narrow || !dockedSidebar;
+    }
+
+    computeDockedSidebar(hass) {
+      return hass.dockedSidebar;
+    }
+
+    _computeDisableSwipe(hass) {
+      return NON_SWIPABLE_PANELS.indexOf(hass.panelUrl) !== -1;
+    }
+  }
+
+  customElements.define(HomeAssistantMain.is, HomeAssistantMain);
+}
diff --git a/src/layouts/login-form.html b/src/layouts/login-form.js
similarity index 70%
rename from src/layouts/login-form.html
rename to src/layouts/login-form.js
index f9c798a688..5d0b27f344 100644
--- a/src/layouts/login-form.html
+++ b/src/layouts/login-form.js
@@ -1,16 +1,19 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import '@polymer/paper-checkbox/paper-checkbox.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-spinner/paper-spinner.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../util/hass-mixins.js';
 
-<link rel="import" href="../../bower_components/paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../bower_components/paper-spinner/paper-spinner.html">
-
-<link rel='import' href='../../src/util/hass-mixins.html'>
-
-<dom-module id="login-form">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class LoginForm extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-positioning"></style>
     <style>
       :host {
@@ -45,38 +48,25 @@
     </style>
 
     <div class="layout vertical center center-center fit">
-      <img src="/static/icons/favicon-192x192.png" height="192" />
+      <img src="/static/icons/favicon-192x192.png" height="192">
       <a href="#" id="hideKeyboardOnFocus"></a>
-      <div class='interact'>
-        <div id='loginform' hidden$="[[showSpinner]]">
-          <paper-input
-            id='passwordInput'
-            label="[[localize('ui.login-form.password')]]"
-            type='password'
-            autofocus
-            invalid='[[errorMessage]]'
-            error-message='[[errorMessage]]'
-            value='{{password}}'
-          ></paper-input>
+      <div class="interact">
+        <div id="loginform" hidden\$="[[showSpinner]]">
+          <paper-input id="passwordInput" label="[[localize('ui.login-form.password')]]" type="password" autofocus="" invalid="[[errorMessage]]" error-message="[[errorMessage]]" value="{{password}}"></paper-input>
           <div class="layout horizontal center">
-            <paper-checkbox for id='rememberLogin'>[[localize('ui.login-form.remember')]]</paper-checkbox>
-            <paper-button on-click='validatePassword'>[[localize('ui.login-form.log_in')]]</paper-button>
+            <paper-checkbox for="" id="rememberLogin">[[localize('ui.login-form.remember')]]</paper-checkbox>
+            <paper-button on-click="validatePassword">[[localize('ui.login-form.log_in')]]</paper-button>
           </div>
         </div>
-        <div id="validatebox" hidden$="[[!showSpinner]]">
-          <paper-spinner active="true"></paper-spinner><br />
+        <div id="validatebox" hidden\$="[[!showSpinner]]">
+          <paper-spinner active="true"></paper-spinner><br>
           <div class="validatemessage">[[computeLoadingMsg(isValidating)]]</div>
         </div>
       </div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class LoginForm extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'login-form'; }
 
   static get properties() {
@@ -197,4 +187,3 @@ class LoginForm extends window.hassMixins.LocalizeMixin(Polymer.Element) {
 }
 
 customElements.define(LoginForm.is, LoginForm);
-</script>
diff --git a/src/layouts/partial-cards.html b/src/layouts/partial-cards.js
similarity index 68%
rename from src/layouts/partial-cards.html
rename to src/layouts/partial-cards.js
index 09f7eea94b..18503d986a 100644
--- a/src/layouts/partial-cards.html
+++ b/src/layouts/partial-cards.js
@@ -1,27 +1,29 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-scroll-effects/effects/waterfall.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+import '@polymer/app-route/app-route.js';
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/iron-icon/iron-icon.js';
+import '@polymer/iron-pages/iron-pages.js';
+import '@polymer/paper-tabs/paper-tab.js';
+import '@polymer/paper-tabs/paper-tabs.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-<link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
-<link rel="import" href="../../bower_components/iron-pages/iron-pages.html">
+import '../components/ha-cards.js';
+import '../components/ha-menu-button.js';
+import '../components/ha-start-voice-button.js';
+import '../util/hass-mixins.js';
+import './ha-app-layout.js';
 
-<link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
-<link rel="import" href="../../bower_components/paper-tabs/paper-tab.html">
+{
+  const DEFAULT_VIEW_ENTITY_ID = 'group.default_view';
+  const ALWAYS_SHOW_DOMAIN = ['persistent_notification', 'configurator'];
 
-<link rel="import" href="../../bower_components/app-layout/app-scroll-effects/effects/waterfall.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
-<link rel='import' href='../../bower_components/app-route/app-route.html'>
-
-<link rel='import' href='../../src/util/hass-mixins.html'>
-
-<link rel="import" href="../components/ha-menu-button.html">
-<link rel="import" href="../components/ha-start-voice-button.html">
-<link rel="import" href="../components/ha-cards.html">
-
-<link rel="import" href="./ha-app-layout.html">
-
-<dom-module id="partial-cards">
-  <template>
+  // eslint-disable-next-line
+  class PartialCards extends window.hassMixins.EventsMixin(window.hassMixins.NavigateMixin(PolymerElement)) {
+    static get template() {
+      return html`
     <style include="iron-flex iron-positioning ha-style">
       :host {
         -ms-user-select: none;
@@ -39,61 +41,36 @@
         text-transform: uppercase;
       }
     </style>
-    <app-route
-      route="{{route}}"
-      pattern="/:view"
-      data="{{routeData}}"
-      active="{{routeMatch}}"
-    ></app-route>
-    <ha-app-layout has-scrolling-region id='layout'>
-      <app-header effects="waterfall" condenses fixed slot="header">
+    <app-route route="{{route}}" pattern="/:view" data="{{routeData}}" active="{{routeMatch}}"></app-route>
+    <ha-app-layout has-scrolling-region="" id="layout">
+      <app-header effects="waterfall" condenses="" fixed="" slot="header">
         <app-toolbar>
-          <ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
-          <div main-title>[[computeTitle(views, defaultView, locationName)]]</div>
-          <ha-start-voice-button hass='[[hass]]'></ha-start-voice-button>
+          <ha-menu-button narrow="[[narrow]]" show-menu="[[showMenu]]"></ha-menu-button>
+          <div main-title="">[[computeTitle(views, defaultView, locationName)]]</div>
+          <ha-start-voice-button hass="[[hass]]"></ha-start-voice-button>
         </app-toolbar>
 
-        <div sticky hidden$='[[areTabsHidden(views, showTabs)]]'>
-          <paper-tabs
-            scrollable
-            selected='[[currentView]]'
-            attr-for-selected='data-entity'
-            on-iron-activate='handleViewSelected'
-          >
-            <paper-tab
-              data-entity=''
-              on-click='scrollToTop'
-            >
-              <template is='dom-if' if='[[!defaultView]]'>
+        <div sticky="" hidden\$="[[areTabsHidden(views, showTabs)]]">
+          <paper-tabs scrollable="" selected="[[currentView]]" attr-for-selected="data-entity" on-iron-activate="handleViewSelected">
+            <paper-tab data-entity="" on-click="scrollToTop">
+              <template is="dom-if" if="[[!defaultView]]">
                 Home
               </template>
-              <template is='dom-if' if='[[defaultView]]'>
-                <template
-                  is='dom-if'
-                  if='[[defaultView.attributes.icon]]'
-                >
-                  <iron-icon
-                    title$='[[computeStateName(defaultView)]]'
-                    icon='[[defaultView.attributes.icon]]'
-                  ></iron-icon>
+              <template is="dom-if" if="[[defaultView]]">
+                <template is="dom-if" if="[[defaultView.attributes.icon]]">
+                  <iron-icon title\$="[[computeStateName(defaultView)]]" icon="[[defaultView.attributes.icon]]"></iron-icon>
                 </template>
-                <template
-                  is='dom-if'
-                  if='[[!defaultView.attributes.icon]]'
-                >
+                <template is="dom-if" if="[[!defaultView.attributes.icon]]">
                   [[computeStateName(defaultView)]]
                 </template>
               </template>
             </paper-tab>
-            <template is='dom-repeat' items='[[views]]'>
-              <paper-tab
-                data-entity$='[[item.entity_id]]'
-                on-click='scrollToTop'
-              >
-                <template is='dom-if' if='[[item.attributes.icon]]'>
-                  <iron-icon title$='[[computeStateName(item)]]' icon='[[item.attributes.icon]]'></iron-icon>
+            <template is="dom-repeat" items="[[views]]">
+              <paper-tab data-entity\$="[[item.entity_id]]" on-click="scrollToTop">
+                <template is="dom-if" if="[[item.attributes.icon]]">
+                  <iron-icon title\$="[[computeStateName(item)]]" icon="[[item.attributes.icon]]"></iron-icon>
                 </template>
-                <template is='dom-if' if='[[!item.attributes.icon]]'>
+                <template is="dom-if" if="[[!item.attributes.icon]]">
                   [[computeStateName(item)]]
                 </template>
               </paper-tab>
@@ -102,44 +79,18 @@
         </div>
       </app-header>
 
-      <iron-pages
-        attr-for-selected='data-view'
-        selected='[[currentView]]'
-        selected-attribute='view-visible'
-      >
-        <ha-cards
-          data-view=''
-          states='[[viewStates]]'
-          columns='[[_columns]]'
-          hass='[[hass]]'
-          panel-visible='[[panelVisible]]'
-          ordered-group-entities='[[orderedGroupEntities]]'
-        ></ha-cards>
+      <iron-pages attr-for-selected="data-view" selected="[[currentView]]" selected-attribute="view-visible">
+        <ha-cards data-view="" states="[[viewStates]]" columns="[[_columns]]" hass="[[hass]]" panel-visible="[[panelVisible]]" ordered-group-entities="[[orderedGroupEntities]]"></ha-cards>
 
-        <template is='dom-repeat' items='[[views]]'>
-          <ha-cards
-            data-view$='[[item.entity_id]]'
-            states='[[viewStates]]'
-            columns='[[_columns]]'
-            hass='[[hass]]'
-            panel-visible='[[panelVisible]]'
-            ordered-group-entities='[[orderedGroupEntities]]'
-          ></ha-cards>
+        <template is="dom-repeat" items="[[views]]">
+          <ha-cards data-view\$="[[item.entity_id]]" states="[[viewStates]]" columns="[[_columns]]" hass="[[hass]]" panel-visible="[[panelVisible]]" ordered-group-entities="[[orderedGroupEntities]]"></ha-cards>
         </template>
 
       </iron-pages>
     </ha-app-layout>
-  </template>
+`;
+    }
 
-</dom-module>
-
-<script>
-{
-  const DEFAULT_VIEW_ENTITY_ID = 'group.default_view';
-  const ALWAYS_SHOW_DOMAIN = ['persistent_notification', 'configurator'];
-
-  // eslint-disable-next-line
-  class PartialCards extends window.hassMixins.EventsMixin(window.hassMixins.NavigateMixin(Polymer.Element)) {
     static get is() { return 'partial-cards'; }
 
     static get properties() {
@@ -391,4 +342,3 @@
 
   customElements.define(PartialCards.is, PartialCards);
 }
-</script>
diff --git a/src/layouts/partial-panel-resolver.html b/src/layouts/partial-panel-resolver.html
deleted file mode 100644
index f9abdc592d..0000000000
--- a/src/layouts/partial-panel-resolver.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<link rel='import' href='../../bower_components/polymer/polymer-element.html'>
-<link rel='import' href='../../bower_components/app-route/app-route.html'>
-
-<link rel='import' href='../util/hass-mixins.html'>
-<link rel="import" href="./hass-loading-screen.html">
-
-<dom-module id='partial-panel-resolver'>
-  <template>
-    <style>
-      [hidden] {
-        display: none !important;
-      }
-    </style>
-    <app-route
-      route="{{route}}"
-      pattern="/:panel"
-      data="{{routeData}}"
-      tail="{{routeTail}}"
-    ></app-route>
-
-    <template is='dom-if' if='[[!resolved]]'>
-      <hass-loading-screen
-        narrow='[[narrow]]'
-        show-menu='[[showMenu]]'
-      ></hass-loading-screen>
-    </template>
-
-    <span id='panel' hidden$='[[!resolved]]'></span>
-  </template>
-</dom-module>
-
-<script>
-class PartialPanelResolver extends Polymer.Element {
-  static get is() { return 'partial-panel-resolver'; }
-
-  static get properties() {
-    return {
-      hass: {
-        type: Object,
-        observer: 'updateAttributes',
-      },
-
-      narrow: {
-        type: Boolean,
-        value: false,
-        observer: 'updateAttributes',
-      },
-
-      showMenu: {
-        type: Boolean,
-        value: false,
-        observer: 'updateAttributes',
-      },
-      route: Object,
-      routeData: Object,
-      routeTail: {
-        type: Object,
-        observer: 'updateAttributes',
-      },
-      resolved: {
-        type: Boolean,
-        value: false,
-      },
-      errorLoading: {
-        type: Boolean,
-        value: false,
-      },
-      panel: {
-        type: Object,
-        computed: 'computeCurrentPanel(hass)',
-        observer: 'panelChanged',
-      },
-    };
-  }
-
-  panelChanged(panel) {
-    if (!panel) {
-      if (this.$.panel.lastChild) {
-        this.$.panel.removeChild(this.$.panel.lastChild);
-      }
-      return;
-    }
-
-    this.resolved = false;
-    this.errorLoading = false;
-
-    Polymer.importHref(
-      panel.url,
-
-      () => {
-        window.hassUtil.dynamicContentUpdater(this.$.panel, 'ha-panel-' + panel.component_name, {
-          hass: this.hass,
-          narrow: this.narrow,
-          showMenu: this.showMenu,
-          route: this.routeTail,
-          panel: panel,
-        });
-        this.resolved = true;
-      },
-
-      () => {
-        // a single retry of importHref in the error callback fixes a webkit refresh issue
-        if (!this.retrySetPanelForWebkit(panel)) {
-          this.errorLoading = true;
-        }
-      },
-
-      true /* async */
-    );
-  }
-
-  retrySetPanelForWebkit(panel) {
-    if (this._retryingPanelChanged) {
-      return false;
-    }
-    this._retryingPanelChanged = true;
-    return this.panelChanged(panel);
-  }
-
-  updateAttributes() {
-    var customEl = Polymer.dom(this.$.panel).lastChild;
-    if (!customEl) return;
-    customEl.hass = this.hass;
-    customEl.narrow = this.narrow;
-    customEl.showMenu = this.showMenu;
-    customEl.route = this.routeTail;
-  }
-
-  computeCurrentPanel(hass) {
-    return hass.config.panels[hass.panelUrl];
-  }
-}
-
-customElements.define(PartialPanelResolver.is, PartialPanelResolver);
-</script>
diff --git a/src/layouts/partial-panel-resolver.js b/src/layouts/partial-panel-resolver.js
new file mode 100644
index 0000000000..2c9c2ee8cc
--- /dev/null
+++ b/src/layouts/partial-panel-resolver.js
@@ -0,0 +1,216 @@
+import '@polymer/app-route/app-route.js';
+import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import '../util/hass-mixins.js';
+import './hass-loading-screen.js';
+import { importHref } from '../resources/html-import/import-href';
+
+const loaded = {};
+
+function ensureLoaded(panel) {
+  if (panel in loaded) return loaded[panel];
+
+  let imported;
+  // Name each panel we support here, that way Webpack knows about it.
+  switch (panel) {
+    case 'config':
+      imported = import(/* webpackChunkName: "panel-config" */ '../../panels/config/ha-panel-config.js');
+      break;
+
+    case 'dev-event':
+      imported = import(/* webpackChunkName: "panel-dev-event" */ '../../panels/dev-event/ha-panel-dev-event.js');
+      break;
+
+    case 'dev-info':
+      imported = import(/* webpackChunkName: "panel-dev-info" */ '../../panels/dev-info/ha-panel-dev-info.js');
+      break;
+
+    case 'dev-mqtt':
+      imported = import(/* webpackChunkName: "panel-dev-mqtt" */ '../../panels/dev-mqtt/ha-panel-dev-mqtt.js');
+      break;
+
+    case 'dev-service':
+      imported = import(/* webpackChunkName: "panel-dev-service" */ '../../panels/dev-service/ha-panel-dev-service.js');
+      break;
+
+    case 'dev-state':
+      imported = import(/* webpackChunkName: "panel-dev-state" */ '../../panels/dev-state/ha-panel-dev-state.js');
+      break;
+
+    case 'dev-template':
+      imported = import(/* webpackChunkName: "panel-dev-template" */ '../../panels/dev-template/ha-panel-dev-template.js');
+      break;
+
+    case 'hassio':
+      imported = import(/* webpackChunkName: "panel-hassio" */ '../../panels/hassio/ha-panel-hassio.js');
+      break;
+
+    case 'history':
+      imported = import(/* webpackChunkName: "panel-history" */ '../../panels/history/ha-panel-history.js');
+      break;
+
+    case 'iframe':
+      imported = import(/* webpackChunkName: "panel-iframe" */ '../../panels/iframe/ha-panel-iframe.js');
+      break;
+
+    case 'kiosk':
+      imported = import(/* webpackChunkName: "panel-kiosk" */ '../../panels/kiosk/ha-panel-kiosk.js');
+      break;
+
+    case 'logbook':
+      imported = import(/* webpackChunkName: "panel-logbook" */ '../../panels/logbook/ha-panel-logbook.js');
+      break;
+
+    case 'mailbox':
+      imported = import(/* webpackChunkName: "panel-mailbox" */ '../../panels/mailbox/ha-panel-mailbox.js');
+      break;
+
+    case 'map':
+      imported = import(/* webpackChunkName: "panel-map" */ '../../panels/map/ha-panel-map.js');
+      break;
+
+    case 'shopping-list':
+      imported = import(/* webpackChunkName: "panel-shopping-list" */ '../../panels/shopping-list/ha-panel-shopping-list.js');
+      break;
+
+    default:
+      imported = null;
+  }
+
+  if (imported != null) {
+    loaded[panel] = imported;
+  }
+
+  return imported;
+}
+
+class PartialPanelResolver extends window.hassMixins.NavigateMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style>
+      [hidden] {
+        display: none !important;
+      }
+    </style>
+    <app-route route="{{route}}" pattern="/:panel" data="{{routeData}}" tail="{{routeTail}}"></app-route>
+
+    <template is="dom-if" if="[[!resolved]]">
+      <hass-loading-screen narrow="[[narrow]]" show-menu="[[showMenu]]"></hass-loading-screen>
+    </template>
+
+    <span id="panel" hidden\$="[[!resolved]]"></span>
+`;
+  }
+
+  static get is() { return 'partial-panel-resolver'; }
+
+  static get properties() {
+    return {
+      hass: {
+        type: Object,
+        observer: 'updateAttributes',
+      },
+
+      narrow: {
+        type: Boolean,
+        value: false,
+        observer: 'updateAttributes',
+      },
+
+      showMenu: {
+        type: Boolean,
+        value: false,
+        observer: 'updateAttributes',
+      },
+      route: Object,
+      routeData: Object,
+      routeTail: {
+        type: Object,
+        observer: 'updateAttributes',
+      },
+      resolved: {
+        type: Boolean,
+        value: false,
+      },
+      panel: {
+        type: Object,
+        computed: 'computeCurrentPanel(hass)',
+        observer: 'panelChanged',
+      },
+    };
+  }
+
+  panelChanged(panel) {
+    if (!panel) {
+      if (this.$.panel.lastChild) {
+        this.$.panel.removeChild(this.$.panel.lastChild);
+      }
+      return;
+    }
+
+    this.resolved = false;
+
+    let loadingProm;
+    if (panel.url) {
+      loadingProm = new Promise((resolve, reject) => importHref(panel.url, resolve, reject));
+    } else {
+      loadingProm = ensureLoaded(panel.component_name);
+    }
+
+    if (loadingProm === null) {
+      this.panelLoadError(panel);
+      return;
+    }
+
+    loadingProm.then(
+      () => {
+        window.hassUtil.dynamicContentUpdater(this.$.panel, 'ha-panel-' + panel.component_name, {
+          hass: this.hass,
+          narrow: this.narrow,
+          showMenu: this.showMenu,
+          route: this.routeTail,
+          panel: panel,
+        });
+        this.resolved = true;
+      },
+
+      (err) => {
+        /* eslint-disable-next-line */
+        console.error('Error loading panel', err);
+        // a single retry of importHref in the error callback fixes a webkit refresh issue
+        if (!this.retrySetPanelForWebkit(panel)) {
+          this.panelLoadError(panel);
+        }
+      },
+    );
+  }
+
+  panelLoadError(panel) {
+    alert(`I don't know how to resolve panel ${panel.component_name}`);
+    this.navigate('/states');
+  }
+
+  retrySetPanelForWebkit(panel) {
+    if (this._retryingPanelChanged) {
+      return false;
+    }
+    this._retryingPanelChanged = true;
+    return this.panelChanged(panel);
+  }
+
+  updateAttributes() {
+    var customEl = dom(this.$.panel).lastChild;
+    if (!customEl) return;
+    customEl.hass = this.hass;
+    customEl.narrow = this.narrow;
+    customEl.showMenu = this.showMenu;
+    customEl.route = this.routeTail;
+  }
+
+  computeCurrentPanel(hass) {
+    return hass.config.panels[hass.panelUrl];
+  }
+}
+
+customElements.define(PartialPanelResolver.is, PartialPanelResolver);
diff --git a/src/managers/notification-manager.html b/src/managers/notification-manager.js
similarity index 75%
rename from src/managers/notification-manager.html
rename to src/managers/notification-manager.js
index 03799326ab..e578a8d9fc 100644
--- a/src/managers/notification-manager.html
+++ b/src/managers/notification-manager.js
@@ -1,31 +1,21 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/paper-toast/paper-toast.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/paper-toast/paper-toast.html">
-
-<dom-module id="notification-manager">
-  <template>
+class NotificationManager extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       paper-toast {
         z-index: 1;
       }
     </style>
 
-    <paper-toast
-      id="toast"
-      text='[[_text]]'
-      no-cancel-on-outside-click='[[_cancelOnOutsideClick]]'
-    ></paper-toast>
-    <paper-toast
-      id='connToast'
-      duration='0'
-      text='Connection lost. Reconnecting…'
-      opened='[[connectionLost]]'
-    ></paper-toast>
-  </template>
-</dom-module>
+    <paper-toast id="toast" text="[[_text]]" no-cancel-on-outside-click="[[_cancelOnOutsideClick]]"></paper-toast>
+    <paper-toast id="connToast" duration="0" text="Connection lost. Reconnecting…" opened="[[connectionLost]]"></paper-toast>
+`;
+  }
 
-<script>
-class NotificationManager extends Polymer.Element {
   static get is() { return 'notification-manager'; }
 
   static get properties() {
@@ -106,4 +96,3 @@ class NotificationManager extends Polymer.Element {
 }
 
 customElements.define(NotificationManager.is, NotificationManager);
-</script>
diff --git a/src/resources/ha-chart-scripts.html b/src/resources/ha-chart-scripts.js
similarity index 80%
rename from src/resources/ha-chart-scripts.html
rename to src/resources/ha-chart-scripts.js
index b85c0cb110..c1230f744e 100644
--- a/src/resources/ha-chart-scripts.html
+++ b/src/resources/ha-chart-scripts.js
@@ -1,10 +1,5 @@
-<script src="../../bower_components/moment/moment.js"></script>
-<script src="../../bower_components/chart.js/dist/Chart.min.js"></script>
-<script src="../../bower_components/chartjs-chart-timeline/timeline.js"></script>
-<script>
-// Use minified(Chart.min.js) version to fix strange color after uglify
-// eslint-disable-next-line no-unused-vars
-/* global Chart moment Color */
+import Chart from 'chart.js';
+import 'chartjs-chart-timeline';
 
 // This function add a new interaction mode to Chart.js that
 // returns one point for every dataset.
@@ -61,4 +56,5 @@ Chart.Interaction.modes.neareach = function (chart, e, options) {
   const ret = elements.filter(n => n !== undefined);
   return ret;
 };
-</script>
\ No newline at end of file
+
+export default Chart;
diff --git a/src/resources/ha-date-picker-style.html b/src/resources/ha-date-picker-style.js
similarity index 81%
rename from src/resources/ha-date-picker-style.html
rename to src/resources/ha-date-picker-style.js
index bd15802aac..16446d1211 100644
--- a/src/resources/ha-date-picker-style.html
+++ b/src/resources/ha-date-picker-style.js
@@ -1,4 +1,7 @@
-<dom-module id="ha-date-picker-vaadin-date-picker-styles" theme-for="vaadin-date-picker">
+const documentContainer = document.createElement('template');
+documentContainer.setAttribute('style', 'display: none;');
+
+documentContainer.innerHTML = `<dom-module id="ha-date-picker-vaadin-date-picker-styles" theme-for="vaadin-date-picker">
   <template>
     <style>
       :host([required]) [part~="clear-button"] {
@@ -16,8 +19,7 @@
       }
     </style>
   </template>
-</dom-module>
-<dom-module id="ha-date-picker-text-field-styles" theme-for="vaadin-text-field">
+</dom-module><dom-module id="ha-date-picker-text-field-styles" theme-for="vaadin-text-field">
   <template>
     <style>
       :host {
@@ -59,8 +61,7 @@
       }
     </style>
   </template>
-</dom-module>
-<dom-module id="ha-date-picker-button-styles" theme-for="vaadin-button">
+</dom-module><dom-module id="ha-date-picker-button-styles" theme-for="vaadin-button">
   <template>
     <style>
       :host([part~="today-button"]) [part~="button"]::before {
@@ -84,8 +85,7 @@
       }
     </style>
   </template>
-</dom-module>
-<dom-module id="ha-date-picker-overlay-styles" theme-for="vaadin-date-picker-overlay">
+</dom-module><dom-module id="ha-date-picker-overlay-styles" theme-for="vaadin-date-picker-overlay">
   <template>
     <style include="vaadin-date-picker-overlay-default-theme">
       :host {
@@ -103,8 +103,7 @@
 
     </style>
   </template>
-</dom-module>
-<dom-module id="ha-date-picker-month-styles" theme-for="vaadin-month-calendar">
+</dom-module><dom-module id="ha-date-picker-month-styles" theme-for="vaadin-month-calendar">
   <template>
     <style include="vaadin-month-calendar-default-theme">
       :host([focused]) [part="date"][focused],
@@ -116,4 +115,6 @@
       }
     </style>
   </template>
-</dom-module>
+</dom-module>`;
+
+document.head.appendChild(documentContainer.content);
diff --git a/src/resources/ha-style.html b/src/resources/ha-style.js
similarity index 93%
rename from src/resources/ha-style.html
rename to src/resources/ha-style.js
index f764c0ea18..058b2dae28 100644
--- a/src/resources/ha-style.html
+++ b/src/resources/ha-style.js
@@ -1,7 +1,10 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
-<link rel="import" href="../../bower_components/paper-styles/paper-styles.html">
+import '@polymer/paper-styles/paper-styles.js';
+import '@polymer/polymer/polymer-legacy.js';
 
-<custom-style>
+const documentContainer = document.createElement('template');
+documentContainer.setAttribute('style', 'display: none;');
+
+documentContainer.innerHTML = `<custom-style>
   <style is="custom-style">/* remove is= on Polymer 2 */
     /*
       Home Assistant default styles.
@@ -119,24 +122,22 @@
     }
   </style>
 
-  <style shady-unscoped>
+  <style shady-unscoped="">
     /*
       prevent clipping of positioned elements in a small scrollable
       force smooth scrolling if can scroll
       use non-shady selectors so this only targets iOS 9
       conditional mixin set in ha-style-dialog does not work with shadyCSS
     */
-    paper-dialog-scrollable:not(.can-scroll) > .scrollable {
+    paper-dialog-scrollable:not(.can-scroll) &gt; .scrollable {
       -webkit-overflow-scrolling: auto !important;
     }
 
-    paper-dialog-scrollable.can-scroll > .scrollable {
+    paper-dialog-scrollable.can-scroll &gt; .scrollable {
       -webkit-overflow-scrolling: touch !important;
     }
   </style>
-</custom-style>
-
-<dom-module id='ha-style'>
+</custom-style><dom-module id="ha-style">
   <template>
     <style>
       :host {
@@ -192,9 +193,7 @@
       }
     </style>
   </template>
-</dom-module>
-
-<dom-module id='ha-style-dialog'>
+</dom-module><dom-module id="ha-style-dialog">
   <template>
     <style>
       :host {
@@ -241,4 +240,6 @@
       }
     </style>
   </template>
-</dom-module>
+</dom-module>`;
+
+document.head.appendChild(documentContainer.content);
diff --git a/src/resources/hassio-style.html b/src/resources/hassio-style.js
similarity index 83%
rename from src/resources/hassio-style.html
rename to src/resources/hassio-style.js
index 4a9cdee96a..17a798ad17 100644
--- a/src/resources/hassio-style.html
+++ b/src/resources/hassio-style.js
@@ -1,4 +1,7 @@
-<dom-module id='hassio-style'>
+const documentContainer = document.createElement('template');
+documentContainer.setAttribute('style', 'display: none;');
+
+documentContainer.innerHTML = `<dom-module id="hassio-style">
   <template>
     <style>
       .card-group {
@@ -50,4 +53,6 @@
       }
     </style>
   </template>
-</dom-module>
+</dom-module>`;
+
+document.head.appendChild(documentContainer.content);
diff --git a/src/resources/html-import/import-href.js b/src/resources/html-import/import-href.js
new file mode 100644
index 0000000000..602f9dfbba
--- /dev/null
+++ b/src/resources/html-import/import-href.js
@@ -0,0 +1,96 @@
+/* eslint-disable */
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+// run a callback when HTMLImports are ready or immediately if
+// this api is not available.
+function whenImportsReady(cb) {
+  if (window.HTMLImports) {
+    HTMLImports.whenReady(cb);
+  } else {
+    cb();
+  }
+}
+
+/**
+ * Convenience method for importing an HTML document imperatively.
+ *
+ * This method creates a new `<link rel="import">` element with
+ * the provided URL and appends it to the document to start loading.
+ * In the `onload` callback, the `import` property of the `link`
+ * element will contain the imported document contents.
+ *
+ * @param {string} href URL to document to load.
+ * @param {?function(!Event):void=} onload Callback to notify when an import successfully
+ *   loaded.
+ * @param {?function(!ErrorEvent):void=} onerror Callback to notify when an import
+ *   unsuccessfully loaded.
+ * @param {boolean=} optAsync True if the import should be loaded `async`.
+ *   Defaults to `false`.
+ * @return {!HTMLLinkElement} The link element for the URL to be loaded.
+ */
+export const importHref = function (href, onload, onerror, optAsync) {
+  let link = /** @type {HTMLLinkElement} */
+    (document.head.querySelector('link[href="' + href + '"][import-href]'));
+  if (!link) {
+    link = /** @type {HTMLLinkElement} */ (document.createElement('link'));
+    link.rel = 'import';
+    link.href = href;
+    link.setAttribute('import-href', '');
+  }
+  // always ensure link has `async` attribute if user specified one,
+  // even if it was previously not async. This is considered less confusing.
+  if (optAsync) {
+    link.setAttribute('async', '');
+  }
+  // NOTE: the link may now be in 3 states: (1) pending insertion,
+  // (2) inflight, (3) already loaded. In each case, we need to add
+  // event listeners to process callbacks.
+  const cleanup = function () {
+    link.removeEventListener('load', loadListener);
+    link.removeEventListener('error', errorListener);
+  };
+  let loadListener = function (event) {
+    cleanup();
+    // In case of a successful load, cache the load event on the link so
+    // that it can be used to short-circuit this method in the future when
+    // it is called with the same href param.
+    link.__dynamicImportLoaded = true;
+    if (onload) {
+      whenImportsReady(() => {
+        onload(event);
+      });
+    }
+  };
+  let errorListener = function (event) {
+    cleanup();
+    // In case of an error, remove the link from the document so that it
+    // will be automatically created again the next time `importHref` is
+    // called.
+    if (link.parentNode) {
+      link.parentNode.removeChild(link);
+    }
+    if (onerror) {
+      whenImportsReady(() => {
+        onerror(event);
+      });
+    }
+  };
+  link.addEventListener('load', loadListener);
+  link.addEventListener('error', errorListener);
+  if (link.parentNode == null) {
+    document.head.appendChild(link);
+  // if the link already loaded, dispatch a fake load event
+  // so that listeners are called and get a proper event argument.
+  } else if (link.__dynamicImportLoaded) {
+    link.dispatchEvent(new Event('load'));
+  }
+  return link;
+};
diff --git a/src/resources/html-import/polyfill.js b/src/resources/html-import/polyfill.js
new file mode 100644
index 0000000000..10cb605227
--- /dev/null
+++ b/src/resources/html-import/polyfill.js
@@ -0,0 +1,25 @@
+/* eslint-disable */
+/*
+ Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+ This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+ The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+ The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+ Code distributed by Google as part of the polymer project is also
+ subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+(function(q){function y(a,b){if("function"===typeof window.CustomEvent)return new CustomEvent(a,b);var c=document.createEvent("CustomEvent");c.initCustomEvent(a,!!b.bubbles,!!b.cancelable,b.detail);return c}function m(a){if(u)return a.ownerDocument!==document?a.ownerDocument:null;var b=a.__importDoc;if(!b&&a.parentNode){b=a.parentNode;if("function"===typeof b.closest)b=b.closest("link[rel=import]");else for(;!r(b)&&(b=b.parentNode););a.__importDoc=b}return b}function D(a){var b=k(document,
+    "link[rel=import]:not([import-dependency])"),c=b.length;c?g(b,function(b){return t(b,function(){0===--c&&a()})}):a()}function z(a){function b(){"loading"!==document.readyState&&document.body&&(document.removeEventListener("readystatechange",b),a())}document.addEventListener("readystatechange",b);b()}function A(a){z(function(){return D(function(){return a&&a()})})}function t(a,b){if(a.__loaded)b&&b();else if("script"===a.localName&&!a.src||"style"===a.localName&&!a.firstChild)a.__loaded=!0,b&&b();
+    else{var c=function(d){a.removeEventListener(d.type,c);a.__loaded=!0;b&&b()};a.addEventListener("load",c);v&&"style"===a.localName||a.addEventListener("error",c)}}function r(a){return a.nodeType===Node.ELEMENT_NODE&&"link"===a.localName&&"import"===a.rel}function h(){var a=this;this.a={};this.b=0;this.g=new MutationObserver(function(b){return a.w(b)});this.g.observe(document.head,{childList:!0,subtree:!0});this.loadImports(document)}function B(a){g(k(a,"template"),function(a){g(k(a.content,'script:not([type]),script[type="application/javascript"],script[type="text/javascript"]'),
+    function(a){var b=document.createElement("script");g(a.attributes,function(a){return b.setAttribute(a.name,a.value)});b.textContent=a.textContent;a.parentNode.replaceChild(b,a)});B(a.content)})}function k(a,b){return a.childNodes.length?a.querySelectorAll(b):E}function g(a,b,c){var d=a?a.length:0,f=c?-1:1;for(c=c?d-1:0;c<d&&0<=c;c+=f)b(a[c],c)}var n=document.createElement("link"),u="import"in n,E=n.querySelectorAll("*"),w=null;!1==="currentScript"in document&&Object.defineProperty(document,"currentScript",
+    {get:function(){return w||("complete"!==document.readyState?document.scripts[document.scripts.length-1]:null)},configurable:!0});var F=/(url\()([^)]*)(\))/g,G=/(@import[\s]+(?!url\())([^;]*)(;)/g,H=/(<link[^>]*)(rel=['|"]?stylesheet['|"]?[^>]*>)/g,e={u:function(a,b){a.href&&a.setAttribute("href",e.c(a.getAttribute("href"),b));a.src&&a.setAttribute("src",e.c(a.getAttribute("src"),b));if("style"===a.localName){var c=e.o(a.textContent,b,F);a.textContent=e.o(c,b,G)}},o:function(a,b,c){return a.replace(c,
+    function(a,c,l,g){a=l.replace(/["']/g,"");b&&(a=e.c(a,b));return c+"'"+a+"'"+g})},c:function(a,b){if(void 0===e.f){e.f=!1;try{var c=new URL("b","http://a");c.pathname="c%20d";e.f="http://a/c%20d"===c.href}catch(d){}}if(e.f)return(new URL(a,b)).href;c=e.s;c||(c=document.implementation.createHTMLDocument("temp"),e.s=c,c.i=c.createElement("base"),c.head.appendChild(c.i),c.h=c.createElement("a"));c.i.href=b;c.h.href=a;return c.h.href||a}},C={async:!0,load:function(a,b,c){if(a)if(a.match(/^data:/)){a=
+    a.split(",");var d=a[1];d=-1<a[0].indexOf(";base64")?atob(d):decodeURIComponent(d);b(d)}else{var f=new XMLHttpRequest;f.open("GET",a,C.async);f.onload=function(){var a=f.responseURL||f.getResponseHeader("Location");a&&0===a.indexOf("/")&&(a=(location.origin||location.protocol+"//"+location.host)+a);var d=f.response||f.responseText;304===f.status||0===f.status||200<=f.status&&300>f.status?b(d,a):c(d)};f.send()}else c("error: href must be specified")}},v=/Trident/.test(navigator.userAgent)||/Edge\/\d./i.test(navigator.userAgent);
+    h.prototype.loadImports=function(a){var b=this;g(k(a,"link[rel=import]"),function(a){return b.l(a)})};h.prototype.l=function(a){var b=this,c=a.href;if(void 0!==this.a[c]){var d=this.a[c];d&&d.__loaded&&(a.__import=d,this.j(a))}else this.b++,this.a[c]="pending",C.load(c,function(a,d){a=b.A(a,d||c);b.a[c]=a;b.b--;b.loadImports(a);b.m()},function(){b.a[c]=null;b.b--;b.m()})};h.prototype.A=function(a,b){if(!a)return document.createDocumentFragment();v&&(a=a.replace(H,function(a,b,c){return-1===a.indexOf("type=")?
+    b+" type=import-disable "+c:a}));var c=document.createElement("template");c.innerHTML=a;if(c.content)a=c.content,B(a);else for(a=document.createDocumentFragment();c.firstChild;)a.appendChild(c.firstChild);if(c=a.querySelector("base"))b=e.c(c.getAttribute("href"),b),c.removeAttribute("href");var d=0;g(k(a,'link[rel=import],link[rel=stylesheet][href][type=import-disable],style:not([type]),link[rel=stylesheet][href]:not([type]),script:not([type]),script[type="application/javascript"],script[type="text/javascript"]'),
+    function(a){t(a);e.u(a,b);a.setAttribute("import-dependency","");"script"===a.localName&&!a.src&&a.textContent&&(a.setAttribute("src","data:text/javascript;charset=utf-8,"+encodeURIComponent(a.textContent+("\n//# sourceURL="+b+(d?"-"+d:"")+".js\n"))),a.textContent="",d++)});return a};h.prototype.m=function(){var a=this;if(!this.b){this.g.disconnect();this.flatten(document);var b=!1,c=!1,d=function(){c&&b&&(a.loadImports(document),a.b||(a.g.observe(document.head,{childList:!0,subtree:!0}),a.v()))};
+    this.C(function(){c=!0;d()});this.B(function(){b=!0;d()})}};h.prototype.flatten=function(a){var b=this;g(k(a,"link[rel=import]"),function(a){var c=b.a[a.href];(a.__import=c)&&c.nodeType===Node.DOCUMENT_FRAGMENT_NODE&&(b.a[a.href]=a,a.readyState="loading",a.__import=a,b.flatten(c),a.appendChild(c))})};h.prototype.B=function(a){function b(f){if(f<d){var l=c[f],e=document.createElement("script");l.removeAttribute("import-dependency");g(l.attributes,function(a){return e.setAttribute(a.name,a.value)});
+    w=e;l.parentNode.replaceChild(e,l);t(e,function(){w=null;b(f+1)})}else a()}var c=k(document,"script[import-dependency]"),d=c.length;b(0)};h.prototype.C=function(a){var b=k(document,"style[import-dependency],link[rel=stylesheet][import-dependency]"),c=b.length;if(c){var d=v&&!!document.querySelector("link[rel=stylesheet][href][type=import-disable]");g(b,function(b){t(b,function(){b.removeAttribute("import-dependency");0===--c&&a()});if(d&&b.parentNode!==document.head){var e=document.createElement(b.localName);
+    e.__appliedElement=b;e.setAttribute("type","import-placeholder");b.parentNode.insertBefore(e,b.nextSibling);for(e=m(b);e&&m(e);)e=m(e);e.parentNode!==document.head&&(e=null);document.head.insertBefore(b,e);b.removeAttribute("type")}})}else a()};h.prototype.v=function(){var a=this;g(k(document,"link[rel=import]"),function(b){return a.j(b)},!0)};h.prototype.j=function(a){a.__loaded||(a.__loaded=!0,a.import&&(a.import.readyState="complete"),a.dispatchEvent(y(a.import?"load":"error",{bubbles:!1,cancelable:!1,
+    detail:void 0})))};h.prototype.w=function(a){var b=this;g(a,function(a){return g(a.addedNodes,function(a){a&&a.nodeType===Node.ELEMENT_NODE&&(r(a)?b.l(a):b.loadImports(a))})})};var x=null;if(u)g(k(document,"link[rel=import]"),function(a){a.import&&"loading"===a.import.readyState||(a.__loaded=!0)}),n=function(a){a=a.target;r(a)&&(a.__loaded=!0)},document.addEventListener("load",n,!0),document.addEventListener("error",n,!0);else{var p=Object.getOwnPropertyDescriptor(Node.prototype,"baseURI");Object.defineProperty((!p||
+    p.configurable?Node:Element).prototype,"baseURI",{get:function(){var a=r(this)?this:m(this);return a?a.href:p&&p.get?p.get.call(this):(document.querySelector("base")||window.location).href},configurable:!0,enumerable:!0});Object.defineProperty(HTMLLinkElement.prototype,"import",{get:function(){return this.__import||null},configurable:!0,enumerable:!0});z(function(){x=new h})}A(function(){return document.dispatchEvent(y("HTMLImportsLoaded",{cancelable:!0,bubbles:!0,detail:void 0}))});q.useNative=u;
+    q.whenReady=A;q.importForElement=m;q.loadImports=function(a){x&&x.loadImports(a)}})(window.HTMLImports=window.HTMLImports||{});
diff --git a/src/resources/load_markdown.js b/src/resources/load_markdown.js
new file mode 100644
index 0000000000..a48e50b45d
--- /dev/null
+++ b/src/resources/load_markdown.js
@@ -0,0 +1,5 @@
+import marked from 'marked';
+import filterXSS from 'xss';
+
+window.marked = marked;
+window.filterXSS = filterXSS;
diff --git a/src/resources/panel-imports.html b/src/resources/panel-imports.html
deleted file mode 100644
index 1f64b60828..0000000000
--- a/src/resources/panel-imports.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<link rel="import" href="../../bower_components/app-layout/app-header-layout/app-header-layout.html">
-<link rel="import" href="../../bower_components/app-layout/app-header/app-header.html">
-<link rel="import" href="../../bower_components/app-layout/app-toolbar/app-toolbar.html">
diff --git a/src/resources/panel-imports.js b/src/resources/panel-imports.js
new file mode 100644
index 0000000000..af809afcb4
--- /dev/null
+++ b/src/resources/panel-imports.js
@@ -0,0 +1,4 @@
+import '@polymer/app-layout/app-header-layout/app-header-layout.js';
+import '@polymer/app-layout/app-header/app-header.js';
+import '@polymer/app-layout/app-toolbar/app-toolbar.js';
+
diff --git a/src/state-summary/state-card-climate.html b/src/state-summary/state-card-climate.js
similarity index 51%
rename from src/state-summary/state-card-climate.html
rename to src/state-summary/state-card-climate.js
index c4728e33f8..34d3e894e6 100644
--- a/src/state-summary/state-card-climate.html
+++ b/src/state-summary/state-card-climate.js
@@ -1,12 +1,13 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../components/entity/state-info.js';
+import '../components/ha-climate-state.js';
 
-<link rel="import" href="../components/ha-climate-state.html">
-<link rel="import" href="../components/entity/state-info.html">
-
-<dom-module id="state-card-climate">
-  <template>
+class StateCardClimate extends PolymerElement {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       :host {
@@ -20,15 +21,13 @@
       }
     </style>
 
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
       <ha-climate-state state-obj="[[stateObj]]"></ha-climate-state>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class StateCardClimate extends Polymer.Element {
   static get is() { return 'state-card-climate'; }
 
   static get properties() {
@@ -42,4 +41,3 @@ class StateCardClimate extends Polymer.Element {
   }
 }
 customElements.define(StateCardClimate.is, StateCardClimate);
-</script>
diff --git a/src/state-summary/state-card-configurator.html b/src/state-summary/state-card-configurator.html
deleted file mode 100644
index 618aca426c..0000000000
--- a/src/state-summary/state-card-configurator.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-
-<link rel="import" href="../components/entity/state-info.html">
-
-<dom-module id='state-card-configurator'>
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-    <style>
-      paper-button {
-        color: var(--primary-color);
-        font-weight: 500;
-        top: 3px;
-        height: 37px;
-        margin-right: -.57em;
-      }
-    </style>
-
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <paper-button hidden$='[[inDialog]]'>[[stateObj.state]]</paper-button>
-    </div>
-
-    <!-- pre load the image so the dialog is rendered the proper size -->
-    <template is='dom-if' if='[[stateObj.attributes.description_image]]'>
-      <img hidden src='[[stateObj.attributes.description_image]]' />
-    </template>
-  </template>
-</dom-module>
-
-<script>
-class StateCardConfigurator extends Polymer.Element {
-  static get is() { return 'state-card-configurator'; }
-
-  static get properties() {
-    return {
-      stateObj: Object,
-      inDialog: {
-        type: Boolean,
-        value: false,
-      },
-    };
-  }
-}
-customElements.define(StateCardConfigurator.is, StateCardConfigurator);
-</script>
diff --git a/src/state-summary/state-card-configurator.js b/src/state-summary/state-card-configurator.js
new file mode 100644
index 0000000000..6f450e5588
--- /dev/null
+++ b/src/state-summary/state-card-configurator.js
@@ -0,0 +1,46 @@
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../components/entity/state-info.js';
+
+class StateCardConfigurator extends PolymerElement {
+  static get template() {
+    return html`
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+    <style>
+      paper-button {
+        color: var(--primary-color);
+        font-weight: 500;
+        top: 3px;
+        height: 37px;
+        margin-right: -.57em;
+      }
+    </style>
+
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+      <paper-button hidden\$="[[inDialog]]">[[stateObj.state]]</paper-button>
+    </div>
+
+    <!-- pre load the image so the dialog is rendered the proper size -->
+    <template is="dom-if" if="[[stateObj.attributes.description_image]]">
+      <img hidden="" src="[[stateObj.attributes.description_image]]">
+    </template>
+`;
+  }
+
+  static get is() { return 'state-card-configurator'; }
+
+  static get properties() {
+    return {
+      stateObj: Object,
+      inDialog: {
+        type: Boolean,
+        value: false,
+      },
+    };
+  }
+}
+customElements.define(StateCardConfigurator.is, StateCardConfigurator);
diff --git a/src/state-summary/state-card-content.html b/src/state-summary/state-card-content.js
similarity index 51%
rename from src/state-summary/state-card-content.html
rename to src/state-summary/state-card-content.js
index 8c95f16ce8..5bbcf627fc 100644
--- a/src/state-summary/state-card-content.html
+++ b/src/state-summary/state-card-content.js
@@ -1,23 +1,21 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="state-card-climate.html">
-<link rel="import" href="state-card-configurator.html">
-<link rel="import" href="state-card-cover.html">
-<link rel="import" href="state-card-display.html">
-<link rel="import" href="state-card-input_select.html">
-<link rel="import" href="state-card-input_number.html">
-<link rel="import" href="state-card-input_text.html">
-<link rel="import" href="state-card-media_player.html">
-<link rel="import" href="state-card-scene.html">
-<link rel="import" href="state-card-script.html">
-<link rel="import" href="state-card-timer.html">
-<link rel="import" href="state-card-toggle.html">
-<link rel="import" href="state-card-weblink.html">
+import '../util/hass-util.js';
+import './state-card-climate.js';
+import './state-card-configurator.js';
+import './state-card-cover.js';
+import './state-card-display.js';
+import './state-card-input_number.js';
+import './state-card-input_select.js';
+import './state-card-input_text.js';
+import './state-card-media_player.js';
+import './state-card-scene.js';
+import './state-card-script.js';
+import './state-card-timer.js';
+import './state-card-toggle.js';
+import './state-card-weblink.js';
 
-<link rel="import" href="../util/hass-util.html">
-
-<script>
-class StateCardContent extends Polymer.Element {
+class StateCardContent extends PolymerElement {
   static get is() { return 'state-card-content'; }
 
   static get properties() {
@@ -57,4 +55,3 @@ class StateCardContent extends Polymer.Element {
   }
 }
 customElements.define(StateCardContent.is, StateCardContent);
-</script>
diff --git a/src/state-summary/state-card-cover.html b/src/state-summary/state-card-cover.html
deleted file mode 100644
index a079784a87..0000000000
--- a/src/state-summary/state-card-cover.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel="import" href="../components/entity/state-info.html">
-
-<link rel="import" href="../components/ha-cover-controls.html">
-<link rel="import" href="../components/ha-cover-tilt-controls.html">
-
-<dom-module id="state-card-cover">
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-    <style>
-      :host {
-        line-height: 1.5;
-      }
-    </style>
-
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <div class='horizontal layout'>
-        <ha-cover-controls hidden$="[[entityObj.isTiltOnly]]" hass="[[hass]]" state-obj="[[stateObj]]"></ha-cover-controls>
-        <ha-cover-tilt-controls hidden$="[[!entityObj.isTiltOnly]]" hass="[[hass]]" state-obj="[[stateObj]]"></ha-cover-tilt-controls>
-      </div>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-class StateCardCover extends Polymer.Element {
-  static get is() { return 'state-card-cover'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      stateObj: Object,
-      inDialog: {
-        type: Boolean,
-        value: false,
-      },
-      entityObj: {
-        type: Object,
-        computed: 'computeEntityObj(hass, stateObj)',
-      },
-    };
-  }
-
-  computeEntityObj(hass, stateObj) {
-    var entity = new window.CoverEntity(hass, stateObj);
-    return entity;
-  }
-}
-customElements.define(StateCardCover.is, StateCardCover);
-</script>
diff --git a/src/state-summary/state-card-cover.js b/src/state-summary/state-card-cover.js
new file mode 100644
index 0000000000..9060732487
--- /dev/null
+++ b/src/state-summary/state-card-cover.js
@@ -0,0 +1,51 @@
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../components/entity/state-info.js';
+import '../components/ha-cover-controls.js';
+import '../components/ha-cover-tilt-controls.js';
+
+class StateCardCover extends PolymerElement {
+  static get template() {
+    return html`
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+    <style>
+      :host {
+        line-height: 1.5;
+      }
+    </style>
+
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+      <div class="horizontal layout">
+        <ha-cover-controls hidden\$="[[entityObj.isTiltOnly]]" hass="[[hass]]" state-obj="[[stateObj]]"></ha-cover-controls>
+        <ha-cover-tilt-controls hidden\$="[[!entityObj.isTiltOnly]]" hass="[[hass]]" state-obj="[[stateObj]]"></ha-cover-tilt-controls>
+      </div>
+    </div>
+`;
+  }
+
+  static get is() { return 'state-card-cover'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      stateObj: Object,
+      inDialog: {
+        type: Boolean,
+        value: false,
+      },
+      entityObj: {
+        type: Object,
+        computed: 'computeEntityObj(hass, stateObj)',
+      },
+    };
+  }
+
+  computeEntityObj(hass, stateObj) {
+    var entity = new window.CoverEntity(hass, stateObj);
+    return entity;
+  }
+}
+customElements.define(StateCardCover.is, StateCardCover);
diff --git a/src/state-summary/state-card-display.html b/src/state-summary/state-card-display.js
similarity index 56%
rename from src/state-summary/state-card-display.html
rename to src/state-summary/state-card-display.js
index 3b89d25e09..112f0eee6d 100644
--- a/src/state-summary/state-card-display.html
+++ b/src/state-summary/state-card-display.js
@@ -1,13 +1,19 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../components/entity/state-info.js';
+import '../util/hass-mixins.js';
 
-<link rel="import" href="../components/entity/state-info.html">
-<link rel="import" href="../util/hass-mixins.html">
-<link rel="import" href="../util/hass-util.html">
+import computeStateDisplay from '../../js/common/entity/compute_state_display.js';
+import attributeClassNames from '../../js/common/entity/attribute_class_names.js';
 
-<dom-module id="state-card-display">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class StateCardDisplay extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style>
 
       :host {
@@ -33,16 +39,11 @@
       }
     </style>
 
-    <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-    <div class$='[[computeClassNames(stateObj)]]'>[[computeStateDisplay(localize, stateObj, language)]]</div>
-  </template>
-</dom-module>
+    <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+    <div class\$="[[computeClassNames(stateObj)]]">[[computeStateDisplay(localize, stateObj, language)]]</div>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class StateCardDisplay extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'state-card-display'; }
 
   static get properties() {
@@ -57,16 +58,15 @@ class StateCardDisplay extends window.hassMixins.LocalizeMixin(Polymer.Element)
   }
 
   computeStateDisplay(localize, stateObj, language) {
-    return window.hassUtil.computeStateDisplay(localize, stateObj, language);
+    return computeStateDisplay(localize, stateObj, language);
   }
 
   computeClassNames(stateObj) {
     const classes = [
       'state',
-      window.hassUtil.attributeClassNames(stateObj, ['unit_of_measurement']),
+      attributeClassNames(stateObj, ['unit_of_measurement']),
     ];
     return classes.join(' ');
   }
 }
 customElements.define(StateCardDisplay.is, StateCardDisplay);
-</script>
diff --git a/src/state-summary/state-card-input_number.html b/src/state-summary/state-card-input_number.js
similarity index 63%
rename from src/state-summary/state-card-input_number.html
rename to src/state-summary/state-card-input_number.js
index 6918e46f30..4f8176a8f8 100644
--- a/src/state-summary/state-card-input_number.html
+++ b/src/state-summary/state-card-input_number.js
@@ -1,19 +1,19 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
+import '@polymer/paper-input/paper-input.js';
+import '@polymer/paper-slider/paper-slider.js';
+import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../components/entity/state-info.js';
+import '../util/hass-util.js';
 
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-
-<link rel="import" href="../../bower_components/paper-slider/paper-slider.html">
-
-<link rel="import" href="../../bower_components/iron-resizable-behavior/iron-resizable-behavior.html">
-
-<link rel="import" href="../components/entity/state-info.html">
-
-<link rel="import" href="../util/hass-util.html">
-
-<dom-module id="state-card-input_number">
-  <template>
+class StateCardInputNumber extends mixinBehaviors([
+  IronResizableBehavior
+], PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       paper-slider {
@@ -38,35 +38,18 @@
       }
     </style>
 
-    <div class='horizontal justified layout' id='input_number_card'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-        <paper-slider min='[[min]]' max='[[max]]' value='{{value}}' step='[[step]]' hidden='[[hiddenslider]]' pin
-          on-change='selectedValueChanged' on-click='stopPropagation' id='slider' ignore-bar-touch>
+    <div class="horizontal justified layout" id="input_number_card">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+        <paper-slider min="[[min]]" max="[[max]]" value="{{value}}" step="[[step]]" hidden="[[hiddenslider]]" pin="" on-change="selectedValueChanged" on-click="stopPropagation" id="slider" ignore-bar-touch="">
         </paper-slider>
-      <paper-input
-        no-label-float
-        auto-validate
-        pattern='[0-9]+([\.][0-9]+)?'
-        step='[[step]]'
-        min='[[min]]'
-        max='[[max]]'
-        value='{{value}}'
-        type='number'
-        on-change='selectedValueChanged'
-        on-click='stopPropagation'
-        hidden='[[hiddenbox]]'
-      >
+      <paper-input no-label-float="" auto-validate="" pattern="[0-9]+([\\.][0-9]+)?" step="[[step]]" min="[[min]]" max="[[max]]" value="{{value}}" type="number" on-change="selectedValueChanged" on-click="stopPropagation" hidden="[[hiddenbox]]">
       </paper-input>
-      <div class="state" hidden='[[hiddenbox]]'>[[stateObj.attributes.unit_of_measurement]]</div>
-      <div id="sliderstate" class="state sliderstate" hidden='[[hiddenslider]]'>[[value]] [[stateObj.attributes.unit_of_measurement]]</div>
+      <div class="state" hidden="[[hiddenbox]]">[[stateObj.attributes.unit_of_measurement]]</div>
+      <div id="sliderstate" class="state sliderstate" hidden="[[hiddenslider]]">[[value]] [[stateObj.attributes.unit_of_measurement]]</div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class StateCardInputNumber extends Polymer.mixinBehaviors([
-  Polymer.IronResizableBehavior
-], Polymer.Element) {
   static get is() { return 'state-card-input_number'; }
 
   ready() {
@@ -169,4 +152,3 @@ class StateCardInputNumber extends Polymer.mixinBehaviors([
 }
 
 customElements.define(StateCardInputNumber.is, StateCardInputNumber);
-</script>
diff --git a/src/state-summary/state-card-input_select.html b/src/state-summary/state-card-input_select.js
similarity index 63%
rename from src/state-summary/state-card-input_select.html
rename to src/state-summary/state-card-input_select.js
index 133757b629..4ceb8a0788 100644
--- a/src/state-summary/state-card-input_select.html
+++ b/src/state-summary/state-card-input_select.js
@@ -1,12 +1,14 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel='import' href='../../bower_components/paper-listbox/paper-listbox.html'>
-<link rel='import' href='../../bower_components/paper-item/paper-item.html'>
+import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js';
+import '@polymer/paper-item/paper-item.js';
+import '@polymer/paper-listbox/paper-listbox.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../components/entity/state-badge.html">
+import '../components/entity/state-badge.js';
 
-<dom-module id="state-card-input_select">
-  <template>
+class StateCardInputSelect extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       :host {
         display: block;
@@ -27,22 +29,17 @@
       }
     </style>
 
-    <state-badge state-obj='[[stateObj]]'></state-badge>
-    <paper-dropdown-menu
-      on-click='stopPropagation'
-      selected-item-label='{{selectedOption}}'
-      label='[[computeStateName(stateObj)]]'>
+    <state-badge state-obj="[[stateObj]]"></state-badge>
+    <paper-dropdown-menu on-click="stopPropagation" selected-item-label="{{selectedOption}}" label="[[computeStateName(stateObj)]]">
       <paper-listbox slot="dropdown-content" selected="[[computeSelected(stateObj)]]">
-        <template is='dom-repeat' items='[[stateObj.attributes.options]]'>
+        <template is="dom-repeat" items="[[stateObj.attributes.options]]">
           <paper-item>[[item]]</paper-item>
         </template>
       </paper-listbox>
     </paper-dropdown-menu>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class StateCardInputSelect extends Polymer.Element {
   static get is() { return 'state-card-input_select'; }
 
   static get properties() {
@@ -84,4 +81,3 @@ class StateCardInputSelect extends Polymer.Element {
   }
 }
 customElements.define(StateCardInputSelect.is, StateCardInputSelect);
-</script>
diff --git a/src/state-summary/state-card-input_text.html b/src/state-summary/state-card-input_text.html
deleted file mode 100644
index 4815ab18f7..0000000000
--- a/src/state-summary/state-card-input_text.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-
-<link rel="import" href="../components/entity/state-info.html">
-
-<link rel="import" href="../util/hass-util.html">
-
-<dom-module id="state-card-input_text">
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-    <style>
-      paper-input {
-        margin-left: 16px;
-      }
-    </style>
-
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <paper-input
-        no-label-float
-        minlength='[[stateObj.attributes.min]]'
-        maxlength='[[stateObj.attributes.max]]'
-        value='{{value}}'
-        auto-validate='[[stateObj.attributes.pattern]]'
-        pattern='[[stateObj.attributes.pattern]]'
-        type='[[stateObj.attributes.mode]]'
- 
-        on-change='selectedValueChanged'
-        on-click='stopPropagation'
-        placeholder='(empty value)'
-      >
-      </paper-input>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-class StateCardInputText extends Polymer.Element {
-  static get is() { return 'state-card-input_text'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-
-      inDialog: {
-        type: Boolean,
-        value: false,
-      },
-
-      stateObj: {
-        type: Object,
-        observer: 'stateObjectChanged',
-      },
-
-      pattern: {
-        type: String,
-      },
-
-      value: {
-        type: String,
-      }
-
-    };
-  }
-
-  stateObjectChanged(newVal) {
-    this.value = newVal.state;
-  }
-
-  selectedValueChanged() {
-    if (this.value === this.stateObj.state) {
-      return;
-    }
-    this.hass.callService('input_text', 'set_value', {
-      value: this.value,
-      entity_id: this.stateObj.entity_id,
-    });
-  }
-
-  stopPropagation(ev) {
-    ev.stopPropagation();
-  }
-}
-
-customElements.define(StateCardInputText.is, StateCardInputText);
-</script>
diff --git a/src/state-summary/state-card-input_text.js b/src/state-summary/state-card-input_text.js
new file mode 100644
index 0000000000..533801052c
--- /dev/null
+++ b/src/state-summary/state-card-input_text.js
@@ -0,0 +1,73 @@
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-input/paper-input.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../components/entity/state-info.js';
+import '../util/hass-util.js';
+
+class StateCardInputText extends PolymerElement {
+  static get template() {
+    return html`
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+    <style>
+      paper-input {
+        margin-left: 16px;
+      }
+    </style>
+
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+      <paper-input no-label-float="" minlength="[[stateObj.attributes.min]]" maxlength="[[stateObj.attributes.max]]" value="{{value}}" auto-validate="[[stateObj.attributes.pattern]]" pattern="[[stateObj.attributes.pattern]]" type="[[stateObj.attributes.mode]]" on-change="selectedValueChanged" on-click="stopPropagation" placeholder="(empty value)">
+      </paper-input>
+    </div>
+`;
+  }
+
+  static get is() { return 'state-card-input_text'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+
+      inDialog: {
+        type: Boolean,
+        value: false,
+      },
+
+      stateObj: {
+        type: Object,
+        observer: 'stateObjectChanged',
+      },
+
+      pattern: {
+        type: String,
+      },
+
+      value: {
+        type: String,
+      }
+
+    };
+  }
+
+  stateObjectChanged(newVal) {
+    this.value = newVal.state;
+  }
+
+  selectedValueChanged() {
+    if (this.value === this.stateObj.state) {
+      return;
+    }
+    this.hass.callService('input_text', 'set_value', {
+      value: this.value,
+      entity_id: this.stateObj.entity_id,
+    });
+  }
+
+  stopPropagation(ev) {
+    ev.stopPropagation();
+  }
+}
+
+customElements.define(StateCardInputText.is, StateCardInputText);
diff --git a/src/state-summary/state-card-media_player.html b/src/state-summary/state-card-media_player.js
similarity index 67%
rename from src/state-summary/state-card-media_player.html
rename to src/state-summary/state-card-media_player.js
index 06c95def96..3b28e922a3 100644
--- a/src/state-summary/state-card-media_player.html
+++ b/src/state-summary/state-card-media_player.js
@@ -1,12 +1,16 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../components/entity/state-info.js';
+import '../util/hass-mixins.js';
 
-<link rel="import" href="../components/entity/state-info.html">
-<link rel="import" href="../util/hass-mixins.html">
-
-<dom-module id="state-card-media_player">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class StateCardMediaPlayer extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       :host {
@@ -36,21 +40,16 @@
       }
     </style>
 
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <div class='state'>
-        <div class='main-text' take-height$='[[!playerObj.secondaryTitle]]'>[[computePrimaryText(localize, playerObj)]]</div>
-        <div class='secondary-text'>[[playerObj.secondaryTitle]]</div>
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+      <div class="state">
+        <div class="main-text" take-height\$="[[!playerObj.secondaryTitle]]">[[computePrimaryText(localize, playerObj)]]</div>
+        <div class="secondary-text">[[playerObj.secondaryTitle]]</div>
       </div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class StateCardMediaPlayer extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'state-card-media_player'; }
 
   static get properties() {
@@ -79,4 +78,3 @@ class StateCardMediaPlayer extends window.hassMixins.LocalizeMixin(Polymer.Eleme
   }
 }
 customElements.define(StateCardMediaPlayer.is, StateCardMediaPlayer);
-</script>
diff --git a/src/state-summary/state-card-scene.html b/src/state-summary/state-card-scene.js
similarity index 56%
rename from src/state-summary/state-card-scene.html
rename to src/state-summary/state-card-scene.js
index 7f0ee5cc2d..29008159fc 100644
--- a/src/state-summary/state-card-scene.html
+++ b/src/state-summary/state-card-scene.js
@@ -1,14 +1,17 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../components/entity/state-info.js';
+import '../util/hass-mixins.js';
 
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-
-<link rel="import" href="../components/entity/state-info.html">
-<link rel='import' href='../util/hass-mixins.html'>
-
-<dom-module id="state-card-scene">
-  <template>
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class StateCardScene extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       paper-button {
@@ -20,18 +23,13 @@
       }
     </style>
 
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <paper-button on-click='activateScene'>[[localize('ui.card.scene.activate')]]</paper-button>
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+      <paper-button on-click="activateScene">[[localize('ui.card.scene.activate')]]</paper-button>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class StateCardScene extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'state-card-scene'; }
 
   static get properties() {
@@ -54,4 +52,3 @@ class StateCardScene extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   }
 }
 customElements.define(StateCardScene.is, StateCardScene);
-</script>
diff --git a/src/state-summary/state-card-script.html b/src/state-summary/state-card-script.html
deleted file mode 100644
index aef0b31170..0000000000
--- a/src/state-summary/state-card-script.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
-
-<link rel="import" href="../components/entity/state-info.html">
-<link rel="import" href="../components/entity/ha-entity-toggle.html">
-<link rel='import' href='../util/hass-mixins.html'>
-
-<dom-module id="state-card-script">
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-    <style>
-      paper-button {
-        color: var(--primary-color);
-        font-weight: 500;
-        top: 3px;
-        height: 37px;
-        margin-right: -.57em;
-      }
-
-      ha-entity-toggle {
-        margin-left: 16px;
-      }
-    </style>
-
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <template is='dom-if' if='[[stateObj.attributes.can_cancel]]'>
-        <ha-entity-toggle state-obj='[[stateObj]]' hass='[[hass]]'></ha-entity-toggle>
-      </template>
-      <template is='dom-if' if='[[!stateObj.attributes.can_cancel]]'>
-        <paper-button on-click='fireScript'>[[localize('ui.card.script.execute')]]</paper-button>
-      </template>
-    </div>
-  </template>
-</dom-module>
-
-<script>
-/*
- * @appliesMixin window.hassMixins.LocalizeMixin
- */
-class StateCardScript extends window.hassMixins.LocalizeMixin(Polymer.Element) {
-  static get is() { return 'state-card-script'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      stateObj: Object,
-      inDialog: {
-        type: Boolean,
-        value: false,
-      },
-    };
-  }
-
-  fireScript(ev) {
-    ev.stopPropagation();
-    this.hass.callService(
-      'script', 'turn_on',
-      { entity_id: this.stateObj.entity_id }
-    );
-  }
-}
-customElements.define(StateCardScript.is, StateCardScript);
-</script>
diff --git a/src/state-summary/state-card-script.js b/src/state-summary/state-card-script.js
new file mode 100644
index 0000000000..800f2ba2a9
--- /dev/null
+++ b/src/state-summary/state-card-script.js
@@ -0,0 +1,64 @@
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import '@polymer/paper-button/paper-button.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../components/entity/ha-entity-toggle.js';
+import '../components/entity/state-info.js';
+import '../util/hass-mixins.js';
+
+/*
+ * @appliesMixin window.hassMixins.LocalizeMixin
+ */
+class StateCardScript extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+    <style>
+      paper-button {
+        color: var(--primary-color);
+        font-weight: 500;
+        top: 3px;
+        height: 37px;
+        margin-right: -.57em;
+      }
+
+      ha-entity-toggle {
+        margin-left: 16px;
+      }
+    </style>
+
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+      <template is="dom-if" if="[[stateObj.attributes.can_cancel]]">
+        <ha-entity-toggle state-obj="[[stateObj]]" hass="[[hass]]"></ha-entity-toggle>
+      </template>
+      <template is="dom-if" if="[[!stateObj.attributes.can_cancel]]">
+        <paper-button on-click="fireScript">[[localize('ui.card.script.execute')]]</paper-button>
+      </template>
+    </div>
+`;
+  }
+
+  static get is() { return 'state-card-script'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      stateObj: Object,
+      inDialog: {
+        type: Boolean,
+        value: false,
+      },
+    };
+  }
+
+  fireScript(ev) {
+    ev.stopPropagation();
+    this.hass.callService(
+      'script', 'turn_on',
+      { entity_id: this.stateObj.entity_id }
+    );
+  }
+}
+customElements.define(StateCardScript.is, StateCardScript);
diff --git a/src/state-summary/state-card-timer.html b/src/state-summary/state-card-timer.js
similarity index 70%
rename from src/state-summary/state-card-timer.html
rename to src/state-summary/state-card-timer.js
index c3f09994a1..4cde4f0a24 100644
--- a/src/state-summary/state-card-timer.html
+++ b/src/state-summary/state-card-timer.js
@@ -1,13 +1,14 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
+import '../components/entity/state-info.js';
+import '../util/hass-mixins.js';
+import '../util/hass-util.js';
 
-<link rel="import" href="../components/entity/state-info.html">
-<link rel="import" href="../util/hass-mixins.html">
-<link rel="import" href="../util/hass-util.html">
-
-<dom-module id="state-card-timer">
-  <template>
+class StateCardTimer extends window.hassMixins.LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
     <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
     <style>
       .state {
@@ -20,15 +21,13 @@
       }
     </style>
 
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <div class='state'>[[secondsToDuration(timeRemaining)]]</div>
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+      <div class="state">[[secondsToDuration(timeRemaining)]]</div>
     </div>
-  </template>
-</dom-module>
+`;
+  }
 
-<script>
-class StateCardTimer extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   static get is() { return 'state-card-timer'; }
 
   static get properties() {
@@ -85,4 +84,3 @@ class StateCardTimer extends window.hassMixins.LocalizeMixin(Polymer.Element) {
   }
 }
 customElements.define(StateCardTimer.is, StateCardTimer);
-</script>
diff --git a/src/state-summary/state-card-toggle.html b/src/state-summary/state-card-toggle.html
deleted file mode 100644
index 9e2e831b05..0000000000
--- a/src/state-summary/state-card-toggle.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
-
-<link rel="import" href="../../bower_components/iron-flex-layout/iron-flex-layout-classes.html">
-
-<link rel="import" href="../components/entity/state-info.html">
-<link rel="import" href="../components/entity/ha-entity-toggle.html">
-
-<dom-module id="state-card-toggle">
-  <template>
-    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
-    <style>
-      ha-entity-toggle {
-        margin: -4px -16px -4px 0;
-        padding: 4px 16px;
-      }
-    </style>
-
-    <div class='horizontal justified layout'>
-      <state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
-      <ha-entity-toggle state-obj="[[stateObj]]" hass='[[hass]]'></ha-entity-toggle>
-    </div>
-
-  </template>
-</dom-module>
-
-<script>
-class StateCardToggle extends Polymer.Element {
-  static get is() { return 'state-card-toggle'; }
-
-  static get properties() {
-    return {
-      hass: Object,
-      stateObj: Object,
-      inDialog: {
-        type: Boolean,
-        value: false,
-      },
-    };
-  }
-}
-customElements.define(StateCardToggle.is, StateCardToggle);
-</script>
diff --git a/src/state-summary/state-card-toggle.js b/src/state-summary/state-card-toggle.js
new file mode 100644
index 0000000000..c78702769a
--- /dev/null
+++ b/src/state-summary/state-card-toggle.js
@@ -0,0 +1,39 @@
+import '@polymer/iron-flex-layout/iron-flex-layout-classes.js';
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+
+import '../components/entity/ha-entity-toggle.js';
+import '../components/entity/state-info.js';
+
+class StateCardToggle extends PolymerElement {
+  static get template() {
+    return html`
+    <style is="custom-style" include="iron-flex iron-flex-alignment"></style>
+    <style>
+      ha-entity-toggle {
+        margin: -4px -16px -4px 0;
+        padding: 4px 16px;
+      }
+    </style>
+
+    <div class="horizontal justified layout">
+      <state-info state-obj="[[stateObj]]" in-dialog="[[inDialog]]"></state-info>
+      <ha-entity-toggle state-obj="[[stateObj]]" hass="[[hass]]"></ha-entity-toggle>
+    </div>
+`;
+  }
+
+  static get is() { return 'state-card-toggle'; }
+
+  static get properties() {
+    return {
+      hass: Object,
+      stateObj: Object,
+      inDialog: {
+        type: Boolean,
+        value: false,
+      },
+    };
+  }
+}
+customElements.define(StateCardToggle.is, StateCardToggle);
diff --git a/src/state-summary/state-card-weblink.html b/src/state-summary/state-card-weblink.js
similarity index 65%
rename from src/state-summary/state-card-weblink.html
rename to src/state-summary/state-card-weblink.js
index 2af3a7dccb..a75af49fcd 100644
--- a/src/state-summary/state-card-weblink.html
+++ b/src/state-summary/state-card-weblink.js
@@ -1,9 +1,11 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { html } from '@polymer/polymer/lib/utils/html-tag.js';
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel="import" href="../components/entity/state-badge.html">
+import '../components/entity/state-badge.js';
 
-<dom-module id="state-card-weblink">
-  <template>
+class StateCardWeblink extends PolymerElement {
+  static get template() {
+    return html`
     <style>
       :host {
         display: block;
@@ -19,13 +21,11 @@
       }
     </style>
 
-    <state-badge state-obj='[[stateObj]]'></state-badge>
-    <a href$='[[stateObj.state]]' target='_blank' class='name' id='link'>[[computeStateName(stateObj)]]</a>
-  </template>
-</dom-module>
+    <state-badge state-obj="[[stateObj]]"></state-badge>
+    <a href\$="[[stateObj.state]]" target="_blank" class="name" id="link">[[computeStateName(stateObj)]]</a>
+`;
+  }
 
-<script>
-class StateCardWeblink extends Polymer.Element {
   static get is() { return 'state-card-weblink'; }
 
   static get properties() {
@@ -54,4 +54,3 @@ class StateCardWeblink extends Polymer.Element {
   }
 }
 customElements.define(StateCardWeblink.is, StateCardWeblink);
-</script>
diff --git a/src/util/app-localize-behavior.js b/src/util/app-localize-behavior.js
new file mode 100644
index 0000000000..18584f0c15
--- /dev/null
+++ b/src/util/app-localize-behavior.js
@@ -0,0 +1,333 @@
+/* Forked to fix the import of IntlMessageFormat */
+/* eslint-disable */
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+import '@polymer/polymer/polymer-legacy.js';
+
+import '@polymer/iron-ajax/iron-ajax.js';
+import IntlMessageFormat from 'intl-messageformat/src/main.js';
+
+/**
+* `Polymer.AppLocalizeBehavior` wraps the [format.js](http://formatjs.io/) library to
+* help you internationalize your application. Note that if you're on a browser that
+* does not natively support the [Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl)
+* object, you must load the polyfill yourself. An example polyfill can
+* be found [here](https://github.com/andyearnshaw/Intl.js/).
+*
+* `Polymer.AppLocalizeBehavior` supports the same [message-syntax](http://formatjs.io/guides/message-syntax/)
+* of format.js, in its entirety; use the library docs as reference for the
+* available message formats and options.
+*
+* Sample application loading resources from an external file:
+*
+*     <dom-module id="x-app">
+*        <template>
+*         <div>{{localize('hello', 'name', 'Batman')}}</div>
+*        </template>
+*        <script>
+*           Polymer({
+*             is: "x-app",
+*
+*             behaviors: [
+*               Polymer.AppLocalizeBehavior
+*             ],
+*
+*             properties: {
+*               language: {
+*                 value: 'en'
+*               },
+*             }
+*
+*             attached: function() {
+*               this.loadResources(this.resolveUrl('locales.json'));
+*             },
+*           });
+*        &lt;/script>
+*     </dom-module>
+*
+*
+* If the resources stored in your external file are for a single language and
+* so are not nested inside any language keys, you can pass an optional
+* `language` parameter to store the fetched resources inside that key.
+*
+* This complements the optional third parameter, `merge`, nicely: If you pass
+* `merge = true`, the fetched resources will be merged into any existing
+* resources rather than clobbering them.
+*
+* This is also useful for storing resources for different parts of a page that
+* the user might or might not see at the same time in different files, so that
+* the user can fetch only the needed resources on-demand, and doesn't have to
+* load any resources they'll never see anyway. For example, you could store
+* your resources for your global nav, homepage, and FAQ page in 3 different
+* files. When a user requests the homepage, both the global nav and the
+* homepage resources are fetched and merged together, since they both appear
+* on the page at the same time, but you spare the user from fetching the
+* unneeded FAQ resources.
+*
+*
+* Example:
+*
+*     attached: function() {
+*       this.loadResources(
+*
+*         // Only contains the flattened "es" translations:
+*         'locales/es.json',  // {"hi": "hola"}
+*
+*         'es',               // unflatten -> {"es": {"hi": "hola"}}
+*
+*         true                // merge so existing resources won't be clobbered
+*       );
+*     }
+*
+*
+* Alternatively, you can also inline your resources inside the app itself:
+*
+*     <dom-module id="x-app">
+*        <template>
+*         <div>{{localize('hello', 'name', 'Batman')}}</div>
+*        </template>
+*        <script>
+*           Polymer({
+*             is: "x-app",
+*
+*             behaviors: [
+*               Polymer.AppLocalizeBehavior
+*             ],
+*
+*             properties: {
+*               language: {
+*                 value: 'en'
+*               },
+*               resources: {
+*                 value: function() {
+*                   return {
+*                     'en': { 'hello': 'My name is {name}.' },
+*                     'fr': { 'hello': 'Je m\'appelle {name}.' }
+*                   }
+*               }
+*             }
+*           });
+*        &lt;/script>
+*     </dom-module>
+*
+* @demo demo/index.html
+* @polymerBehavior Polymer.AppLocalizeBehavior
+*/
+export const AppLocalizeBehavior = {
+  /**
+   * Internal singleton cache. This is the private implementation of the
+   * behaviour; don't interact with it directly.
+   */
+  __localizationCache: {
+    requests: {},  /* One iron-request per unique resources path. */
+    messages: {},  /* Unique localized strings. Invalidated when the language, formats or resources change. */
+    ajax: null     /* Global iron-ajax object used to request resource files. */
+  },
+
+  /**
+   * Fired after the resources have been loaded.
+   *
+   * @event app-localize-resources-loaded
+   */
+
+  /**
+   * Fired when the resources cannot be loaded due to an error.
+   *
+   * @event app-localize-resources-error
+   */
+
+  properties: {
+    /**
+     * The language used for translation.
+     */
+    language: {
+      type: String
+    },
+
+    /**
+     * The dictionary of localized messages, for each of the languages that
+     * are going to be used. See http://formatjs.io/guides/message-syntax/ for
+     * more information on the message syntax.
+     *
+     * For example, a valid dictionary would be:
+     * this.resources = {
+     *  'en': { 'greeting': 'Hello!' }, 'fr' : { 'greeting': 'Bonjour!' }
+     * }
+     */
+    resources: {
+      type: Object
+    },
+
+    /**
+     * Optional dictionary of user defined formats, as explained here:
+     * http://formatjs.io/guides/message-syntax/#custom-formats
+     *
+     * For example, a valid dictionary of formats would be:
+     * this.formats = {
+     *    number: { USD: { style: 'currency', currency: 'USD' } }
+     * }
+     */
+    formats: {
+      type: Object,
+      value: function() { return {} }
+    },
+
+    /**
+     * If true, will use the provided key when
+     * the translation does not exist for that key.
+     */
+    useKeyIfMissing: {
+      type: Boolean,
+      value: false
+    },
+
+    /**
+     * Translates a string to the current `language`. Any parameters to the
+     * string should be passed in order, as follows:
+     * `localize(stringKey, param1Name, param1Value, param2Name, param2Value)`
+     */
+    localize: {
+      type: Function,
+      computed: '__computeLocalize(language, resources, formats)'
+    },
+
+    /**
+    * If true, will bubble up the event to the parents
+    */
+    bubbleEvent: {
+      type: Boolean,
+      value: false
+    }
+  },
+
+  loadResources: function(path, language, merge) {
+    var proto = this.constructor.prototype;
+
+    // Check if localCache exist just in case.
+    this.__checkLocalizationCache(proto);
+
+    // If the global ajax object has not been initialized, initialize and cache it.
+    var ajax = proto.__localizationCache.ajax;
+    if (!ajax) {
+      ajax = proto.__localizationCache.ajax = document.createElement('iron-ajax');
+    }
+
+    var request = proto.__localizationCache.requests[path];
+
+    function onRequestResponse(event) {
+      this.__onRequestResponse(event, language, merge);
+    }
+
+    if (!request) {
+      ajax.url = path;
+      var request = ajax.generateRequest();
+
+      request.completes.then(
+          onRequestResponse.bind(this),
+          this.__onRequestError.bind(this));
+
+      // Cache the instance so that it can be reused if the same path is loaded.
+      proto.__localizationCache.requests[path] = request;
+    } else {
+      request.completes.then(
+          onRequestResponse.bind(this),
+          this.__onRequestError.bind(this));
+    }
+  },
+
+  /**
+   * Returns a computed `localize` method, based on the current `language`.
+   */
+  __computeLocalize: function(language, resources, formats) {
+    var proto = this.constructor.prototype;
+
+    // Check if localCache exist just in case.
+    this.__checkLocalizationCache(proto);
+
+    // Everytime any of the parameters change, invalidate the strings cache.
+    if (!proto.__localizationCache) {
+      proto['__localizationCache'] = {requests: {}, messages: {}, ajax: null};
+    }
+    proto.__localizationCache.messages = {};
+
+    return function() {
+      var key = arguments[0];
+      if (!key || !resources || !language || !resources[language])
+        return;
+
+      // Cache the key/value pairs for the same language, so that we don't
+      // do extra work if we're just reusing strings across an application.
+      var translatedValue = resources[language][key];
+
+      if (!translatedValue) {
+        return this.useKeyIfMissing ? key : '';
+      }
+
+      var messageKey = key + translatedValue;
+      var translatedMessage = proto.__localizationCache.messages[messageKey];
+
+      if (!translatedMessage) {
+        translatedMessage = new IntlMessageFormat(translatedValue, language, formats);
+        proto.__localizationCache.messages[messageKey] = translatedMessage;
+      }
+
+      var args = {};
+      for (var i = 1; i < arguments.length; i += 2) {
+        args[arguments[i]] = arguments[i+1];
+      }
+
+      return translatedMessage.format(args);
+    }.bind(this);
+  },
+
+  __onRequestResponse: function(event, language, merge) {
+    var propertyUpdates = {};
+    var newResources = event.response;
+    if (merge) {
+      if (language) {
+        propertyUpdates.resources = Object.assign({}, this.resources || {});
+        propertyUpdates['resources.' + language] = Object.assign(
+          propertyUpdates.resources[language] || {}, newResources);
+      } else {
+        propertyUpdates.resources = Object.assign(this.resources, newResources);
+      }
+    } else {
+      if (language) {
+        propertyUpdates.resources = {};
+        propertyUpdates.resources[language] = newResources;
+        propertyUpdates['resources.' + language] = newResources;
+      } else {
+        propertyUpdates.resources = newResources;
+      }
+    }
+    if (this.setProperties) {
+      this.setProperties(propertyUpdates);
+    } else {
+      for (var key in propertyUpdates) {
+        this.set(key, propertyUpdates[key]);
+      }
+    }
+    this.fire('app-localize-resources-loaded', event, {bubbles: this.bubbleEvent});
+  },
+
+  __onRequestError: function(event) {
+    this.fire('app-localize-resources-error');
+  },
+
+  __checkLocalizationCache: function(proto) {
+    // do nothing if proto is undefined.
+    if(proto === undefined) return;
+
+    // In the event proto not have __localizationCache object, create it.
+    if(proto['__localizationCache'] === undefined) {
+      proto['__localizationCache'] = {requests: {}, messages: {}, ajax: null};
+    }
+  }
+};
diff --git a/src/util/app-localstorage-document.js b/src/util/app-localstorage-document.js
new file mode 100644
index 0000000000..d713df4864
--- /dev/null
+++ b/src/util/app-localstorage-document.js
@@ -0,0 +1,193 @@
+/* Forked because it contained an import.meta which webpack doesn't support. */
+/* eslint-disable */
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+import { AppStorageBehavior } from '@polymer/app-storage/app-storage-behavior.js';
+import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
+import '@polymer/polymer/polymer-legacy.js';
+
+/**
+ * app-localstorage-document synchronizes storage between an in-memory
+ * value and a location in the browser's localStorage system.
+ *
+ * localStorage is a simple and widely supported storage API that provides both
+ * permanent and session-based storage options. Using app-localstorage-document
+ * you can easily integrate localStorage into your app via normal Polymer
+ * databinding.
+ *
+ * app-localstorage-document is the reference implementation of an element
+ * that uses `AppStorageBehavior`. Reading its code is a good way to get
+ * started writing your own storage element.
+ *
+ * Example use:
+ *
+ *     <paper-input value="{{search}}"></paper-input>
+ *     <app-localstorage-document key="search" data="{{search}}">
+ *     </app-localstorage-document>
+ *
+ * app-localstorage-document automatically synchronizes changes to the
+ * same key across multiple tabs.
+ *
+ * Only supports storing JSON-serializable values.
+ */
+Polymer({
+  is: 'app-localstorage-document',
+  behaviors: [AppStorageBehavior],
+
+  properties: {
+    /**
+     * Defines the logical location to store the data.
+     *
+     * @type{String}
+     */
+    key: {type: String, notify: true},
+
+    /**
+     * If true, the data will automatically be cleared from storage when
+     * the page session ends (i.e. when the user has navigated away from
+     * the page).
+     */
+    sessionOnly: {type: Boolean, value: false},
+
+    /**
+     * Either `window.localStorage` or `window.sessionStorage`, depending on
+     * `this.sessionOnly`.
+     */
+    storage: {type: Object, computed: '__computeStorage(sessionOnly)'}
+  },
+
+  observers: ['__storageSourceChanged(storage, key)'],
+
+  attached: function() {
+    this.listen(window, 'storage', '__onStorage');
+    this.listen(
+        window.top, 'app-local-storage-changed', '__onAppLocalStorageChanged');
+  },
+
+  detached: function() {
+    this.unlisten(window, 'storage', '__onStorage');
+    this.unlisten(
+        window.top, 'app-local-storage-changed', '__onAppLocalStorageChanged');
+  },
+
+  get isNew() {
+    return !this.key;
+  },
+
+  /**
+   * Stores a value at the given key, and if successful, updates this.key.
+   *
+   * @param {*} key The new key to use.
+   * @return {Promise}
+   */
+  saveValue: function(key) {
+    try {
+      this.__setStorageValue(/*{@type if (key ty){String}}*/ key, this.data);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+
+    this.key = /** @type {String} */ (key);
+
+    return Promise.resolve();
+  },
+
+  reset: function() {
+    this.key = null;
+    this.data = this.zeroValue;
+  },
+
+  destroy: function() {
+    try {
+      this.storage.removeItem(this.key);
+      this.reset();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+
+    return Promise.resolve();
+  },
+
+  getStoredValue: function(path) {
+    var value;
+
+    if (this.key != null) {
+      try {
+        value = this.__parseValueFromStorage();
+
+        if (value != null) {
+          value = this.get(path, {data: value});
+        } else {
+          value = undefined;
+        }
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+
+    return Promise.resolve(value);
+  },
+
+  setStoredValue: function(path, value) {
+    if (this.key != null) {
+      try {
+        this.__setStorageValue(this.key, this.data);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+
+      this.fire('app-local-storage-changed', this, {node: window.top});
+    }
+
+    return Promise.resolve(value);
+  },
+
+  __computeStorage: function(sessionOnly) {
+    return sessionOnly ? window.sessionStorage : window.localStorage;
+  },
+
+  __storageSourceChanged: function(storage, key) {
+    this._initializeStoredValue();
+  },
+
+  __onStorage: function(event) {
+    if (event.key !== this.key || event.storageArea !== this.storage) {
+      return;
+    }
+
+    this.syncToMemory(function() {
+      this.set('data', this.__parseValueFromStorage());
+    });
+  },
+
+  __onAppLocalStorageChanged: function(event) {
+    if (event.detail === this || event.detail.key !== this.key ||
+        event.detail.storage !== this.storage) {
+      return;
+    }
+    this.syncToMemory(function() {
+      this.set('data', event.detail.data);
+    });
+  },
+
+  __parseValueFromStorage: function() {
+    try {
+      return JSON.parse(this.storage.getItem(this.key));
+    } catch (e) {
+      console.error('Failed to parse value from storage for', this.key);
+    }
+  },
+
+  __setStorageValue: function(key, value) {
+    if (typeof value === 'undefined')
+      value = null;
+    this.storage.setItem(key, JSON.stringify(value));
+  }
+});
\ No newline at end of file
diff --git a/src/util/cover-model.html b/src/util/cover-model.html
deleted file mode 100644
index 034ffc8e49..0000000000
--- a/src/util/cover-model.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<script>
-(function () {
-  window.CoverEntity = function (hass, stateObj) {
-    this.hass = hass;
-    this.stateObj = stateObj;
-  };
-
-  function addGetter(name, getter) {
-    Object.defineProperty(
-      window.CoverEntity.prototype, name,
-      { get: getter }
-    );
-  }
-
-  addGetter('isFullyOpen', function () {
-    if (this.stateObj.attributes.current_position !== undefined) {
-      return this.stateObj.attributes.current_position === 100;
-    }
-    return this.stateObj.state === 'open';
-  });
-
-  addGetter('isFullyClosed', function () {
-    if (this.stateObj.attributes.current_position !== undefined) {
-      return this.stateObj.attributes.current_position === 0;
-    }
-    return this.stateObj.state === 'closed';
-  });
-
-  addGetter('isFullyOpenTilt', function () {
-    return this.stateObj.attributes.current_tilt_position === 100;
-  });
-
-  addGetter('isFullyClosedTilt', function () {
-    return this.stateObj.attributes.current_tilt_position === 0;
-  });
-
-  /* eslint-disable no-bitwise */
-
-  addGetter('supportsOpen', function () {
-    return (this.stateObj.attributes.supported_features & 1) !== 0;
-  });
-
-  addGetter('supportsClose', function () {
-    return (this.stateObj.attributes.supported_features & 2) !== 0;
-  });
-
-  addGetter('supportsSetPosition', function () {
-    return (this.stateObj.attributes.supported_features & 4) !== 0;
-  });
-
-  addGetter('supportsStop', function () {
-    return (this.stateObj.attributes.supported_features & 8) !== 0;
-  });
-
-  addGetter('supportsOpenTilt', function () {
-    return (this.stateObj.attributes.supported_features & 16) !== 0;
-  });
-
-  addGetter('supportsCloseTilt', function () {
-    return (this.stateObj.attributes.supported_features & 32) !== 0;
-  });
-
-  addGetter('supportsStopTilt', function () {
-    return (this.stateObj.attributes.supported_features & 64) !== 0;
-  });
-
-  addGetter('supportsSetTiltPosition', function () {
-    return (this.stateObj.attributes.supported_features & 128) !== 0;
-  });
-
-  addGetter('isTiltOnly', function () {
-    var supportsCover = this.supportsOpen || this.supportsClose || this.supportsStop;
-    var supportsTilt = this.supportsOpenTilt || this.supportsCloseTilt || this.supportsStopTilt;
-    return supportsTilt && !supportsCover;
-  });
-
-  /* eslint-enable no-bitwise */
-
-  Object.assign(window.CoverEntity.prototype, {
-    openCover: function () {
-      this.callService('open_cover');
-    },
-
-    closeCover: function () {
-      this.callService('close_cover');
-    },
-
-    stopCover: function () {
-      this.callService('stop_cover');
-    },
-
-    openCoverTilt: function () {
-      this.callService('open_cover_tilt');
-    },
-
-    closeCoverTilt: function () {
-      this.callService('close_cover_tilt');
-    },
-
-    stopCoverTilt: function () {
-      this.callService('stop_cover_tilt');
-    },
-
-    setCoverPosition: function (position) {
-      this.callService('set_cover_position', { position: position });
-    },
-
-    setCoverTiltPosition: function (tiltPosition) {
-      this.callService('set_cover_tilt_position', { tilt_position: tiltPosition });
-    },
-
-    // helper method
-
-    callService: function (service, data) {
-      var serviceData = data || {};
-      serviceData.entity_id = this.stateObj.entity_id;
-      this.hass.callService('cover', service, serviceData);
-    },
-  });
-}());
-</script>
diff --git a/src/util/cover-model.js b/src/util/cover-model.js
new file mode 100644
index 0000000000..7fede5bbe6
--- /dev/null
+++ b/src/util/cover-model.js
@@ -0,0 +1,117 @@
+window.CoverEntity = function (hass, stateObj) {
+  this.hass = hass;
+  this.stateObj = stateObj;
+};
+
+function addGetter(name, getter) {
+  Object.defineProperty(
+    window.CoverEntity.prototype, name,
+    { get: getter }
+  );
+}
+
+addGetter('isFullyOpen', function () {
+  if (this.stateObj.attributes.current_position !== undefined) {
+    return this.stateObj.attributes.current_position === 100;
+  }
+  return this.stateObj.state === 'open';
+});
+
+addGetter('isFullyClosed', function () {
+  if (this.stateObj.attributes.current_position !== undefined) {
+    return this.stateObj.attributes.current_position === 0;
+  }
+  return this.stateObj.state === 'closed';
+});
+
+addGetter('isFullyOpenTilt', function () {
+  return this.stateObj.attributes.current_tilt_position === 100;
+});
+
+addGetter('isFullyClosedTilt', function () {
+  return this.stateObj.attributes.current_tilt_position === 0;
+});
+
+/* eslint-disable no-bitwise */
+
+addGetter('supportsOpen', function () {
+  return (this.stateObj.attributes.supported_features & 1) !== 0;
+});
+
+addGetter('supportsClose', function () {
+  return (this.stateObj.attributes.supported_features & 2) !== 0;
+});
+
+addGetter('supportsSetPosition', function () {
+  return (this.stateObj.attributes.supported_features & 4) !== 0;
+});
+
+addGetter('supportsStop', function () {
+  return (this.stateObj.attributes.supported_features & 8) !== 0;
+});
+
+addGetter('supportsOpenTilt', function () {
+  return (this.stateObj.attributes.supported_features & 16) !== 0;
+});
+
+addGetter('supportsCloseTilt', function () {
+  return (this.stateObj.attributes.supported_features & 32) !== 0;
+});
+
+addGetter('supportsStopTilt', function () {
+  return (this.stateObj.attributes.supported_features & 64) !== 0;
+});
+
+addGetter('supportsSetTiltPosition', function () {
+  return (this.stateObj.attributes.supported_features & 128) !== 0;
+});
+
+addGetter('isTiltOnly', function () {
+  var supportsCover = this.supportsOpen || this.supportsClose || this.supportsStop;
+  var supportsTilt = this.supportsOpenTilt || this.supportsCloseTilt || this.supportsStopTilt;
+  return supportsTilt && !supportsCover;
+});
+
+/* eslint-enable no-bitwise */
+
+Object.assign(window.CoverEntity.prototype, {
+  openCover: function () {
+    this.callService('open_cover');
+  },
+
+  closeCover: function () {
+    this.callService('close_cover');
+  },
+
+  stopCover: function () {
+    this.callService('stop_cover');
+  },
+
+  openCoverTilt: function () {
+    this.callService('open_cover_tilt');
+  },
+
+  closeCoverTilt: function () {
+    this.callService('close_cover_tilt');
+  },
+
+  stopCoverTilt: function () {
+    this.callService('stop_cover_tilt');
+  },
+
+  setCoverPosition: function (position) {
+    this.callService('set_cover_position', { position: position });
+  },
+
+  setCoverTiltPosition: function (tiltPosition) {
+    this.callService('set_cover_tilt_position', { tilt_position: tiltPosition });
+  },
+
+  // helper method
+
+  callService: function (service, data) {
+    var serviceData = data || {};
+    serviceData.entity_id = this.stateObj.entity_id;
+    this.hass.callService('cover', service, serviceData);
+  },
+});
diff --git a/src/util/ha-pref-storage.html b/src/util/ha-pref-storage.js
similarity index 87%
rename from src/util/ha-pref-storage.html
rename to src/util/ha-pref-storage.js
index b0b04dbe03..4525581dd4 100644
--- a/src/util/ha-pref-storage.html
+++ b/src/util/ha-pref-storage.js
@@ -1,6 +1,5 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<script>
 {
   const STORED_STATE = [
     'dockedSidebar',
@@ -8,7 +7,7 @@
     'selectedLanguage',
   ];
 
-  class HaPrefStorage extends Polymer.Element {
+  class HaPrefStorage extends PolymerElement {
     static get is() { return 'ha-pref-storage'; }
 
     static get properties() {
@@ -50,4 +49,3 @@
   }
   customElements.define(HaPrefStorage.is, HaPrefStorage);
 }
-</script>
diff --git a/src/util/ha-url-sync.html b/src/util/ha-url-sync.js
similarity index 89%
rename from src/util/ha-url-sync.html
rename to src/util/ha-url-sync.js
index 4aef8d2db2..99e695da6f 100644
--- a/src/util/ha-url-sync.html
+++ b/src/util/ha-url-sync.js
@@ -1,13 +1,12 @@
-<link rel="import" href="../../bower_components/polymer/polymer-element.html">
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-<link rel='import' href='../../src/util/hass-mixins.html'>
+import './hass-mixins.js';
 
-<script>
 {
   /* eslint-disable no-console */
   const DEBUG = false;
 
-  class HaUrlSync extends window.hassMixins.EventsMixin(Polymer.Element) {
+  class HaUrlSync extends window.hassMixins.EventsMixin(PolymerElement) {
     static get is() { return 'ha-url-sync'; }
 
     static get properties() {
@@ -73,4 +72,3 @@
   }
   customElements.define(HaUrlSync.is, HaUrlSync);
 }
-</script>
diff --git a/src/util/hass-attributes-util.html b/src/util/hass-attributes-util.js
similarity index 99%
rename from src/util/hass-attributes-util.html
rename to src/util/hass-attributes-util.js
index e5b27a4f4b..de3ffcd016 100644
--- a/src/util/hass-attributes-util.html
+++ b/src/util/hass-attributes-util.js
@@ -1,4 +1,3 @@
-<script>
 window.hassAttributeUtil = window.hassAttributeUtil || {};
 
 window.hassAttributeUtil.DOMAIN_DEVICE_CLASS = {
@@ -90,4 +89,3 @@ window.hassAttributeUtil.LOGIC_STATE_ATTRIBUTES =
     },
     unit_of_measurement: { type: 'string' },
   };
-  </script>
diff --git a/src/util/hass-call-api.html b/src/util/hass-call-api.js
similarity index 99%
rename from src/util/hass-call-api.html
rename to src/util/hass-call-api.js
index d4b166cc8f..f10756e4db 100644
--- a/src/util/hass-call-api.html
+++ b/src/util/hass-call-api.js
@@ -1,4 +1,3 @@
-<script>
 window.hassCallApi = function (host, auth, method, path, parameters) {
   var url = host + '/api/' + path;
 
@@ -80,4 +79,3 @@ window.hassCallApi = function (host, auth, method, path, parameters) {
     }
   });
 };
-</script>
diff --git a/src/util/hass-media-player-model.html b/src/util/hass-media-player-model.html
deleted file mode 100644
index 453dc8146a..0000000000
--- a/src/util/hass-media-player-model.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<script>
-(function () {
-  window.HassMediaPlayerEntity = function (hass, stateObj) {
-    this.hass = hass;
-    this.stateObj = stateObj;
-  };
-
-  function addGetter(name, getter) {
-    Object.defineProperty(
-      window.HassMediaPlayerEntity.prototype, name,
-      { get: getter }
-    );
-  }
-
-  addGetter('isOff', function () {
-    return this.stateObj.state === 'off';
-  });
-
-  addGetter('isIdle', function () {
-    return this.stateObj.state === 'idle';
-  });
-
-  addGetter('isMuted', function () {
-    return this.stateObj.attributes.is_volume_muted;
-  });
-
-  addGetter('isPaused', function () {
-    return this.stateObj.state === 'paused';
-  });
-
-  addGetter('isPlaying', function () {
-    return this.stateObj.state === 'playing';
-  });
-
-  addGetter('isMusic', function () {
-    return this.stateObj.attributes.media_content_type === 'music';
-  });
-
-  addGetter('isTVShow', function () {
-    return this.stateObj.attributes.media_content_type === 'tvshow';
-  });
-
-  addGetter('hasMediaControl', function () {
-    return ['playing', 'paused', 'unknown'].indexOf(this.stateObj.state) !== -1;
-  });
-
-  addGetter('volumeSliderValue', function () {
-    return this.stateObj.attributes.volume_level * 100;
-  });
-
-  addGetter('showProgress', function () {
-    return (
-      (this.isPlaying || this.isPaused) &&
-      'media_duration' in this.stateObj.attributes &&
-      'media_position' in this.stateObj.attributes &&
-      'media_position_updated_at' in this.stateObj.attributes);
-  });
-
-  addGetter('currentProgress', function () {
-    var progress = this.stateObj.attributes.media_position;
-    if (this.isPlaying) {
-      progress += (Date.now() -
-                   new Date(this.stateObj.attributes.media_position_updated_at).getTime()) / 1000.0;
-    }
-    return progress;
-  });
-
-  /* eslint-disable no-bitwise */
-
-  addGetter('supportsPause', function () {
-    return (this.stateObj.attributes.supported_features & 1) !== 0;
-  });
-
-  addGetter('supportsVolumeSet', function () {
-    return (this.stateObj.attributes.supported_features & 4) !== 0;
-  });
-
-  addGetter('supportsVolumeMute', function () {
-    return (this.stateObj.attributes.supported_features & 8) !== 0;
-  });
-
-  addGetter('supportsPreviousTrack', function () {
-    return (this.stateObj.attributes.supported_features & 16) !== 0;
-  });
-
-  addGetter('supportsNextTrack', function () {
-    return (this.stateObj.attributes.supported_features & 32) !== 0;
-  });
-
-  addGetter('supportsTurnOn', function () {
-    return (this.stateObj.attributes.supported_features & 128) !== 0;
-  });
-
-  addGetter('supportsTurnOff', function () {
-    return (this.stateObj.attributes.supported_features & 256) !== 0;
-  });
-
-  addGetter('supportsPlayMedia', function () {
-    return (this.stateObj.attributes.supported_features & 512) !== 0;
-  });
-
-  addGetter('supportsVolumeButtons', function () {
-    return (this.stateObj.attributes.supported_features & 1024) !== 0;
-  });
-
-  addGetter('supportsSelectSource', function () {
-    return (this.stateObj.attributes.supported_features & 2048) !== 0;
-  });
-
-  addGetter('supportsPlay', function () {
-    return (this.stateObj.attributes.supported_features & 16384) !== 0;
-  });
-
-  /* eslint-enable no-bitwise */
-
-  addGetter('primaryTitle', function () {
-    return this.stateObj.attributes.media_title;
-  });
-
-  addGetter('secondaryTitle', function () {
-    if (this.isMusic) {
-      return this.stateObj.attributes.media_artist;
-    } else if (this.isTVShow) {
-      var text = this.stateObj.attributes.media_series_title;
-
-      if (this.stateObj.attributes.media_season) {
-        text += ' S' + this.stateObj.attributes.media_season;
-
-        if (this.stateObj.attributes.media_episode) {
-          text += 'E' + this.stateObj.attributes.media_episode;
-        }
-      }
-
-      return text;
-    } else if (this.stateObj.attributes.app_name) {
-      return this.stateObj.attributes.app_name;
-    }
-    return '';
-  });
-
-  addGetter('source', function () {
-    return this.stateObj.attributes.source;
-  });
-
-  addGetter('sourceList', function () {
-    return this.stateObj.attributes.source_list;
-  });
-
-  Object.assign(window.HassMediaPlayerEntity.prototype, {
-    mediaPlayPause: function () {
-      this.callService('media_play_pause');
-    },
-
-    nextTrack: function () {
-      this.callService('media_next_track');
-    },
-
-    playbackControl: function () {
-      this.callService('media_play_pause');
-    },
-
-    previousTrack: function () {
-      this.callService('media_previous_track');
-    },
-
-    setVolume: function (volume) {
-      this.callService('volume_set', { volume_level: volume });
-    },
-
-    togglePower: function () {
-      if (this.isOff) {
-        this.turnOn();
-      } else {
-        this.turnOff();
-      }
-    },
-
-    turnOff: function () {
-      this.callService('turn_off');
-    },
-
-    turnOn: function () {
-      this.callService('turn_on');
-    },
-
-    volumeDown: function () {
-      this.callService('volume_down');
-    },
-
-    volumeMute: function (mute) {
-      if (!this.supportsVolumeMute) {
-        throw new Error('Muting volume not supported');
-      }
-      this.callService('volume_mute', { is_volume_muted: mute });
-    },
-
-    volumeUp: function () {
-      this.callService('volume_up');
-    },
-
-    selectSource: function (sourceInput) {
-      this.callService('select_source', { source: sourceInput });
-    },
-
-    // helper method
-
-    callService: function (service, data) {
-      var serviceData = data || {};
-      serviceData.entity_id = this.stateObj.entity_id;
-      this.hass.callService('media_player', service, serviceData);
-    },
-  });
-}());
-</script>
diff --git a/src/util/hass-media-player-model.js b/src/util/hass-media-player-model.js
new file mode 100644
index 0000000000..e7a353e8e6
--- /dev/null
+++ b/src/util/hass-media-player-model.js
@@ -0,0 +1,210 @@
+window.HassMediaPlayerEntity = function (hass, stateObj) {
+  this.hass = hass;
+  this.stateObj = stateObj;
+};
+
+function addGetter(name, getter) {
+  Object.defineProperty(
+    window.HassMediaPlayerEntity.prototype, name,
+    { get: getter }
+  );
+}
+
+addGetter('isOff', function () {
+  return this.stateObj.state === 'off';
+});
+
+addGetter('isIdle', function () {
+  return this.stateObj.state === 'idle';
+});
+
+addGetter('isMuted', function () {
+  return this.stateObj.attributes.is_volume_muted;
+});
+
+addGetter('isPaused', function () {
+  return this.stateObj.state === 'paused';
+});
+
+addGetter('isPlaying', function () {
+  return this.stateObj.state === 'playing';
+});
+
+addGetter('isMusic', function () {
+  return this.stateObj.attributes.media_content_type === 'music';
+});
+
+addGetter('isTVShow', function () {
+  return this.stateObj.attributes.media_content_type === 'tvshow';
+});
+
+addGetter('hasMediaControl', function () {
+  return ['playing', 'paused', 'unknown'].indexOf(this.stateObj.state) !== -1;
+});
+
+addGetter('volumeSliderValue', function () {
+  return this.stateObj.attributes.volume_level * 100;
+});
+
+addGetter('showProgress', function () {
+  return (
+    (this.isPlaying || this.isPaused) &&
+    'media_duration' in this.stateObj.attributes &&
+    'media_position' in this.stateObj.attributes &&
+    'media_position_updated_at' in this.stateObj.attributes);
+});
+
+addGetter('currentProgress', function () {
+  var progress = this.stateObj.attributes.media_position;
+  if (this.isPlaying) {
+    progress += (Date.now() -
+                 new Date(this.stateObj.attributes.media_position_updated_at).getTime()) / 1000.0;
+  }
+  return progress;
+});
+
+/* eslint-disable no-bitwise */
+
+addGetter('supportsPause', function () {
+  return (this.stateObj.attributes.supported_features & 1) !== 0;
+});
+
+addGetter('supportsVolumeSet', function () {
+  return (this.stateObj.attributes.supported_features & 4) !== 0;
+});
+
+addGetter('supportsVolumeMute', function () {
+  return (this.stateObj.attributes.supported_features & 8) !== 0;
+});
+
+addGetter('supportsPreviousTrack', function () {
+  return (this.stateObj.attributes.supported_features & 16) !== 0;
+});
+
+addGetter('supportsNextTrack', function () {
+  return (this.stateObj.attributes.supported_features & 32) !== 0;
+});
+
+addGetter('supportsTurnOn', function () {
+  return (this.stateObj.attributes.supported_features & 128) !== 0;
+});
+
+addGetter('supportsTurnOff', function () {
+  return (this.stateObj.attributes.supported_features & 256) !== 0;
+});
+
+addGetter('supportsPlayMedia', function () {
+  return (this.stateObj.attributes.supported_features & 512) !== 0;
+});
+
+addGetter('supportsVolumeButtons', function () {
+  return (this.stateObj.attributes.supported_features & 1024) !== 0;
+});
+
+addGetter('supportsSelectSource', function () {
+  return (this.stateObj.attributes.supported_features & 2048) !== 0;
+});
+
+addGetter('supportsPlay', function () {
+  return (this.stateObj.attributes.supported_features & 16384) !== 0;
+});
+
+/* eslint-enable no-bitwise */
+
+addGetter('primaryTitle', function () {
+  return this.stateObj.attributes.media_title;
+});
+
+addGetter('secondaryTitle', function () {
+  if (this.isMusic) {
+    return this.stateObj.attributes.media_artist;
+  } else if (this.isTVShow) {
+    var text = this.stateObj.attributes.media_series_title;
+
+    if (this.stateObj.attributes.media_season) {
+      text += ' S' + this.stateObj.attributes.media_season;
+
+      if (this.stateObj.attributes.media_episode) {
+        text += 'E' + this.stateObj.attributes.media_episode;
+      }
+    }
+
+    return text;
+  } else if (this.stateObj.attributes.app_name) {
+    return this.stateObj.attributes.app_name;
+  }
+  return '';
+});
+
+addGetter('source', function () {
+  return this.stateObj.attributes.source;
+});
+
+addGetter('sourceList', function () {
+  return this.stateObj.attributes.source_list;
+});
+
+Object.assign(window.HassMediaPlayerEntity.prototype, {
+  mediaPlayPause: function () {
+    this.callService('media_play_pause');
+  },
+
+  nextTrack: function () {
+    this.callService('media_next_track');
+  },
+
+  playbackControl: function () {
+    this.callService('media_play_pause');
+  },
+
+  previousTrack: function () {
+    this.callService('media_previous_track');
+  },
+
+  setVolume: function (volume) {
+    this.callService('volume_set', { volume_level: volume });
+  },
+
+  togglePower: function () {
+    if (this.isOff) {
+      this.turnOn();
+    } else {
+      this.turnOff();
+    }
+  },
+
+  turnOff: function () {
+    this.callService('turn_off');
+  },
+
+  turnOn: function () {
+    this.callService('turn_on');
+  },
+
+  volumeDown: function () {
+    this.callService('volume_down');
+  },
+
+  volumeMute: function (mute) {
+    if (!this.supportsVolumeMute) {
+      throw new Error('Muting volume not supported');
+    }
+    this.callService('volume_mute', { is_volume_muted: mute });
+  },
+
+  volumeUp: function () {
+    this.callService('volume_up');
+  },
+
+  selectSource: function (sourceInput) {
+    this.callService('select_source', { source: sourceInput });
+  },
+
+  // helper method
+
+  callService: function (service, data) {
+    var serviceData = data || {};
+    serviceData.entity_id = this.stateObj.entity_id;
+    this.hass.callService('media_player', service, serviceData);
+  },
+});
diff --git a/src/util/hass-mixins.html b/src/util/hass-mixins.js
similarity index 81%
rename from src/util/hass-mixins.html
rename to src/util/hass-mixins.js
index 925bfdd959..86012c65cb 100644
--- a/src/util/hass-mixins.html
+++ b/src/util/hass-mixins.js
@@ -1,7 +1,9 @@
-<link rel='import' href='../../bower_components/app-localize-behavior/app-localize-behavior.html'>
-<link rel="import" href='../../bower_components/paper-dialog-behavior/paper-dialog-behavior.html'>
+import { PaperDialogBehavior } from '@polymer/paper-dialog-behavior/paper-dialog-behavior.js';
+import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
+import { dedupingMixin } from '@polymer/polymer/lib/utils/mixin.js';
+import '@polymer/polymer/lib/mixins/element-mixin.js';
+import { AppLocalizeBehavior } from './app-localize-behavior.js';
 
-<script>
 
 // Polymer legacy event helpers used courtesy of the Polymer project.
 //
@@ -36,7 +38,7 @@
 window.hassMixins = window.hassMixins || {};
 
 /* @polymerMixin */
-window.hassMixins.EventsMixin = Polymer.dedupingMixin(superClass => class extends superClass {
+window.hassMixins.EventsMixin = dedupingMixin(superClass => class extends superClass {
   /**
      * Dispatches a custom event with an optional detail value.
      *
@@ -68,7 +70,7 @@ window.hassMixins.EventsMixin = Polymer.dedupingMixin(superClass => class extend
 });
 
 /* @polymerMixin */
-window.hassMixins.NavigateMixin = Polymer.dedupingMixin(superClass =>
+window.hassMixins.NavigateMixin = dedupingMixin(superClass =>
   class extends window.hassMixins.EventsMixin(superClass) {
     navigate(path, replace = false) {
       if (replace) {
@@ -82,10 +84,10 @@ window.hassMixins.NavigateMixin = Polymer.dedupingMixin(superClass =>
 
 /**
  * @polymerMixin
- * @appliesMixin Polymer.AppLocalizeBehavior
+ * @appliesMixin AppLocalizeBehavior
  */
-window.hassMixins.LocalizeMixin = Polymer.dedupingMixin(superClass =>
-  class extends Polymer.mixinBehaviors([Polymer.AppLocalizeBehavior], superClass) {
+window.hassMixins.LocalizeMixin = dedupingMixin(superClass =>
+  class extends mixinBehaviors([AppLocalizeBehavior], superClass) {
     static get properties() {
       return {
         hass: Object,
@@ -112,11 +114,11 @@ window.hassMixins.LocalizeMixin = Polymer.dedupingMixin(superClass =>
 /**
  * @polymerMixin
  * @appliesMixin window.hassMixins.EventsMixin
- * @appliesMixin Polymer.PaperDialogBehavior
+ * @appliesMixin PaperDialogBehavior
  */
-window.hassMixins.DialogMixin = Polymer.dedupingMixin(superClass =>
-  class extends Polymer.mixinBehaviors([window.hassMixins.EventsMixin,
-    Polymer.PaperDialogBehavior], superClass) {
+window.hassMixins.DialogMixin = dedupingMixin(superClass =>
+  class extends mixinBehaviors([window.hassMixins.EventsMixin,
+    PaperDialogBehavior], superClass) {
     static get properties() {
       return {
         withBackdrop: {
@@ -126,4 +128,3 @@ window.hassMixins.DialogMixin = Polymer.dedupingMixin(superClass =>
       };
     }
   });
-</script>
diff --git a/src/util/hass-translation.html b/src/util/hass-translation.js
similarity index 92%
rename from src/util/hass-translation.html
rename to src/util/hass-translation.js
index d23377fbd7..e95ce5d675 100644
--- a/src/util/hass-translation.html
+++ b/src/util/hass-translation.js
@@ -1,12 +1,11 @@
-<link rel='import' href='../../build-translations/translationMetadata.html' />
+import translationMetadata from '../../build-translations/translationMetadata.json';
 
-<script>
 window.getActiveTranslation = function () {
   // Perform case-insenstive comparison since browser isn't required to
   // report languages with specific cases.
   const lookup = {};
   /* eslint-disable no-undef */
-  Object.keys(window.translationMetadata.translations).forEach((tr) => {
+  Object.keys(translationMetadata.translations).forEach((tr) => {
     lookup[tr.toLowerCase()] = tr;
   });
 
@@ -67,7 +66,7 @@ const translations = {};
 
 window.getTranslation = function (fragment, translationInput) {
   const translation = translationInput || getActiveTranslation();
-  const metadata = window.translationMetadata.translations[translation];
+  const metadata = translationMetadata.translations[translation];
   if (!metadata) {
     if (translationInput !== 'en') {
       return window.getTranslation(fragment, 'en');
@@ -101,4 +100,3 @@ window.getTranslation = function (fragment, translationInput) {
 // Load selected translation into memory immediately so it is ready when Polymer
 // initializes.
 window.getTranslation();
-</script>
diff --git a/src/util/hass-util.html b/src/util/hass-util.html
deleted file mode 100644
index 55aa092345..0000000000
--- a/src/util/hass-util.html
+++ /dev/null
@@ -1 +0,0 @@
-<script src='../../build-temp/util.js'></script>
diff --git a/src/util/hass-util.js b/src/util/hass-util.js
new file mode 100644
index 0000000000..370690a0ec
--- /dev/null
+++ b/src/util/hass-util.js
@@ -0,0 +1,2 @@
+import '../../js/util.js';
+
diff --git a/src/util/legacy-support.js b/src/util/legacy-support.js
new file mode 100644
index 0000000000..79b1ec7399
--- /dev/null
+++ b/src/util/legacy-support.js
@@ -0,0 +1,9 @@
+/**
+ * Provide legacy support to HTML imports by exposing Polymer and
+ * Polymer.Element on the window object.
+ */
+import { PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { Polymer } from '@polymer/polymer/polymer-legacy.js';
+
+Polymer.Element = PolymerElement;
+window.Polymer = Polymer;
diff --git a/src/util/roboto.html b/src/util/roboto.js
similarity index 90%
rename from src/util/roboto.html
rename to src/util/roboto.js
index 6081a3a1c5..9b1df35187 100644
--- a/src/util/roboto.html
+++ b/src/util/roboto.js
@@ -1,13 +1,7 @@
-<!--
-@license
-Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<style>
+const documentContainer = document.createElement('template');
+documentContainer.setAttribute('style', 'display: none;');
+
+documentContainer.innerHTML = `<style>
 @font-face {
 font-family: "Roboto";
 src: url(/static/fonts/roboto/Roboto-Thin.ttf) format("truetype");
@@ -140,4 +134,22 @@ src: url(/static/fonts/robotomono/RobotoMono-BoldItalic.ttf) format("truetype");
 font-weight: 700;
 font-style: italic;
 }
-</style>
+</style>`;
+
+document.head.appendChild(documentContainer.content);
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+/*
+  FIXME(polymer-modulizer): the above comments were extracted
+  from HTML and may be out of place here. Review them and
+  then delete this comment!
+*/
+
diff --git a/test/index.html b/test/index.html
index 54b30776b6..a19e0443d1 100644
--- a/test/index.html
+++ b/test/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
   <title>Tests</title>
-  <script src="../../web-component-tester/browser.js"></script>
+  <script src="../node_modules/wct-browser-legacy/browser.js"></script>
 </head>
 <body>
   <script>
diff --git a/test/state-card-display-test.html b/test/state-card-display-test.html
index 8b7099905b..353c654f9b 100644
--- a/test/state-card-display-test.html
+++ b/test/state-card-display-test.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html>
 <head>
-  <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
-  <script src="../../web-component-tester/browser.js"></script>
+  <script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
+  <script src="../node_modules/wct-browser-legacy/browser.js"></script>
 
   <!--
     Temporarily load core.js here so window.HAWS is available. We can remove
     this once hass-util includes the helper function directly.
   -->
   <script src="../build/core.js"></script>
-  <link rel="import" href="../src/state-summary/state-card-display.html">
+  <script type="module" src="../src/state-summary/state-card-display.js"></script>
 </head>
 <body>
   <test-fixture id="stateCardDisplay">
@@ -18,47 +18,48 @@
     </template>
   </test-fixture>
 
-  <script>
-    function lightOrShadow(elem, selector) {
-      return elem.shadowRoot ?
-          elem.shadowRoot.querySelector(selector) :
-          elem.querySelector(selector);
-    }
+  <script type="module">
+import '../src/state-summary/state-card-display.js';
+function lightOrShadow(elem, selector) {
+  return elem.shadowRoot ?
+      elem.shadowRoot.querySelector(selector) :
+      elem.querySelector(selector);
+}
 
-    suite('state-card-display', function() {
-      let wrapper;
-      let card;
+suite('state-card-display', function() {
+  let wrapper;
+  let card;
 
-      setup(function() {
-        wrapper = fixture('stateCardDisplay');
-        card = new StateCardDisplay();
-        card.stateObj = {
-          entity_id: 'binary_sensor.demo',
-          state: 'off',
-          attributes: {
-            device_class: 'moisture',
-          },
-        };
-        card.hass = {
-          language: 'en',
-          resources: {
-            'en': {
-              'state.binary_sensor.moisture.off': 'Mock Off Text',
-            },
-          },
-        };
-        wrapper.appendChild(card);
-      });
+  setup(function() {
+    wrapper = fixture('stateCardDisplay');
+    card = document.createElement('state-card-display');
+    card.stateObj = {
+      entity_id: 'binary_sensor.demo',
+      state: 'off',
+      attributes: {
+        device_class: 'moisture',
+      },
+    };
+    card.hass = {
+      language: 'en',
+      resources: {
+        'en': {
+          'state.binary_sensor.moisture.off': 'Mock Off Text',
+        },
+      },
+    };
+    wrapper.appendChild(card);
+  });
 
-      test('state display text', function(done) {
-        flush(function() {
-          const stateDiv = lightOrShadow(card, '.state');
-          assert.isOk(stateDiv);
-          assert.deepEqual(stateDiv.innerText, 'Mock Off Text');
-          done();
-        });
-      });
+  test('state display text', function(done) {
+    flush(function() {
+      const stateDiv = lightOrShadow(card, '.state');
+      assert.isOk(stateDiv);
+      assert.deepEqual(stateDiv.innerText, 'Mock Off Text');
+      done();
     });
-  </script>
+  });
+});
+</script>
 </body>
 </html>
diff --git a/test/state-info-test.html b/test/state-info-test.html
index 7316a5606f..979af79337 100644
--- a/test/state-info-test.html
+++ b/test/state-info-test.html
@@ -1,9 +1,9 @@
 <!doctype html>
 <html>
 <head>
-  <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
-  <script src="../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../src/components/entity/state-info.html">
+  <script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
+  <script src="../node_modules/wct-browser-legacy/browser.js"></script>
+  <script type="module" src="../src/components/entity/state-info.js"></script>
 </head>
 <body>
   <test-fixture id="stateInfoSecondaryLine">
@@ -17,83 +17,84 @@
     </template>
   </test-fixture>
 
-  <script>
-    function lightOrShadow(elem, selector) {
-      return elem.shadowRoot ?
-          elem.shadowRoot.querySelector(selector) :
-          elem.querySelector(selector);
-    }
+  <script type="module">
+import '../src/components/entity/state-info.js';
+function lightOrShadow(elem, selector) {
+  return elem.shadowRoot ?
+      elem.shadowRoot.querySelector(selector) :
+      elem.querySelector(selector);
+}
 
-    suite('state-info', function() {
-      var si;
+suite('state-info', function() {
+  var si;
 
-      setup(function() {
-        si = fixture('stateInfo');
-      });
-      
-      test('default values', function() {
-        assert.isUndefined(si.stateObj);
-        assert.isUndefined(si.inDialog);
-      });
+  setup(function() {
+    si = fixture('stateInfo');
+  });
 
-      test('has state-badge', function() {
-        assert.isOk(lightOrShadow(si, 'state-badge'));
-      });
+  test('default values', function() {
+    assert.isUndefined(si.stateObj);
+    assert.isUndefined(si.inDialog);
+  });
 
-      test('stateObj', function(done) {
-        si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}};
-        flush(function() {
-          var stateBadge = lightOrShadow(si, 'state-badge');
-          assert.isOk(stateBadge);
-          assert.deepEqual(stateBadge.stateObj, si.stateObj);
+  test('has state-badge', function() {
+    assert.isOk(lightOrShadow(si, 'state-badge'));
+  });
 
-          var name = lightOrShadow(si, '.name');
-          assert.isOk(name, '.name missing');
-          assert.equal(name.textContent, 'Name');
-          assert.equal(getComputedStyle(name).lineHeight, '40px');
+  test('stateObj', function(done) {
+    si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}};
+    flush(function() {
+      var stateBadge = lightOrShadow(si, 'state-badge');
+      assert.isOk(stateBadge);
+      assert.deepEqual(stateBadge.stateObj, si.stateObj);
 
-          assert.isNotOk(lightOrShadow(si, 'ha-relative-time'));
-          done();
-        });
-      });
+      var name = lightOrShadow(si, '.name');
+      assert.isOk(name, '.name missing');
+      assert.equal(name.textContent, 'Name');
+      assert.equal(getComputedStyle(name).lineHeight, '40px');
 
-      test('relative time', function(done) {
-        si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}};
-        si.inDialog = true;
-        flush(function() {
-          var relativeTime = lightOrShadow(si, 'ha-relative-time');
-          var name = lightOrShadow(si, '.name');
+      assert.isNotOk(lightOrShadow(si, 'ha-relative-time'));
+      done();
+    });
+  });
 
-          assert.isOk(relativeTime);
-          assert.notEqual(relativeTime.textContent, 'never');
-          assert.notEqual(relativeTime.textContent, '');
+  test('relative time', function(done) {
+    si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}};
+    si.inDialog = true;
+    flush(function() {
+      var relativeTime = lightOrShadow(si, 'ha-relative-time');
+      var name = lightOrShadow(si, '.name');
 
-          assert.isOk(name);
-          assert.equal(getComputedStyle(name).lineHeight, '20px');
+      assert.isOk(relativeTime);
+      assert.notEqual(relativeTime.textContent, 'never');
+      assert.notEqual(relativeTime.textContent, '');
 
-          si.stateObj = {entity_id: 'light.demo', state: 'off', attributes: {friendly_name: 'Name'}};
-          flush(function() {
-            assert.equal(relativeTime.textContent, 'never');
-            done();
-          });
-        });
-      });
+      assert.isOk(name);
+      assert.equal(getComputedStyle(name).lineHeight, '20px');
 
-      test('secondary line', function(done) {
-        si = fixture('stateInfoSecondaryLine');
-        si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}};
-        si.inDialog = false;
-        flush(function() {
-          var name = lightOrShadow(si, '.name');
-          assert.isOk(name);
-          assert.equal(getComputedStyle(name).lineHeight, '20px');
-          var content = si.getElementsByTagName('my-elem')[0];
-          assert.isOk(content);
-          assert.equal(content.textContent, 'text');
-          done();
-        });
+      si.stateObj = {entity_id: 'light.demo', state: 'off', attributes: {friendly_name: 'Name'}};
+      flush(function() {
+        assert.equal(relativeTime.textContent, 'never');
+        done();
       });
     });
-  </script>
+  });
+
+  test('secondary line', function(done) {
+    si = fixture('stateInfoSecondaryLine');
+    si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}};
+    si.inDialog = false;
+    flush(function() {
+      var name = lightOrShadow(si, '.name');
+      assert.isOk(name);
+      assert.equal(getComputedStyle(name).lineHeight, '20px');
+      var content = si.getElementsByTagName('my-elem')[0];
+      assert.isOk(content);
+      assert.equal(content.textContent, 'text');
+      done();
+    });
+  });
+});
+</script>
 </body>
 </html>
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 0000000000..f59db96f99
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1,60 @@
+const path = require('path');
+
+function createConfig(isProdBuild, latestBuild) {
+  let buildPath = latestBuild ? 'build/webpack/' : 'build-es5/webpack/';
+
+  let publicPath;
+  if (isProdBuild) {
+    publicPath = latestBuild ? '/frontend_latest/' : '/frontend_es5/';
+  } else {
+    publicPath = `/home-assistant-polymer/${buildPath}`;
+  }
+
+  const rules = [];
+  if (!latestBuild) {
+    rules.push({
+      test: /\.js$/,
+      use: {
+        loader: 'babel-loader',
+        options: {
+          presets: [
+            ['es2015', { modules: false }]
+          ],
+          plugins: [
+            // Only support the syntax, Webpack will handle it.
+            "syntax-dynamic-import"
+          ],
+        }
+      }
+    });
+  }
+
+  const chunkFilename = isProdBuild ?
+    '[name]-[chunkhash].chunk.js' : '[name].chunk.js';
+
+  return {
+    mode: isProdBuild ? 'production' : 'development',
+    entry: {
+      app: './src/home-assistant.js',
+      authorize: './src/auth/ha-authorize.js'
+    },
+    module: {
+      rules
+    },
+    output: {
+      filename: '[name].js',
+      chunkFilename: chunkFilename,
+      path: path.resolve(__dirname, buildPath),
+      publicPath,
+    }
+  }
+}
+
+const isProdBuild = process.env.NODE_ENV === 'production'
+const configs = [
+  createConfig(isProdBuild, /* latestBuild */ true),
+];
+if (isProdBuild) {
+  configs.push(createConfig(isProdBuild, /* latestBuild */ false));
+}
+module.exports = configs;
diff --git a/yarn.lock b/yarn.lock
index 319e318037..75ae6b97a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,1083 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.35.tgz#04eeb6dca7efef8f65776a4c214157303b85ad51"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/code-frame@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.44"
+
+"@babel/code-frame@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz#e0d002100805daab1461c0fcb32a07e304f3a4f4"
+  dependencies:
+    "@babel/highlight" "7.0.0-beta.46"
+
+"@babel/core@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.46.tgz#dbe2189bcdef9a2c84becb1ec624878d31a95689"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.46"
+    "@babel/generator" "7.0.0-beta.46"
+    "@babel/helpers" "7.0.0-beta.46"
+    "@babel/template" "7.0.0-beta.46"
+    "@babel/traverse" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+    babylon "7.0.0-beta.46"
+    convert-source-map "^1.1.0"
+    debug "^3.1.0"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    micromatch "^2.3.11"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/generator@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/generator@7.0.0-beta.46", "@babel/generator@^7.0.0-beta.42":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.46.tgz#6f57159bcc28bf8c3ed6b549789355cebfa3faa7"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+    jsesc "^2.5.1"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-annotate-as-pure@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.35.tgz#d391e76ccb1a6b417007a2b774c688539e115fdb"
+  dependencies:
+    "@babel/types" "7.0.0-beta.35"
+
+"@babel/helper-annotate-as-pure@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0-beta.46.tgz#4cd76d5c93409ea01d31be66395a3b98a372792e"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0-beta.46.tgz#b6c8de48693b66bf90239e99856be4c2257e43ba"
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-call-delegate@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0-beta.46.tgz#a9e8b46cece47726308f015ce979293ef3d36ab7"
+  dependencies:
+    "@babel/helper-hoist-variables" "7.0.0-beta.46"
+    "@babel/traverse" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-define-map@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.0.0-beta.35.tgz#38dea093c57565dc50ac96ead46e355e12985ced"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-beta.35"
+    "@babel/types" "7.0.0-beta.35"
+    lodash "^4.2.0"
+
+"@babel/helper-explode-assignable-expression@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0-beta.46.tgz#6a34a7533761b97ce4f7bf6fc586dcfb204ffa11"
+  dependencies:
+    "@babel/traverse" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-function-name@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.35.tgz#b2fc51a59fe95fcc56ee5e9db21c500606ea2fab"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.35"
+    "@babel/template" "7.0.0-beta.35"
+    "@babel/types" "7.0.0-beta.35"
+
+"@babel/helper-function-name@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-function-name@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.46.tgz#d0c4eed2e220e180f91b02e008dcc4594afe1d39"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.46"
+    "@babel/template" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-get-function-arity@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.35.tgz#7f3c86d6646527a03423d42cf0fd06a26718d7cb"
+  dependencies:
+    "@babel/types" "7.0.0-beta.35"
+
+"@babel/helper-get-function-arity@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-get-function-arity@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.46.tgz#7161bfe449b4183dbe25d1fe5579338b7429e5f2"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-hoist-variables@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0-beta.46.tgz#2d656215bea3f044ff1ee391fc51d55fce46ddf5"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-member-expression-to-functions@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0-beta.46.tgz#736344c1d68fb2c4b75cbe62370eb610c0578427"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-module-imports@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.46.tgz#8bd2e1fcfae883d28149a350e31ce606aa24eda6"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+    lodash "^4.2.0"
+
+"@babel/helper-module-transforms@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0-beta.46.tgz#90ad981f3a0020d9a8e526296555a5dd7e87cf5e"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-beta.46"
+    "@babel/helper-simple-access" "7.0.0-beta.46"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.46"
+    "@babel/template" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+    lodash "^4.2.0"
+
+"@babel/helper-optimise-call-expression@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.35.tgz#3adc8c5347b4a8d4ef8b117d99535f6fa3b61a71"
+  dependencies:
+    "@babel/types" "7.0.0-beta.35"
+
+"@babel/helper-optimise-call-expression@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0-beta.46.tgz#50f060b4e4af01c73b40986fa593ae7958422e89"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-plugin-utils@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.46.tgz#f630adbd9d645d0ba2e43f4955b4ad61f44ccdf4"
+
+"@babel/helper-regex@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.46.tgz#df3675cec700e062d823225c52830e012f32308f"
+  dependencies:
+    lodash "^4.2.0"
+
+"@babel/helper-remap-async-to-generator@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0-beta.46.tgz#275d455dbced4c807543f001302a40303a3f0914"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-beta.46"
+    "@babel/helper-wrap-function" "7.0.0-beta.46"
+    "@babel/template" "7.0.0-beta.46"
+    "@babel/traverse" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-replace-supers@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.35.tgz#fb59070aba45002d09898c8dfb8f8ac05bde4d19"
+  dependencies:
+    "@babel/helper-optimise-call-expression" "7.0.0-beta.35"
+    "@babel/template" "7.0.0-beta.35"
+    "@babel/traverse" "7.0.0-beta.35"
+    "@babel/types" "7.0.0-beta.35"
+
+"@babel/helper-replace-supers@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0-beta.46.tgz#921c0f25d875026a8fb12feda1b72323595ea156"
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "7.0.0-beta.46"
+    "@babel/helper-optimise-call-expression" "7.0.0-beta.46"
+    "@babel/traverse" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-simple-access@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.0.0-beta.46.tgz#8eb0edf978c85915d11b6a7aa8591434e158170d"
+  dependencies:
+    "@babel/template" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+    lodash "^4.2.0"
+
+"@babel/helper-split-export-declaration@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
+  dependencies:
+    "@babel/types" "7.0.0-beta.44"
+
+"@babel/helper-split-export-declaration@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.46.tgz#6903893c72bb2a3d54ed20b5ff2aa8a28e8d2ea1"
+  dependencies:
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helper-wrap-function@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0-beta.46.tgz#d0fb836516d8a38ab80df1b434e4b76015be9035"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-beta.46"
+    "@babel/template" "7.0.0-beta.46"
+    "@babel/traverse" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/helpers@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.46.tgz#b5f988dfd77f4f713792cf7818b687050736ee52"
+  dependencies:
+    "@babel/template" "7.0.0-beta.46"
+    "@babel/traverse" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+
+"@babel/highlight@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/highlight@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/plugin-external-helpers@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0-beta.46.tgz#293c1ed7a5257eb50dfc93e468f1129a7802a3cf"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-proposal-async-generator-functions@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0-beta.46.tgz#395330d1d5d7fb76c33b7bd99750adeafc37c68c"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-remap-async-to-generator" "7.0.0-beta.46"
+    "@babel/plugin-syntax-async-generators" "7.0.0-beta.46"
+
+"@babel/plugin-proposal-object-rest-spread@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0-beta.46.tgz#fb3979488a52c1246cdced4a438ace0f47ac985b"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/plugin-syntax-object-rest-spread" "7.0.0-beta.46"
+
+"@babel/plugin-syntax-async-generators@7.0.0-beta.46", "@babel/plugin-syntax-async-generators@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0-beta.46.tgz#b35149e02748922d8e39506b0ac001a27bf449ed"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-syntax-dynamic-import@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.0.0-beta.46.tgz#651459c419d5ec0609a518370a417b8b47c52583"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-syntax-import-meta@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.0.0-beta.46.tgz#b86f3ceb94b1744555b3c9271be51ca31b1aedf3"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-syntax-object-rest-spread@7.0.0-beta.46", "@babel/plugin-syntax-object-rest-spread@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0-beta.46.tgz#03d46637f549757b2d6877b6449901698059d7d8"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-arrow-functions@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0-beta.46.tgz#130e79b1d4508767c47e5febb809f8dca80c05f5"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-async-to-generator@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0-beta.46.tgz#29fd5967f5056ca80f3a97db4d2ffa38a0dc2dce"
+  dependencies:
+    "@babel/helper-module-imports" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-remap-async-to-generator" "7.0.0-beta.46"
+
+"@babel/plugin-transform-block-scoped-functions@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0-beta.46.tgz#0925a549931f61b45880618b0b42da4790b7c0b3"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-block-scoping@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0-beta.46.tgz#da42dd17fbed675c72233988dbad9ace5ab9e4a7"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    lodash "^4.2.0"
+
+"@babel/plugin-transform-classes@=7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0-beta.35.tgz#ae1367d9c41081528f87d5770f6b8c6ee7141b52"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-beta.35"
+    "@babel/helper-define-map" "7.0.0-beta.35"
+    "@babel/helper-function-name" "7.0.0-beta.35"
+    "@babel/helper-optimise-call-expression" "7.0.0-beta.35"
+    "@babel/helper-replace-supers" "7.0.0-beta.35"
+
+"@babel/plugin-transform-computed-properties@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0-beta.46.tgz#ca1ece27615f7324345713fb6a93dd288788e891"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-destructuring@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0-beta.46.tgz#6e6a097da31063f545f7818afe48ef09165ce5ff"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-duplicate-keys@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0-beta.46.tgz#7e94e42099b099742617838237b0d6e1a9b2690f"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-exponentiation-operator@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0-beta.46.tgz#95ae2e03456e417d2f5eace6d05a8fccb7af1bcc"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-for-of@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0-beta.46.tgz#ce643487384c96d1bd1f57a112b2ccba6c34da5c"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-function-name@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0-beta.46.tgz#2479f5188de9ab1f99396bce83b3b9d39bc13bdb"
+  dependencies:
+    "@babel/helper-function-name" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-instanceof@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-instanceof/-/plugin-transform-instanceof-7.0.0-beta.46.tgz#4d320f4c57d3acf8390ffb8110ee0d3642cefc3f"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-literals@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0-beta.46.tgz#84f5bcfe914b9fd4385c0ddf469f9ed403ee68bd"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-modules-amd@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0-beta.46.tgz#01aeb4887c7df7059cefe4a206eefdf190c79f48"
+  dependencies:
+    "@babel/helper-module-transforms" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-object-super@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0-beta.46.tgz#b5376fe93f5e154b765468f1a58a717717f95827"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-replace-supers" "7.0.0-beta.46"
+
+"@babel/plugin-transform-parameters@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0-beta.46.tgz#33bbd2e3bd499d99016034dcaf8c6b72c2a69ec3"
+  dependencies:
+    "@babel/helper-call-delegate" "7.0.0-beta.46"
+    "@babel/helper-get-function-arity" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-regenerator@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0-beta.46.tgz#875ceb5b37ec0e898c23b60af760715d9d462b4f"
+  dependencies:
+    regenerator-transform "^0.12.3"
+
+"@babel/plugin-transform-shorthand-properties@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0-beta.46.tgz#aa21512b0fef7b916fc5cbc87df717465c25515c"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-spread@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0-beta.46.tgz#48eabb219f1e0c16e9b0a6166072ae9d4c7cd397"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-sticky-regex@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0-beta.46.tgz#c96c41f31272ec1cdc47dd91a22c6d75c4db70d2"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-regex" "7.0.0-beta.46"
+
+"@babel/plugin-transform-template-literals@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0-beta.46.tgz#e8bcc798dece29807893e8ee27ccf3176f658c62"
+  dependencies:
+    "@babel/helper-annotate-as-pure" "7.0.0-beta.46"
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-typeof-symbol@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0-beta.46.tgz#643529184cbb07199237c94537c89ea9a721fa0a"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+
+"@babel/plugin-transform-unicode-regex@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0-beta.46.tgz#10e6edcc8eb0db71ff2f0e3fc87ed88337d24fb9"
+  dependencies:
+    "@babel/helper-plugin-utils" "7.0.0-beta.46"
+    "@babel/helper-regex" "7.0.0-beta.46"
+    regexpu-core "^4.1.3"
+
+"@babel/template@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.35.tgz#459230417f51c29401cf71162aeeff6cef2bcca7"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.35"
+    "@babel/types" "7.0.0-beta.35"
+    babylon "7.0.0-beta.35"
+    lodash "^4.2.0"
+
+"@babel/template@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    lodash "^4.2.0"
+
+"@babel/template@7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.46.tgz#8b23982411d5b5dbfa479437bfe414adb1411bb9"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+    babylon "7.0.0-beta.46"
+    lodash "^4.2.0"
+
+"@babel/traverse@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.35.tgz#c91819807b7ac256d2f6dd5aaa94d4c66e06bbc5"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.35"
+    "@babel/helper-function-name" "7.0.0-beta.35"
+    "@babel/types" "7.0.0-beta.35"
+    babylon "7.0.0-beta.35"
+    debug "^3.0.1"
+    globals "^10.0.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/traverse@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helper-function-name" "7.0.0-beta.44"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/traverse@7.0.0-beta.46", "@babel/traverse@^7.0.0-beta.42", "@babel/traverse@^7.0.0-beta.46":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.46.tgz#29a0c0395b3642f0297e6f8e475bde89f9343755"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.46"
+    "@babel/generator" "7.0.0-beta.46"
+    "@babel/helper-function-name" "7.0.0-beta.46"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.46"
+    "@babel/types" "7.0.0-beta.46"
+    babylon "7.0.0-beta.46"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.35":
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.35.tgz#cf933a9a9a38484ca724b335b88d83726d5ab960"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@7.0.0-beta.46", "@babel/types@^7.0.0-beta.42":
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.46.tgz#eb84399a699af9fcb244440cce78e1acbeb40e0c"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@polymer/app-layout@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/app-layout/-/app-layout-3.0.0-pre.19.tgz#76b0ace980fa3033ffa4810b931a58d29fc48b33"
+  dependencies:
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-media-query" "^3.0.0-pre.19"
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-scroll-target-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/app-localize-behavior@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/app-localize-behavior/-/app-localize-behavior-3.0.0-pre.19.tgz#da9736770f5f6461b5ce0ae1aa6909c1c30cd4fc"
+  dependencies:
+    "@polymer/iron-ajax" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+    intl-messageformat "^2.2.0"
+
+"@polymer/app-route@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/app-route/-/app-route-3.0.0-pre.19.tgz#4e0b4830bfbf1f4360a1678c907108eb6bb73aa0"
+  dependencies:
+    "@polymer/iron-location" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/app-storage@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/app-storage/-/app-storage-3.0.0-pre.19.tgz#5a8a5ab40e3cdb71f4df90c5a49ab4e455c6ed49"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/esm-amd-loader@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@polymer/esm-amd-loader/-/esm-amd-loader-1.0.0.tgz#7180ae2bce061511b48fb9b8fac1b8213ae6718b"
+
+"@polymer/font-roboto-local@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/font-roboto-local/-/font-roboto-local-3.0.0-pre.19.tgz#bb2858668d28553982f106503c39f3d08c43b071"
+
+"@polymer/font-roboto@^3.0.0-pre.18", "@polymer/font-roboto@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/font-roboto/-/font-roboto-3.0.0-pre.19.tgz#d67384a000eebb2632c00c268182a8528aca4a7c"
+
+"@polymer/iron-a11y-announcer@^3.0.0-pre.12", "@polymer/iron-a11y-announcer@^3.0.0-pre.15", "@polymer/iron-a11y-announcer@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-a11y-announcer/-/iron-a11y-announcer-3.0.0-pre.19.tgz#6a3b724df1e1cfda6f1270c359136d3e55ed7363"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-a11y-keys-behavior@^3.0.0-pre.12", "@polymer/iron-a11y-keys-behavior@^3.0.0-pre.15", "@polymer/iron-a11y-keys-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-a11y-keys-behavior/-/iron-a11y-keys-behavior-3.0.0-pre.19.tgz#4a335111c773af9c4376237be483ee196ab2d966"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-ajax@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-ajax/-/iron-ajax-3.0.0-pre.19.tgz#da36f24a67f609d741a7827e13b2789c81d8c8eb"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-autogrow-textarea@^3.0.0-pre.18", "@polymer/iron-autogrow-textarea@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-autogrow-textarea/-/iron-autogrow-textarea-3.0.0-pre.19.tgz#968f421aafd098fd29167423b893427b63d9ac21"
+  dependencies:
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-validatable-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-behaviors@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-behaviors/-/iron-behaviors-3.0.0-pre.19.tgz#0f44cf7068f9d581b896980f18556706ea0c6eaa"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-checked-element-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-checked-element-behavior/-/iron-checked-element-behavior-3.0.0-pre.19.tgz#c79c8529c7bddf8b3fc5da1e81c938a286e424aa"
+  dependencies:
+    "@polymer/iron-form-element-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-validatable-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-dropdown@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-dropdown/-/iron-dropdown-3.0.0-pre.19.tgz#3eba81167782e6b05d9897467f75b52a8e9dd5e1"
+  dependencies:
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-overlay-behavior" "^3.0.0-pre.19"
+    "@polymer/neon-animation" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-fit-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-fit-behavior/-/iron-fit-behavior-3.0.0-pre.19.tgz#db53546ccd0a9f2861326ff4a2f15387a648f796"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-flex-layout@^3.0.0-pre.18", "@polymer/iron-flex-layout@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-flex-layout/-/iron-flex-layout-3.0.0-pre.19.tgz#35f633ab4d4e14e44650722729128e4f5968c1e9"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-form-element-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-form-element-behavior/-/iron-form-element-behavior-3.0.0-pre.19.tgz#0fee7892af6a79cea7ef7ef1c7f738ac9f916ec6"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-icon@^3.0.0-pre.15", "@polymer/iron-icon@^3.0.0-pre.18", "@polymer/iron-icon@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-icon/-/iron-icon-3.0.0-pre.19.tgz#8fd150463a36d3851b2b71802ebc22d48dbfa340"
+  dependencies:
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-meta" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-iconset-svg@^3.0.0-pre.15", "@polymer/iron-iconset-svg@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-iconset-svg/-/iron-iconset-svg-3.0.0-pre.19.tgz#9badb0df72ade7f011e60917ef3274019006cfd0"
+  dependencies:
+    "@polymer/iron-meta" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-image@^3.0.0-pre.18", "@polymer/iron-image@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-image/-/iron-image-3.0.0-pre.19.tgz#3796518331eec96d0b01c0e3c37aaa3edc168850"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-input@^3.0.0-pre.18", "@polymer/iron-input@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-input/-/iron-input-3.0.0-pre.19.tgz#4bcac205f927495d775a44e628013bb76ff78706"
+  dependencies:
+    "@polymer/iron-a11y-announcer" "^3.0.0-pre.19"
+    "@polymer/iron-validatable-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-label@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-label/-/iron-label-3.0.0-pre.19.tgz#1c9157a72af3f5d29eaf68c0dda9443fc83f6f90"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-list@^3.0.0-pre.12":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-list/-/iron-list-3.0.0-pre.19.tgz#0ba38b663dd3649a9d5e5660af465d2ce9ecaf02"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-scroll-target-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-location@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-location/-/iron-location-3.0.0-pre.19.tgz#092716cf677491eb0c53031eb4014f6af566694d"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-media-query@^3.0.0-pre.15", "@polymer/iron-media-query@^3.0.0-pre.18", "@polymer/iron-media-query@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-media-query/-/iron-media-query-3.0.0-pre.19.tgz#f98271a879ead7aa6c37f7da6231b38c8f41deca"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-menu-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-menu-behavior/-/iron-menu-behavior-3.0.0-pre.19.tgz#16f841d3a4be8df1e502d5d2ca2831b77dd598e4"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-selector" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-meta@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-meta/-/iron-meta-3.0.0-pre.19.tgz#c4a70c235b87679f3487429ca69e071aacc3d002"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-overlay-behavior@^3.0.0-pre.15", "@polymer/iron-overlay-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-overlay-behavior/-/iron-overlay-behavior-3.0.0-pre.19.tgz#0d15e901c30380e93351132be7b6fc35a93a5444"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-fit-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-pages@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-pages/-/iron-pages-3.0.0-pre.19.tgz#98b00fbda39e06cdaf091a9dd61ef1fc371a4ed6"
+  dependencies:
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-selector" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-range-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-range-behavior/-/iron-range-behavior-3.0.0-pre.19.tgz#77e49c2876659eb02ebd514d720cf4c23861bcde"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-resizable-behavior@^3.0.0-pre.12", "@polymer/iron-resizable-behavior@^3.0.0-pre.15", "@polymer/iron-resizable-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-resizable-behavior/-/iron-resizable-behavior-3.0.0-pre.19.tgz#f36f4a11c48f07c55f4b0a77a9fb7827edf97fef"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-scroll-target-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-scroll-target-behavior/-/iron-scroll-target-behavior-3.0.0-pre.19.tgz#4f13b0bd35257a2a4ba94419cc2f9431cd089789"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-selector@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-selector/-/iron-selector-3.0.0-pre.19.tgz#254156e1284a68db9f45ace6903e846c042f1242"
+  dependencies:
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-validatable-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/iron-validatable-behavior/-/iron-validatable-behavior-3.0.0-pre.19.tgz#2168f83466e85a2caa329f0b9db7060d2de38a7d"
+  dependencies:
+    "@polymer/iron-meta" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/neon-animation@^3.0.0-pre.18", "@polymer/neon-animation@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/neon-animation/-/neon-animation-3.0.0-pre.19.tgz#0eae03142eb533988bcbd9056d82ed203a77cd8e"
+  dependencies:
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-selector" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-behaviors@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-behaviors/-/paper-behaviors-3.0.0-pre.19.tgz#02fdf0accf86f3f3836b82e333776ca5e9eeb25a"
+  dependencies:
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-checked-element-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-ripple" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-button@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-button/-/paper-button-3.0.0-pre.19.tgz#4feaa4142419b737a4d2d67809a760000151632a"
+  dependencies:
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-card@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-card/-/paper-card-3.0.0-pre.19.tgz#63ddb35fe35da8a52e12841618cf7afba3ad8d24"
+  dependencies:
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-image" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-checkbox@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-checkbox/-/paper-checkbox-3.0.0-pre.19.tgz#9472a8dd3289be0fee4b1220d6dd9e031dc9311f"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-checked-element-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-ripple" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-dialog-behavior@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-dialog-behavior/-/paper-dialog-behavior-3.0.0-pre.19.tgz#e5e6709f6749a27e6d1c3089633de25c239c43d0"
+  dependencies:
+    "@polymer/iron-overlay-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-dialog-scrollable@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-dialog-scrollable/-/paper-dialog-scrollable-3.0.0-pre.19.tgz#2d0925e19643eadc9f5bde1745dcaccbc47e1ff0"
+  dependencies:
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/paper-dialog-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-dialog@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-dialog/-/paper-dialog-3.0.0-pre.19.tgz#7b3e299d955eac749b65309cb16129fc6b97e42a"
+  dependencies:
+    "@polymer/iron-overlay-behavior" "^3.0.0-pre.19"
+    "@polymer/neon-animation" "^3.0.0-pre.19"
+    "@polymer/paper-dialog-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-drawer-panel@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-drawer-panel/-/paper-drawer-panel-3.0.0-pre.19.tgz#545740d2ae0f54731ba61697ea9436961beaa2e8"
+  dependencies:
+    "@polymer/iron-media-query" "^3.0.0-pre.19"
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-selector" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-dropdown-menu@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-dropdown-menu/-/paper-dropdown-menu-3.0.0-pre.19.tgz#29342cddc6d633d6c3837163d8a5f3fad7b768f3"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-form-element-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-icon" "^3.0.0-pre.19"
+    "@polymer/iron-iconset-svg" "^3.0.0-pre.19"
+    "@polymer/iron-validatable-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-input" "^3.0.0-pre.19"
+    "@polymer/paper-menu-button" "^3.0.0-pre.19"
+    "@polymer/paper-ripple" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-fab@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-fab/-/paper-fab-3.0.0-pre.19.tgz#383e4d70ca1ff3da67c94a293dfa959148205456"
+  dependencies:
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-icon" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-icon-button@^3.0.0-pre.18", "@polymer/paper-icon-button@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-icon-button/-/paper-icon-button-3.0.0-pre.19.tgz#e478b5838363285394c3c1a3addd72d3bb1d789b"
+  dependencies:
+    "@polymer/iron-icon" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-input@^3.0.0-pre.18", "@polymer/paper-input@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-input/-/paper-input-3.0.0-pre.19.tgz#d7322b6773db71fb1019a217ed9b566abb908030"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-autogrow-textarea" "^3.0.0-pre.19"
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-form-element-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-input" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-item@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-item/-/paper-item-3.0.0-pre.19.tgz#102618a09c860e87ea994340c19b0af7d239e5bb"
+  dependencies:
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-listbox@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-listbox/-/paper-listbox-3.0.0-pre.19.tgz#5fbd0bdbffb36ce3c4cd9a1a88fc2520aceabb1b"
+  dependencies:
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-menu-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-menu-button@^3.0.0-pre.18", "@polymer/paper-menu-button@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-menu-button/-/paper-menu-button-3.0.0-pre.19.tgz#92402c4da6fe4fe31295e8de19c71ff39ad2a824"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-dropdown" "^3.0.0-pre.19"
+    "@polymer/iron-fit-behavior" "^3.0.0-pre.19"
+    "@polymer/neon-animation" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-progress@^3.0.0-pre.18", "@polymer/paper-progress@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-progress/-/paper-progress-3.0.0-pre.19.tgz#acb5245048aab6ad71dce7efd632d10ef22a42c4"
+  dependencies:
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-range-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-radio-button@^3.0.0-pre.18", "@polymer/paper-radio-button@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-radio-button/-/paper-radio-button-3.0.0-pre.19.tgz#ccef788806d51a74ac226bf8565de362724b85e7"
+  dependencies:
+    "@polymer/iron-checked-element-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-radio-group@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-radio-group/-/paper-radio-group-3.0.0-pre.19.tgz#a9cedd0bded2592dfeeef0d9cda985efadfd8370"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-menu-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-radio-button" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-ripple@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-ripple/-/paper-ripple-3.0.0-pre.19.tgz#9e72d59d07c954a0e3de70b44a12c66a508b80ee"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-scroll-header-panel@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-scroll-header-panel/-/paper-scroll-header-panel-3.0.0-pre.19.tgz#a5cf8f21ee4244036c9c828ac9bd6c386e8801a3"
+  dependencies:
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-slider@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-slider/-/paper-slider-3.0.0-pre.19.tgz#3efe02683a2cb65ecac841cf9bb80fec725a5642"
+  dependencies:
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-form-element-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-input" "^3.0.0-pre.19"
+    "@polymer/paper-progress" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-spinner@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-spinner/-/paper-spinner-3.0.0-pre.19.tgz#08b201b907d77fe445c4b58d778afb076930543b"
+  dependencies:
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-styles@^3.0.0-pre.18", "@polymer/paper-styles@^3.0.0-pre.19":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-styles/-/paper-styles-3.0.0-pre.19.tgz#72ba066b0de9153d835639ebe63ce2afbe5425b0"
+  dependencies:
+    "@polymer/font-roboto" "^3.0.0-pre.19"
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-tabs@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-tabs/-/paper-tabs-3.0.0-pre.19.tgz#c758179061d713d830b4d77e2b5fa640508b2a18"
+  dependencies:
+    "@polymer/iron-behaviors" "^3.0.0-pre.19"
+    "@polymer/iron-flex-layout" "^3.0.0-pre.19"
+    "@polymer/iron-icon" "^3.0.0-pre.19"
+    "@polymer/iron-iconset-svg" "^3.0.0-pre.19"
+    "@polymer/iron-menu-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-icon-button" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-toast@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-toast/-/paper-toast-3.0.0-pre.19.tgz#0fe640e3bd33a82b93f454e1d85755937ee04b9a"
+  dependencies:
+    "@polymer/iron-a11y-announcer" "^3.0.0-pre.19"
+    "@polymer/iron-fit-behavior" "^3.0.0-pre.19"
+    "@polymer/iron-overlay-behavior" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/paper-toggle-button@^3.0.0-pre.18":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/paper-toggle-button/-/paper-toggle-button-3.0.0-pre.19.tgz#6b95616fd1b1a0c66be1c4fb81ac57b26390ff84"
+  dependencies:
+    "@polymer/iron-checked-element-behavior" "^3.0.0-pre.19"
+    "@polymer/paper-behaviors" "^3.0.0-pre.19"
+    "@polymer/paper-styles" "^3.0.0-pre.19"
+    "@polymer/polymer" "^3.0.0"
+
+"@polymer/polymer@^3.0.0", "@polymer/polymer@^3.0.0-pre.1", "@polymer/polymer@^3.0.0-pre.12", "@polymer/polymer@^3.0.0-pre.13":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-3.0.2.tgz#626e6f9fae9716b0962ce0211e21df242153eab2"
+  dependencies:
+    "@webcomponents/shadycss" "^1.2.0"
+
 "@polymer/sinonjs@^1.14.1":
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/@polymer/sinonjs/-/sinonjs-1.17.1.tgz#e47d3785b7d0e8c29feb97f7e924b0fc597e2e9b"
@@ -10,42 +1087,35 @@
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/@polymer/test-fixture/-/test-fixture-0.0.3.tgz#4443752697d4d9293bbc412ea0b5e4d341f149d9"
 
+"@polymer/test-fixture@^3.0.0-pre.1":
+  version "3.0.0-pre.19"
+  resolved "https://registry.yarnpkg.com/@polymer/test-fixture/-/test-fixture-3.0.0-pre.19.tgz#415e16f75da4a242171c5954b6f4443fdca0c4c2"
+
+"@sindresorhus/is@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+
 "@sinonjs/formatio@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
   dependencies:
     samsam "1.3.0"
 
-"@types/assert@0.0.29":
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/assert/-/assert-0.0.29.tgz#8e562785baa5abda7c04a49f6665eae7431928d3"
-
-"@types/babel-core@^6.7.14":
-  version "6.25.2"
-  resolved "https://registry.yarnpkg.com/@types/babel-core/-/babel-core-6.25.2.tgz#500b7fef2834dce87b32311a4d67a1a757adaac7"
+"@types/acorn@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.3.tgz#d1f3e738dde52536f9aad3d3380d14e448820afd"
   dependencies:
-    "@types/babel-generator" "*"
-    "@types/babel-template" "*"
-    "@types/babel-traverse" "*"
-    "@types/babel-types" "*"
-    "@types/babylon" "*"
+    "@types/estree" "*"
 
-"@types/babel-generator@*":
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/@types/babel-generator/-/babel-generator-6.25.0.tgz#8255469aa14712f0d1608b99683cabd5b413d96b"
+"@types/babel-generator@^6.25.1":
+  version "6.25.1"
+  resolved "https://registry.yarnpkg.com/@types/babel-generator/-/babel-generator-6.25.1.tgz#f86ab3cf132b04597fe6c431d3083aaf1b76b530"
   dependencies:
     "@types/babel-types" "*"
 
-"@types/babel-template@*":
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/@types/babel-template/-/babel-template-6.25.0.tgz#2505d7b55b88f821d98048b4fdf07b3b22563d30"
-  dependencies:
-    "@types/babel-types" "*"
-    "@types/babylon" "*"
-
-"@types/babel-traverse@*":
-  version "6.25.2"
-  resolved "https://registry.yarnpkg.com/@types/babel-traverse/-/babel-traverse-6.25.2.tgz#3cfaebe316fec515a964adbb84147b3c8971ba9f"
+"@types/babel-traverse@^6.25.2", "@types/babel-traverse@^6.25.3":
+  version "6.25.3"
+  resolved "https://registry.yarnpkg.com/@types/babel-traverse/-/babel-traverse-6.25.3.tgz#34dd69d1e469aee75e20ba00fbc52c7bc717b1c8"
   dependencies:
     "@types/babel-types" "*"
 
@@ -53,7 +1123,11 @@
   version "6.25.1"
   resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-6.25.1.tgz#ce8f126a4403e11e1b0033a424f11638afac7889"
 
-"@types/babylon@*", "@types/babylon@^6.16.2":
+"@types/babel-types@^6.25.1":
+  version "6.25.2"
+  resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-6.25.2.tgz#5c57f45973e4f13742dbc5273dd84cffe7373a9e"
+
+"@types/babylon@^6.16.2":
   version "6.16.2"
   resolved "https://registry.yarnpkg.com/@types/babylon/-/babylon-6.16.2.tgz#062ce63b693d9af1c246f5aedf928bc9c30589c8"
   dependencies:
@@ -73,7 +1147,7 @@
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.4.tgz#fe86315d9a66827feeb16f73bc954688ec950e18"
 
-"@types/chalk@^0.4.28", "@types/chalk@^0.4.30", "@types/chalk@^0.4.31":
+"@types/chalk@^0.4.30", "@types/chalk@^0.4.31":
   version "0.4.31"
   resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-0.4.31.tgz#a31d74241a6b1edbb973cf36d97a2896834a51f9"
 
@@ -99,9 +1173,9 @@
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@types/cssbeautify/-/cssbeautify-0.3.1.tgz#8e0bee8f7decb952250da0caebe05e30591c17ef"
 
-"@types/del@^2.2.31":
-  version "2.2.33"
-  resolved "https://registry.yarnpkg.com/@types/del/-/del-2.2.33.tgz#3fbe8a1c3d00e85e9674e490a347eb419b1003a1"
+"@types/del@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/del/-/del-3.0.1.tgz#4712da8c119873cbbf533ad8dbf1baac5940ac5d"
   dependencies:
     "@types/glob" "*"
 
@@ -109,6 +1183,10 @@
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@types/doctrine/-/doctrine-0.0.1.tgz#b999f2d9f7b43cabe0a1a2f39bc203bc7dcada9d"
 
+"@types/escape-html@0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-0.0.20.tgz#cae698714dd61ebee5ab3f2aeb9a34ba1011735a"
+
 "@types/escodegen@^0.0.2":
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/@types/escodegen/-/escodegen-0.0.2.tgz#7cea41ab242e910eb10f65ae18aeba459d66b35f"
@@ -123,9 +1201,9 @@
   version "0.0.37"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.37.tgz#48949c1516d46139c1e521195f9e12993b69d751"
 
-"@types/estree@0.0.34":
-  version "0.0.34"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.34.tgz#aa7af69a3a91922171ee411b3c9d8f6beb4af321"
+"@types/estree@0.0.38":
+  version "0.0.38"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
 
 "@types/express-serve-static-core@*":
   version "4.0.53"
@@ -174,16 +1252,22 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/gulp-if@0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@types/gulp-if/-/gulp-if-0.0.30.tgz#21a564af1aabc80dff2d195fa66cd3f8864aec21"
+"@types/globby@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@types/globby/-/globby-6.1.0.tgz#7c25b975512a89effea2a656ca8cf6db7fb29d11"
+  dependencies:
+    "@types/glob" "*"
+
+"@types/gulp-if@0.0.33":
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/@types/gulp-if/-/gulp-if-0.0.33.tgz#edece22b7925d9a6db5f9c8c0d7882aa776fb678"
   dependencies:
     "@types/node" "*"
     "@types/vinyl" "*"
 
-"@types/html-minifier@^1.1.30":
-  version "1.1.30"
-  resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-1.1.30.tgz#3b3817c27df23922f7b5aa87eff45b3ab934aec9"
+"@types/html-minifier@^3.5.1":
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-3.5.2.tgz#f897a13d847a774e9b6fd91497e9b0e0ead71c35"
   dependencies:
     "@types/clean-css" "*"
     "@types/relateurl" "*"
@@ -203,6 +1287,10 @@
     "@types/rx" "*"
     "@types/through" "*"
 
+"@types/is-windows@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@types/is-windows/-/is-windows-0.2.0.tgz#6f24ee48731d31168ea510610d6dd15e5fc9c6ff"
+
 "@types/launchpad@^0.6.0":
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/@types/launchpad/-/launchpad-0.6.0.tgz#37296109b7f277f6e6c5fd7e0c0706bc918fbb51"
@@ -225,6 +1313,10 @@
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.1.tgz#b683eb60be358304ef146f5775db4c0e3696a550"
 
+"@types/minimatch@^3.0.1":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+
 "@types/mz@0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.29.tgz#bc24728c649973f1c7851e9033f9ce525668c27b"
@@ -242,17 +1334,17 @@
   version "8.0.25"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.25.tgz#66ecaf4df93f5281b48427ee96fbcdfc4f0cdce1"
 
-"@types/node@6.0.*", "@types/node@^6", "@types/node@^6.0.0", "@types/node@^6.0.31", "@types/node@^6.0.41", "@types/node@^6.0.77":
-  version "6.0.88"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66"
-
 "@types/node@^4.0.30", "@types/node@^4.2.3":
   version "4.2.20"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-4.2.20.tgz#3f7dceff43e07cfff4407fc3495d98a533b32267"
 
-"@types/node@^8.0.0":
-  version "8.0.32"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.32.tgz#869a716538b6eec65ab3893f183d557be3cda206"
+"@types/node@^6.0.0", "@types/node@^6.0.41", "@types/node@^6.0.77":
+  version "6.0.88"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.88.tgz#f618f11a944f6a18d92b5c472028728a3e3d4b66"
+
+"@types/node@^9.3.0", "@types/node@^9.6.4":
+  version "9.6.15"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.15.tgz#8a5a313ea0a43a95277235841be5d3f5fb3dfeda"
 
 "@types/opn@^3.0.28":
   version "3.0.28"
@@ -260,18 +1352,16 @@
   dependencies:
     "@types/node" "*"
 
-"@types/parse5@^0.0.31":
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-0.0.31.tgz#e827a493a443b156e1b582a2e4c3bdc0040f2ee7"
-  dependencies:
-    "@types/node" "6.0.*"
-
 "@types/parse5@^2.2.32", "@types/parse5@^2.2.34":
   version "2.2.34"
   resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-2.2.34.tgz#e3870a10e82735a720f62d71dcd183ba78ef3a9d"
   dependencies:
     "@types/node" "*"
 
+"@types/path-is-inside@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/path-is-inside/-/path-is-inside-1.0.0.tgz#02d6ff38975d684bdec96204494baf9f29f0e17f"
+
 "@types/pem@^1.8.1":
   version "1.9.2"
   resolved "https://registry.yarnpkg.com/@types/pem/-/pem-1.9.2.tgz#cd0b195d161dffbcb0aa88fa9fd94b24dd2af10b"
@@ -280,9 +1370,9 @@
   version "0.2.28"
   resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
 
-"@types/request@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/request/-/request-0.0.39.tgz#168b96cf4253c5d54d403f746f82ee7aed47ce2c"
+"@types/request@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/request/-/request-2.0.3.tgz#bdf0fba9488c822f77e97de3dd8fe357b2fb8c06"
   dependencies:
     "@types/form-data" "*"
     "@types/node" "*"
@@ -293,6 +1383,18 @@
   dependencies:
     "@types/node" "*"
 
+"@types/resolve@0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.6.tgz#0bd2f236c2e1cebb98b79885df57edd71a8d770e"
+  dependencies:
+    "@types/node" "*"
+
+"@types/resolve@0.0.7":
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.7.tgz#b299c13be8d712b1b502fb14a084252acef84f4d"
+  dependencies:
+    "@types/node" "*"
+
 "@types/rimraf@^0.0.28":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-0.0.28.tgz#5562519bc7963caca8abf7f128cae3b594d41d06"
@@ -418,7 +1520,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/ua-parser-js@^0.7.30", "@types/ua-parser-js@^0.7.31":
+"@types/ua-parser-js@^0.7.31":
   version "0.7.32"
   resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.32.tgz#8827d451d6702307248073b5d98aa9293d02b5e5"
 
@@ -432,6 +1534,12 @@
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@types/update-notifier/-/update-notifier-1.0.2.tgz#7a9269a38545bfd90155aac1350669a19f8ecb4a"
 
+"@types/uuid@^3.4.3":
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.3.tgz#121ace265f5569ce40f4f6d0ff78a338c732a754"
+  dependencies:
+    "@types/node" "*"
+
 "@types/vinyl-fs@0.0.28":
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/@types/vinyl-fs/-/vinyl-fs-0.0.28.tgz#4663017bc802c6570eae4f3409fd5cabf97cbfde"
@@ -440,15 +1548,29 @@
     "@types/node" "*"
     "@types/vinyl" "*"
 
+"@types/vinyl-fs@^2.4.8":
+  version "2.4.8"
+  resolved "https://registry.yarnpkg.com/@types/vinyl-fs/-/vinyl-fs-2.4.8.tgz#cd55c0c625e8ba02858992d9c7265a343704ca77"
+  dependencies:
+    "@types/glob-stream" "*"
+    "@types/node" "*"
+    "@types/vinyl" "*"
+
 "@types/vinyl@*", "@types/vinyl@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.1.tgz#6b414dfdcd4a785e8e76e87565ed29e79490d9b7"
   dependencies:
     "@types/node" "*"
 
-"@types/which@^1.0.27":
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
+"@types/whatwg-url@^6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-6.4.0.tgz#1e59b8c64bc0dbdf66d037cf8449d1c3d5270237"
+  dependencies:
+    "@types/node" "*"
+
+"@types/which@^1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.3.1.tgz#7802c380887986ca909008afea4e08025b130f8d"
 
 "@types/winston@^2.2.0":
   version "2.3.6"
@@ -462,9 +1584,240 @@
   dependencies:
     "@types/inquirer" "*"
 
-"@webcomponents/webcomponentsjs@^1.0.7":
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.0.14.tgz#7760823bfaa94306cee087603a0b1a1d22ee005f"
+"@vaadin/vaadin-button@^2.0.0-pre.2":
+  version "2.0.0-pre.3"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-button/-/vaadin-button-2.0.0-pre.3.tgz#576556ad67f938b1171ccf59fd000dfcd0a08f1e"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.13"
+    "@vaadin/vaadin-control-state-mixin" "^2.0.3-pre.2"
+    "@vaadin/vaadin-element-mixin" "^1.0.2-pre.2"
+    "@vaadin/vaadin-lumo-styles" "^1.0.0-pre.4"
+    "@vaadin/vaadin-themable-mixin" "^1.1.5-pre.2"
+
+"@vaadin/vaadin-combo-box@4.0.1-pre.1":
+  version "4.0.1-pre.1"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-combo-box/-/vaadin-combo-box-4.0.1-pre.1.tgz#72df1f3c795d4f91cee36c82509d36ce55c9b0b4"
+  dependencies:
+    "@polymer/iron-a11y-announcer" "^3.0.0-pre.12"
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.12"
+    "@polymer/iron-list" "^3.0.0-pre.12"
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.12"
+    "@polymer/polymer" "^3.0.0-pre.12"
+    "@vaadin/vaadin-control-state-mixin" "^2.0.3-pre.2"
+    "@vaadin/vaadin-element-mixin" "^1.0.2-pre.2"
+    "@vaadin/vaadin-item" "^2.0.0-pre.2"
+    "@vaadin/vaadin-lumo-styles" "^1.0.0-pre.4"
+    "@vaadin/vaadin-overlay" "^3.0.1-pre.1"
+    "@vaadin/vaadin-text-field" "^2.0.1-pre.1"
+    "@vaadin/vaadin-themable-mixin" "^1.1.5-pre.2"
+
+"@vaadin/vaadin-control-state-mixin@^2.0.3-pre.2":
+  version "2.0.3-pre.3"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-control-state-mixin/-/vaadin-control-state-mixin-2.0.3-pre.3.tgz#a9ed62495b386e48a05bf82b7a093dabdd300a96"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.13"
+
+"@vaadin/vaadin-date-picker@3.0.0-pre.3":
+  version "3.0.0-pre.3"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-date-picker/-/vaadin-date-picker-3.0.0-pre.3.tgz#b51438fdf2ea55ae03a77b64eb90f3032bff7392"
+  dependencies:
+    "@polymer/iron-a11y-announcer" "^3.0.0-pre.15"
+    "@polymer/iron-a11y-keys-behavior" "^3.0.0-pre.15"
+    "@polymer/iron-media-query" "^3.0.0-pre.15"
+    "@polymer/iron-resizable-behavior" "^3.0.0-pre.15"
+    "@polymer/polymer" "^3.0.0-pre.13"
+    "@vaadin/vaadin-button" "^2.0.0-pre.2"
+    "@vaadin/vaadin-control-state-mixin" "^2.0.3-pre.2"
+    "@vaadin/vaadin-element-mixin" "^1.0.2-pre.2"
+    "@vaadin/vaadin-lumo-styles" "^1.0.0-pre.4"
+    "@vaadin/vaadin-overlay" "^3.0.2-pre.1"
+    "@vaadin/vaadin-text-field" "^2.0.1-pre.1"
+    "@vaadin/vaadin-themable-mixin" "^1.1.5-pre.2"
+
+"@vaadin/vaadin-development-mode-detector@^1.0.3-pre.1", "@vaadin/vaadin-development-mode-detector@^1.0.3-pre.4":
+  version "1.0.3-pre.6"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-development-mode-detector/-/vaadin-development-mode-detector-1.0.3-pre.6.tgz#dacef182161d0d3db98df20c498a41ae6a5a2741"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.13"
+
+"@vaadin/vaadin-element-mixin@^1.0.2-pre.2":
+  version "1.0.2-pre.3"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-element-mixin/-/vaadin-element-mixin-1.0.2-pre.3.tgz#3f8f158f913db19e747288c8852af51b72e9df39"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.13"
+    "@vaadin/vaadin-development-mode-detector" "^1.0.3-pre.4"
+    "@vaadin/vaadin-usage-statistics" "^1.0.6-pre.2"
+
+"@vaadin/vaadin-item@^2.0.0-pre.2":
+  version "2.0.0-pre.3"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-item/-/vaadin-item-2.0.0-pre.3.tgz#63ddeae877dcc7984b4036f03e06df5f3e5a5a44"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.13"
+    "@vaadin/vaadin-lumo-styles" "^1.0.0-pre.4"
+    "@vaadin/vaadin-themable-mixin" "^1.1.5-pre.2"
+
+"@vaadin/vaadin-lumo-styles@^1.0.0-pre.4":
+  version "1.0.0-pre.6"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-lumo-styles/-/vaadin-lumo-styles-1.0.0-pre.6.tgz#a9407f24151c6ccd1e6cba54716f735713841bcf"
+  dependencies:
+    "@polymer/iron-icon" "^3.0.0-pre.15"
+    "@polymer/iron-iconset-svg" "^3.0.0-pre.15"
+    "@polymer/polymer" "^3.0.0-pre.13"
+
+"@vaadin/vaadin-overlay@3.0.2-pre.2", "@vaadin/vaadin-overlay@^3.0.1-pre.1", "@vaadin/vaadin-overlay@^3.0.2-pre.1":
+  version "3.0.2-pre.2"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-overlay/-/vaadin-overlay-3.0.2-pre.2.tgz#1c53e3da1e379f0c5b40b384c5254af06254d95b"
+  dependencies:
+    "@polymer/iron-overlay-behavior" "^3.0.0-pre.15"
+    "@polymer/polymer" "^3.0.0-pre.13"
+    "@vaadin/vaadin-lumo-styles" "^1.0.0-pre.4"
+    "@vaadin/vaadin-themable-mixin" "^1.1.5-pre.2"
+
+"@vaadin/vaadin-text-field@^2.0.1-pre.1":
+  version "2.0.1-pre.2"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-text-field/-/vaadin-text-field-2.0.1-pre.2.tgz#8cd80226f0b6a4a8177e1456fa9969a214ed58df"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.13"
+    "@vaadin/vaadin-control-state-mixin" "^2.0.3-pre.2"
+    "@vaadin/vaadin-element-mixin" "^1.0.2-pre.2"
+    "@vaadin/vaadin-lumo-styles" "^1.0.0-pre.4"
+    "@vaadin/vaadin-themable-mixin" "^1.1.5-pre.2"
+
+"@vaadin/vaadin-themable-mixin@^1.1.5-pre.2":
+  version "1.1.5-pre.3"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-themable-mixin/-/vaadin-themable-mixin-1.1.5-pre.3.tgz#c81292f331132150f17f7e7e55ec835e4645a22d"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.13"
+
+"@vaadin/vaadin-usage-statistics@^1.0.6-pre.2":
+  version "1.0.6-pre.2"
+  resolved "https://registry.yarnpkg.com/@vaadin/vaadin-usage-statistics/-/vaadin-usage-statistics-1.0.6-pre.2.tgz#ef2d7fe40459275d71558ff59098851b1ea9918e"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.12"
+    "@vaadin/vaadin-development-mode-detector" "^1.0.3-pre.1"
+
+"@webassemblyjs/ast@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.3.1.tgz#3081b4b3ff0af733aa5ba573af998f33711293f8"
+  dependencies:
+    "@webassemblyjs/helper-wasm-bytecode" "1.3.1"
+    "@webassemblyjs/wast-parser" "1.3.1"
+    webassemblyjs "1.3.1"
+
+"@webassemblyjs/floating-point-hex-parser@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.3.1.tgz#82646903ba25c3e5d88dec41ecb4e4d770615bfc"
+
+"@webassemblyjs/helper-buffer@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.3.1.tgz#aa66bb6c274a7e5610d7468f94a2702186713bc6"
+
+"@webassemblyjs/helper-code-frame@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.3.1.tgz#b5eba87cf37992e8a62c402545aed87dfd02be83"
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.3.1"
+
+"@webassemblyjs/helper-fsm@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.3.1.tgz#297113d09a9541613eaeb265d7f948c5e03eb0a2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.3.1.tgz#53b0308988e3a0cad836c83fc0801255906608f8"
+
+"@webassemblyjs/helper-wasm-section@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.3.1.tgz#3df13898e89a376ffb89439d216d9f0001bf9632"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/helper-buffer" "1.3.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.3.1"
+    "@webassemblyjs/wasm-gen" "1.3.1"
+
+"@webassemblyjs/leb128@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.3.1.tgz#e0cf1c585c72955637eeeabab1e2ab37c12c2338"
+  dependencies:
+    leb "^0.3.0"
+
+"@webassemblyjs/validation@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.3.1.tgz#ed0129d7ccca7858a3f46e7e47a6889008547a39"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+
+"@webassemblyjs/wasm-edit@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.3.1.tgz#a16ca4d9a12144b1b28d4e66ad1ad66ec65e479e"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/helper-buffer" "1.3.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.3.1"
+    "@webassemblyjs/helper-wasm-section" "1.3.1"
+    "@webassemblyjs/wasm-gen" "1.3.1"
+    "@webassemblyjs/wasm-opt" "1.3.1"
+    "@webassemblyjs/wasm-parser" "1.3.1"
+    "@webassemblyjs/wast-printer" "1.3.1"
+    debug "^3.1.0"
+
+"@webassemblyjs/wasm-gen@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.3.1.tgz#43263fc56a0570e0564e407bbcd4c02e85167398"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.3.1"
+    "@webassemblyjs/leb128" "1.3.1"
+
+"@webassemblyjs/wasm-opt@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.3.1.tgz#172601dcdaaacd6b0b002df1252033198c65eceb"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/helper-buffer" "1.3.1"
+    "@webassemblyjs/wasm-gen" "1.3.1"
+    "@webassemblyjs/wasm-parser" "1.3.1"
+
+"@webassemblyjs/wasm-parser@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.3.1.tgz#76727be6c313a9b775170ed38a126558eed7e8ef"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.3.1"
+    "@webassemblyjs/leb128" "1.3.1"
+    "@webassemblyjs/wasm-parser" "1.3.1"
+    webassemblyjs "1.3.1"
+
+"@webassemblyjs/wast-parser@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.3.1.tgz#62b6eba09580477868dd394cee3e3f5c64e1f3f8"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.3.1"
+    "@webassemblyjs/helper-code-frame" "1.3.1"
+    "@webassemblyjs/helper-fsm" "1.3.1"
+    long "^3.2.0"
+    webassemblyjs "1.3.1"
+
+"@webassemblyjs/wast-printer@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.3.1.tgz#3e75b889e6f1ba2dfa854e4436b4287e7687e82c"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/wast-parser" "1.3.1"
+    long "^3.2.0"
+
+"@webcomponents/shadycss@^1.0.0", "@webcomponents/shadycss@^1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.2.1.tgz#6e4a88534657807c8398b4bc196d0ca492182d54"
+
+"@webcomponents/webcomponentsjs@2.0.0-beta.2", "@webcomponents/webcomponentsjs@^1.0.7":
+  version "2.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.0.0-beta.2.tgz#d9844a0bcfc5feeae94a71f45e33e32b1bd29c19"
+
+"@webcomponents/webcomponentsjs@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.0.0.tgz#166e7489b9ce66f5c082a3360120cb27505f762f"
 
 abbrev@1:
   version "1.1.0"
@@ -488,6 +1841,18 @@ accessibility-developer-tools@^2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/accessibility-developer-tools/-/accessibility-developer-tools-2.12.0.tgz#3da0cce9d6ec6373964b84f35db7cfc3df7ab514"
 
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  dependencies:
+    acorn "^5.0.0"
+
+acorn-import-meta@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/acorn-import-meta/-/acorn-import-meta-0.2.1.tgz#ac91e06e00facece7e96ff76a0fe9ec7b1cb5b5c"
+  dependencies:
+    acorn "^5.4.1"
+
 acorn-jsx@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
@@ -498,11 +1863,15 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
+acorn@^5.0.0, acorn@^5.4.1, acorn@^5.5.0:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
+
 acorn@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
-acorn@^5.2.1, acorn@^5.4.0:
+acorn@^5.2.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
@@ -525,6 +1894,10 @@ ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
+ajv-keywords@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+
 ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
@@ -550,6 +1923,15 @@ ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.0.tgz#4c8affdf80887d8f132c9c52ab8a2dc4d0b7b24c"
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+    uri-js "^4.2.1"
+
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -592,13 +1974,13 @@ ansi-escape-sequences@^3.0.0:
   dependencies:
     array-back "^1.0.3"
 
-ansi-escapes@^1.1.0:
+ansi-escapes@^1.0.0, ansi-escapes@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
 ansi-escapes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
 
 ansi-gray@^0.1.1:
   version "0.1.1"
@@ -632,12 +2014,18 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.1.0, ansi-styles@^3.2.0:
+ansi-styles@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
 ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
@@ -646,6 +2034,10 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
+any-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242"
+
 any-promise@^1.0.0, any-promise@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -657,6 +2049,13 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
 append-field@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/append-field/-/append-field-0.1.0.tgz#6ddc58fa083c7bc545d3c5995b2830cc2366d44a"
@@ -665,6 +2064,10 @@ aproba@^1.0.3:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1"
 
+aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
 archiver-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
@@ -724,7 +2127,7 @@ arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
 
-arr-flatten@^1.0.1:
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
@@ -787,11 +2190,15 @@ array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+
 arraybuffer.slice@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
 
-arrify@^1.0.0:
+arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
@@ -803,6 +2210,14 @@ asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -815,6 +2230,12 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
 assertion-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
@@ -823,21 +2244,25 @@ assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
+ast-types@0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.10.1.tgz#f52fca9715579a14f841d67d7f8d25432ab6a3dd"
+
+ast-types@0.11.3:
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.2.1.tgz#a4816a17cd5ff516dfa2c7698a453369b9790de0"
-
 async@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.0.1.tgz#b709cc0280a9c36f09f4536be823c838a9049e25"
   dependencies:
     lodash "^4.8.0"
 
-async@^1.5.2:
+async@^1.5.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -847,7 +2272,7 @@ async@^2.0.0, async@^2.0.1, async@^2.1.2:
   dependencies:
     lodash "^4.14.0"
 
-async@^2.4.1:
+async@^2.1.4, async@^2.4.1, async@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -865,6 +2290,10 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -885,7 +2314,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.18.2, babel-core@^6.24.1, babel-core@^6.26.0:
+babel-core@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
   dependencies:
@@ -909,6 +2338,17 @@ babel-core@^6.18.2, babel-core@^6.24.1, babel-core@^6.26.0:
     slash "^1.0.0"
     source-map "^0.5.6"
 
+babel-eslint@^8.2.3:
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.3.tgz#1a2e6681cc9bc4473c32899e59915e19cd6733cf"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
+    eslint-scope "~3.7.1"
+    eslint-visitor-keys "^1.0.0"
+
 babel-generator@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
@@ -922,6 +2362,27 @@ babel-generator@^6.26.0:
     source-map "^0.5.6"
     trim-right "^1.0.1"
 
+babel-generator@^6.26.1:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-bindify-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
 babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
@@ -956,9 +2417,9 @@ babel-helper-define-map@^6.24.1:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-helper-evaluate-path@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.2.0.tgz#0bb2eb01996c0cef53c5e8405e999fe4a0244c08"
+babel-helper-evaluate-path@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.4.2.tgz#5bf57e3763778795651514b0eb87d68f78d22a2a"
 
 babel-helper-explode-assignable-expression@^6.24.1:
   version "6.24.1"
@@ -968,9 +2429,18 @@ babel-helper-explode-assignable-expression@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-flip-expressions@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.2.0.tgz#160d2090a3d9f9c64a750905321a0bc218f884ec"
+babel-helper-explode-class@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
+  dependencies:
+    babel-helper-bindify-decorators "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-flip-expressions@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.2.tgz#c53ffc7cc5f3e625b2673260b8f9f7ba95c853db"
 
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
@@ -1000,13 +2470,13 @@ babel-helper-is-nodes-equiv@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
 
-babel-helper-is-void-0@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.2.0.tgz#6ed0ada8a9b1c5b6e88af6b47c1b3b5c080860eb"
+babel-helper-is-void-0@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.2.tgz#f5539bb934b8ffc99c6eb2dc38f322d22af9d43b"
 
-babel-helper-mark-eval-scopes@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.2.0.tgz#7648aaf2ec92aae9b09a20ad91e8df5e1fcc94b2"
+babel-helper-mark-eval-scopes@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.2.tgz#bd68e8556aa12b7eeccb3f00ae86a63c0bd774d6"
 
 babel-helper-optimise-call-expression@^6.24.1:
   version "6.24.1"
@@ -1033,9 +2503,9 @@ babel-helper-remap-async-to-generator@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-remove-or-void@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.2.0.tgz#8e46ad5b30560d57d7510b3fd93f332ee7c67386"
+babel-helper-remove-or-void@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.2.tgz#86733475d7ea2498ac498055f8974b751788d79c"
 
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
@@ -1048,9 +2518,9 @@ babel-helper-replace-supers@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-to-multiple-sequence-expressions@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.2.0.tgz#d1a419634c6cb301f27858c659167cfee0a9d318"
+babel-helper-to-multiple-sequence-expressions@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.4.2.tgz#566f5e93fb7051a36ae51c0f861aa8a4ff08b7a0"
 
 babel-helpers@^6.24.1:
   version "6.24.1"
@@ -1059,6 +2529,14 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
+babel-loader@^7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015"
+  dependencies:
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
+    mkdirp "^0.5.1"
+
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -1077,79 +2555,107 @@ babel-plugin-external-helpers@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-minify-builtins@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.2.0.tgz#317f824b0907210b6348671bb040ca072e2e0c82"
+babel-plugin-minify-builtins@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.4.2.tgz#8d61f79d2ea815177f0eddba366d1a66b9e97b00"
   dependencies:
-    babel-helper-evaluate-path "^0.2.0"
+    babel-helper-evaluate-path "^0.4.2"
 
-babel-plugin-minify-constant-folding@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.2.0.tgz#8c70b528b2eb7c13e94d95c8789077d4cdbc3970"
+babel-plugin-minify-constant-folding@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.4.2.tgz#8a4826669310ad559623e310bb050a5f1149cfc5"
   dependencies:
-    babel-helper-evaluate-path "^0.2.0"
+    babel-helper-evaluate-path "^0.4.2"
 
-babel-plugin-minify-dead-code-elimination@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.2.0.tgz#e8025ee10a1e5e4f202633a6928ce892c33747e3"
+babel-plugin-minify-dead-code-elimination@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.4.2.tgz#b9cfa0efba1ef2d02dff4b4da1a8f7a40006c9c3"
   dependencies:
-    babel-helper-evaluate-path "^0.2.0"
-    babel-helper-mark-eval-scopes "^0.2.0"
-    babel-helper-remove-or-void "^0.2.0"
+    babel-helper-evaluate-path "^0.4.2"
+    babel-helper-mark-eval-scopes "^0.4.2"
+    babel-helper-remove-or-void "^0.4.2"
     lodash.some "^4.6.0"
 
-babel-plugin-minify-flip-comparisons@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.2.0.tgz#0c9c8e93155c8f09dedad8118b634c259f709ef5"
+babel-plugin-minify-flip-comparisons@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.2.tgz#f754a8aa88b7a1b00fb86d7cf468358513a217ad"
   dependencies:
-    babel-helper-is-void-0 "^0.2.0"
+    babel-helper-is-void-0 "^0.4.2"
 
-babel-plugin-minify-guarded-expressions@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.2.0.tgz#8a8c950040fce3e258a12e6eb21eab94ad7235ab"
+babel-plugin-minify-guarded-expressions@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.2.tgz#b47ca0bf89eabbd710531d4c43fa03f2705f1add"
   dependencies:
-    babel-helper-flip-expressions "^0.2.0"
+    babel-helper-flip-expressions "^0.4.2"
 
-babel-plugin-minify-infinity@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.2.0.tgz#30960c615ddbc657c045bb00a1d8eb4af257cf03"
+babel-plugin-minify-infinity@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.2.tgz#fcb5d55fb1d2d51f324ba410801235257a63417f"
 
-babel-plugin-minify-mangle-names@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.2.0.tgz#719892297ff0106a6ec1a4b0fc062f1f8b6a8529"
+babel-plugin-minify-mangle-names@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.4.2.tgz#50f44a141be07152945c2164c7d59cbcf34b497b"
   dependencies:
-    babel-helper-mark-eval-scopes "^0.2.0"
+    babel-helper-mark-eval-scopes "^0.4.2"
 
-babel-plugin-minify-numeric-literals@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.2.0.tgz#5746e851700167a380c05e93f289a7070459a0d1"
+babel-plugin-minify-numeric-literals@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.2.tgz#4a0101957110bd63a304cd86ce8d9205592726c1"
 
-babel-plugin-minify-replace@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.2.0.tgz#3c1f06bc4e6d3e301eacb763edc1be611efc39b0"
+babel-plugin-minify-replace@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.4.2.tgz#0e42dedd46b8b2dfda6d825a034f3956c847f998"
 
-babel-plugin-minify-simplify@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.2.0.tgz#21ceec4857100c5476d7cef121f351156e5c9bc0"
+babel-plugin-minify-simplify@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.4.2.tgz#1bc4f1cc0784295427dff0e2f3b9103ce79229ce"
   dependencies:
-    babel-helper-flip-expressions "^0.2.0"
+    babel-helper-flip-expressions "^0.4.2"
     babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.2.0"
+    babel-helper-to-multiple-sequence-expressions "^0.4.2"
 
-babel-plugin-minify-type-constructors@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.2.0.tgz#7f3b6458be0863cfd59e9985bed6d134aa7a2e17"
+babel-plugin-minify-type-constructors@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.2.tgz#0a2fb314df7d54a9b8f8a2041272ba9c3f7bd73a"
   dependencies:
-    babel-helper-is-void-0 "^0.2.0"
+    babel-helper-is-void-0 "^0.4.2"
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
 
+babel-plugin-syntax-async-generators@^6.5.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a"
+
+babel-plugin-syntax-class-constructor-call@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz#9cb9d39fe43c8600bec8146456ddcbd4e1a76416"
+
+babel-plugin-syntax-class-properties@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+
+babel-plugin-syntax-decorators@^6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+
 babel-plugin-syntax-exponentiation-operator@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
 
+babel-plugin-syntax-export-extensions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz#70a1484f0f9089a4e84ad44bac353c95b9b12721"
+
+babel-plugin-syntax-flow@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
+
 babel-plugin-syntax-jsx@^6.8.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
@@ -1162,7 +2668,15 @@ babel-plugin-syntax-trailing-function-commas@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
 
-babel-plugin-transform-async-to-generator@^6.22.0:
+babel-plugin-transform-async-generator-functions@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-generators "^6.5.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
   dependencies:
@@ -1170,19 +2684,46 @@ babel-plugin-transform-async-to-generator@^6.22.0:
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-arrow-functions@^6.22.0, babel-plugin-transform-es2015-arrow-functions@^6.8.0:
+babel-plugin-transform-class-constructor-call@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz#80dc285505ac067dcb8d6c65e2f6f11ab7765ef9"
+  dependencies:
+    babel-plugin-syntax-class-constructor-call "^6.18.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-class-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
+  dependencies:
+    babel-helper-explode-class "^6.24.1"
+    babel-plugin-syntax-decorators "^6.13.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0, babel-plugin-transform-es2015-block-scoped-functions@^6.8.0:
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.18.0, babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1:
+babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
   dependencies:
@@ -1192,7 +2733,7 @@ babel-plugin-transform-es2015-block-scoping@^6.18.0, babel-plugin-transform-es20
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-plugin-transform-es2015-classes@^6.18.0, babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1:
+babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
   dependencies:
@@ -1206,33 +2747,33 @@ babel-plugin-transform-es2015-classes@^6.18.0, babel-plugin-transform-es2015-cla
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.24.1, babel-plugin-transform-es2015-computed-properties@^6.8.0:
+babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
   dependencies:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-destructuring@^6.19.0, babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0:
+babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.24.1, babel-plugin-transform-es2015-duplicate-keys@^6.8.0:
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-for-of@^6.18.0, babel-plugin-transform-es2015-for-of@^6.22.0, babel-plugin-transform-es2015-for-of@^6.23.0:
+babel-plugin-transform-es2015-for-of@^6.22.0, babel-plugin-transform-es2015-for-of@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.24.1, babel-plugin-transform-es2015-function-name@^6.9.0:
+babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
   dependencies:
@@ -1240,7 +2781,7 @@ babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es20
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-literals@^6.22.0, babel-plugin-transform-es2015-literals@^6.8.0:
+babel-plugin-transform-es2015-literals@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
   dependencies:
@@ -1279,14 +2820,14 @@ babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.24.1, babel-plugin-transform-es2015-object-super@^6.8.0:
+babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
   dependencies:
     babel-helper-replace-supers "^6.24.1"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@^6.18.0, babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1:
+babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
   dependencies:
@@ -1297,20 +2838,20 @@ babel-plugin-transform-es2015-parameters@^6.18.0, babel-plugin-transform-es2015-
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-shorthand-properties@^6.18.0, babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
   dependencies:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-spread@^6.22.0, babel-plugin-transform-es2015-spread@^6.8.0:
+babel-plugin-transform-es2015-spread@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.24.1, babel-plugin-transform-es2015-sticky-regex@^6.8.0:
+babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
   dependencies:
@@ -1318,19 +2859,19 @@ babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es201
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-template-literals@^6.22.0, babel-plugin-transform-es2015-template-literals@^6.8.0:
+babel-plugin-transform-es2015-template-literals@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-typeof-symbol@^6.18.0, babel-plugin-transform-es2015-typeof-symbol@^6.22.0, babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
+babel-plugin-transform-es2015-typeof-symbol@^6.22.0, babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-unicode-regex@^6.11.0, babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.24.1:
+babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
   dependencies:
@@ -1338,7 +2879,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.11.0, babel-plugin-transform-es20
     babel-runtime "^6.22.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-exponentiation-operator@^6.22.0:
+babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
   dependencies:
@@ -1346,32 +2887,46 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-inline-consecutive-adds@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.2.0.tgz#15dae78921057f4004f8eafd79e15ddc5f12f426"
+babel-plugin-transform-export-extensions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz#53738b47e75e8218589eea946cbbd39109bbe653"
+  dependencies:
+    babel-plugin-syntax-export-extensions "^6.8.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-member-expression-literals@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.8.5.tgz#e06ae305cf48d819822e93a70d79269f04d89eec"
+babel-plugin-transform-flow-strip-types@^6.8.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
+  dependencies:
+    babel-plugin-syntax-flow "^6.18.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-merge-sibling-variables@^6.8.6:
-  version "6.8.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.8.6.tgz#6d21efa5ee4981f71657fae716f9594bb2622aef"
+babel-plugin-transform-inline-consecutive-adds@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.2.tgz#98dba9acc3b73b1c59214ba69a3200c41870c3e9"
 
-babel-plugin-transform-minify-booleans@^6.8.3:
-  version "6.8.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.8.3.tgz#5906ed776d3718250519abf1bace44b0b613ddf9"
+babel-plugin-transform-member-expression-literals@^6.10.0-alpha.caaefb4c:
+  version "6.10.0-alpha.f95869d4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.10.0-alpha.f95869d4.tgz#272ebd2a2d4341b86c24dcd84374ae5aa3702874"
 
-babel-plugin-transform-object-rest-spread@^6.26.0:
+babel-plugin-transform-merge-sibling-variables@^6.10.0-alpha.caaefb4c:
+  version "6.10.0-alpha.f95869d4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.10.0-alpha.f95869d4.tgz#48a330d28293e318d07175c260c74859e7398b43"
+
+babel-plugin-transform-minify-booleans@^6.10.0-alpha.caaefb4c:
+  version "6.10.0-alpha.f95869d4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.10.0-alpha.f95869d4.tgz#1deef69c22135038a91de1f5d13d759e3464c43c"
+
+babel-plugin-transform-object-rest-spread@^6.22.0, babel-plugin-transform-object-rest-spread@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.26.0"
 
-babel-plugin-transform-property-literals@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.8.5.tgz#67ed5930b34805443452c8b9690c7ebe1e206c40"
+babel-plugin-transform-property-literals@^6.10.0-alpha.caaefb4c:
+  version "6.10.0-alpha.f95869d4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.10.0-alpha.f95869d4.tgz#37127aaa04125c3d08bf95cdb5a8f1d2e44ca453"
   dependencies:
     esutils "^2.0.2"
 
@@ -1383,33 +2938,33 @@ babel-plugin-transform-react-jsx@^6.24.1:
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-regenerator@^6.16.1, babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1:
+babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
   dependencies:
     regenerator-transform "^0.10.0"
 
-babel-plugin-transform-regexp-constructors@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.2.0.tgz#6aa5dd0acc515db4be929bbcec4ed4c946c534a3"
+babel-plugin-transform-regexp-constructors@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.2.tgz#455ee632ff70d0deecf34a1758cb74d3fb8b47f4"
 
-babel-plugin-transform-remove-console@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.5.tgz#fde9d2d3d725530b0fadd8d31078402410386810"
+babel-plugin-transform-remove-console@^6.10.0-alpha.caaefb4c:
+  version "6.10.0-alpha.f95869d4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.10.0-alpha.f95869d4.tgz#c5717af9f76918b2821cfaef44d8245d4ea9422c"
 
-babel-plugin-transform-remove-debugger@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.8.5.tgz#809584d412bf918f071fdf41e1fdb15ea89cdcd5"
+babel-plugin-transform-remove-debugger@^6.10.0-alpha.caaefb4c:
+  version "6.10.0-alpha.f95869d4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.10.0-alpha.f95869d4.tgz#1fc35c29c7c0878cf30e558a733651906e888e44"
 
-babel-plugin-transform-remove-undefined@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.2.0.tgz#94f052062054c707e8d094acefe79416b63452b1"
+babel-plugin-transform-remove-undefined@^0.4.0-alpha.caaefb4c:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.4.2.tgz#d7e038a08d60222773ca4e33c007946e3b06e865"
   dependencies:
-    babel-helper-evaluate-path "^0.2.0"
+    babel-helper-evaluate-path "^0.4.2"
 
-babel-plugin-transform-simplify-comparison-operators@^6.8.5:
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.8.5.tgz#a838786baf40cc33a93b95ae09e05591227e43bf"
+babel-plugin-transform-simplify-comparison-operators@^6.10.0-alpha.caaefb4c:
+  version "6.10.0-alpha.f95869d4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.10.0-alpha.f95869d4.tgz#f5499a6dc3ed686bda53363866b67dda774c5bed"
 
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
@@ -1418,9 +2973,9 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-undefined-to-void@^6.8.3:
-  version "6.8.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.3.tgz#fc52707f6ee1ddc71bb91b0d314fbefdeef9beb4"
+babel-plugin-transform-undefined-to-void@^6.10.0-alpha.caaefb4c:
+  version "6.10.0-alpha.f95869d4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.10.0-alpha.f95869d4.tgz#175a1a3090e616403f8c819cdcea1aecb66523b2"
 
 babel-preset-env@^1.6.1:
   version "1.6.1"
@@ -1457,7 +3012,7 @@ babel-preset-env@^1.6.1:
     invariant "^2.2.2"
     semver "^5.3.0"
 
-babel-preset-es2015@^6.18.0:
+babel-preset-es2015@^6.9.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
   dependencies:
@@ -1486,35 +3041,62 @@ babel-preset-es2015@^6.18.0:
     babel-plugin-transform-es2015-unicode-regex "^6.24.1"
     babel-plugin-transform-regenerator "^6.24.1"
 
-babel-preset-minify@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.2.0.tgz#006566552d9b83834472273f306c0131062a0acc"
+babel-preset-minify@=0.4.0-alpha.caaefb4c:
+  version "0.4.0-alpha.caaefb4c"
+  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.4.0-alpha.caaefb4c.tgz#a5052c5955dd97d24699b281fda9a302ea8c1871"
   dependencies:
-    babel-plugin-minify-builtins "^0.2.0"
-    babel-plugin-minify-constant-folding "^0.2.0"
-    babel-plugin-minify-dead-code-elimination "^0.2.0"
-    babel-plugin-minify-flip-comparisons "^0.2.0"
-    babel-plugin-minify-guarded-expressions "^0.2.0"
-    babel-plugin-minify-infinity "^0.2.0"
-    babel-plugin-minify-mangle-names "^0.2.0"
-    babel-plugin-minify-numeric-literals "^0.2.0"
-    babel-plugin-minify-replace "^0.2.0"
-    babel-plugin-minify-simplify "^0.2.0"
-    babel-plugin-minify-type-constructors "^0.2.0"
-    babel-plugin-transform-inline-consecutive-adds "^0.2.0"
-    babel-plugin-transform-member-expression-literals "^6.8.5"
-    babel-plugin-transform-merge-sibling-variables "^6.8.6"
-    babel-plugin-transform-minify-booleans "^6.8.3"
-    babel-plugin-transform-property-literals "^6.8.5"
-    babel-plugin-transform-regexp-constructors "^0.2.0"
-    babel-plugin-transform-remove-console "^6.8.5"
-    babel-plugin-transform-remove-debugger "^6.8.5"
-    babel-plugin-transform-remove-undefined "^0.2.0"
-    babel-plugin-transform-simplify-comparison-operators "^6.8.5"
-    babel-plugin-transform-undefined-to-void "^6.8.3"
+    babel-plugin-minify-builtins "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-constant-folding "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-dead-code-elimination "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-flip-comparisons "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-guarded-expressions "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-infinity "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-mangle-names "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-numeric-literals "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-replace "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-simplify "^0.4.0-alpha.caaefb4c"
+    babel-plugin-minify-type-constructors "^0.4.0-alpha.caaefb4c"
+    babel-plugin-transform-inline-consecutive-adds "^0.4.0-alpha.caaefb4c"
+    babel-plugin-transform-member-expression-literals "^6.10.0-alpha.caaefb4c"
+    babel-plugin-transform-merge-sibling-variables "^6.10.0-alpha.caaefb4c"
+    babel-plugin-transform-minify-booleans "^6.10.0-alpha.caaefb4c"
+    babel-plugin-transform-property-literals "^6.10.0-alpha.caaefb4c"
+    babel-plugin-transform-regexp-constructors "^0.4.0-alpha.caaefb4c"
+    babel-plugin-transform-remove-console "^6.10.0-alpha.caaefb4c"
+    babel-plugin-transform-remove-debugger "^6.10.0-alpha.caaefb4c"
+    babel-plugin-transform-remove-undefined "^0.4.0-alpha.caaefb4c"
+    babel-plugin-transform-simplify-comparison-operators "^6.10.0-alpha.caaefb4c"
+    babel-plugin-transform-undefined-to-void "^6.10.0-alpha.caaefb4c"
     lodash.isplainobject "^4.0.6"
 
-babel-register@^6.26.0:
+babel-preset-stage-1@^6.5.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz#7692cd7dcd6849907e6ae4a0a85589cfb9e2bfb0"
+  dependencies:
+    babel-plugin-transform-class-constructor-call "^6.24.1"
+    babel-plugin-transform-export-extensions "^6.22.0"
+    babel-preset-stage-2 "^6.24.1"
+
+babel-preset-stage-2@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
+  dependencies:
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babel-plugin-transform-class-properties "^6.24.1"
+    babel-plugin-transform-decorators "^6.24.1"
+    babel-preset-stage-3 "^6.24.1"
+
+babel-preset-stage-3@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
+  dependencies:
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-generator-functions "^6.24.1"
+    babel-plugin-transform-async-to-generator "^6.24.1"
+    babel-plugin-transform-exponentiation-operator "^6.24.1"
+    babel-plugin-transform-object-rest-spread "^6.22.0"
+
+babel-register@^6.26.0, babel-register@^6.9.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
   dependencies:
@@ -1566,7 +3148,19 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@^6.17.4, babylon@^6.18.0:
+babylon@7.0.0-beta.35:
+  version "7.0.0-beta.35"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.35.tgz#9f9e609ed50c28d4333f545b373a381b47e9e6ed"
+
+babylon@7.0.0-beta.44:
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
+
+babylon@7.0.0-beta.46, babylon@^7.0.0-beta.30, babylon@^7.0.0-beta.42:
+  version "7.0.0-beta.46"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.46.tgz#b6ddaba81bbb130313932757ff9c195d527088b6"
+
+babylon@^6.17.3, babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
 
@@ -1586,10 +3180,26 @@ base64-js@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
 
+base64-js@^1.0.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
 
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
@@ -1606,6 +3216,10 @@ better-assert@~1.0.0:
   dependencies:
     callsite "1.0.0"
 
+big.js@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+
 binary-extensions@^1.0.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
@@ -1614,6 +3228,10 @@ binary-extensions@^1.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.0.0.tgz#e597d1a7a6a3558a2d1c7241a16c99965e6aa40f"
 
+binaryextensions@2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz#3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"
+
 bl@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
@@ -1634,6 +3252,14 @@ bluebird@^2.9.25:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
+bluebird@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+
 body-parser@1.18.2, body-parser@^1.17.2:
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
@@ -1667,6 +3293,16 @@ boom@5.x.x:
   dependencies:
     hoek "4.x.x"
 
+bower-config@^1.4.0, bower-config@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.1.tgz#85fd9df367c2b8dbbd0caa4c5f2bad40cd84c2cc"
+  dependencies:
+    graceful-fs "^4.1.3"
+    mout "^1.0.0"
+    optimist "^0.6.1"
+    osenv "^0.1.3"
+    untildify "^2.1.0"
+
 bower-json@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/bower-json/-/bower-json-0.8.1.tgz#96c14723241ae6466a9c52e16caa32623a883843"
@@ -1680,11 +3316,7 @@ bower-logger@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/bower-logger/-/bower-logger-0.2.2.tgz#39be07e979b2fc8e03a94634205ed9422373d381"
 
-bower@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.0.tgz#55dbebef0ad9155382d9e9d3e497c1372345b44a"
-
-bower@^1.8.2:
+bower@1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.2.tgz#adf53529c8d4af02ef24fb8d5341c1419d33e2f7"
 
@@ -1736,23 +3368,94 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-browser-capabilities@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browser-capabilities/-/browser-capabilities-0.2.0.tgz#5fc2cff65bc9f40ec6903d574d965e9e1f10a581"
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  dependencies:
+    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"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+
+browser-capabilities@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/browser-capabilities/-/browser-capabilities-1.1.0.tgz#be061a21e40ce3fefa51a9b2cb3962fe060dd3de"
   dependencies:
     "@types/ua-parser-js" "^0.7.31"
-    ua-parser-js "^0.7.14"
+    ua-parser-js "^0.7.15"
 
 browser-stdout@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
 
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c"
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
 browserify-zlib@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
   dependencies:
     pako "~0.2.0"
 
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  dependencies:
+    pako "~1.0.5"
+
 browserslist@^2.1.2:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
@@ -1770,10 +3473,30 @@ buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
+buffer-from@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+
+buffer@^4.3.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
 builtin-modules@^1.0.0, builtin-modules@^1.1.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+
 bulk-require@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/bulk-require/-/bulk-require-0.2.1.tgz#f118d7833118b0a1a20b465b136d9db513479d25"
@@ -1795,6 +3518,54 @@ bytes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
 
+cacache@^10.0.4:
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  dependencies:
+    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"
+    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"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cacheable-request@^2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  dependencies:
+    clone-response "1.0.2"
+    get-stream "3.0.0"
+    http-cache-semantics "3.8.1"
+    keyv "3.0.0"
+    lowercase-keys "1.0.0"
+    normalize-url "2.0.1"
+    responselike "1.0.2"
+
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -1838,10 +3609,16 @@ camelcase@^2.0.0, camelcase@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
-camelcase@^4.0.0:
+camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
+cancel-token@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/cancel-token/-/cancel-token-0.1.1.tgz#c18197674bb1c84c1d6933ebf15d8d5a5ce79b4f"
+  dependencies:
+    "@types/node" "^4.0.30"
+
 caniuse-lite@^1.0.30000792:
   version "1.0.30000792"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332"
@@ -1904,13 +3681,13 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
-    ansi-styles "^3.2.0"
+    ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
-    supports-color "^5.2.0"
+    supports-color "^5.3.0"
 
 chalk@^2.0.1:
   version "2.3.0"
@@ -1957,6 +3734,33 @@ charenc@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
 
+chart.js@^2.7.2, chart.js@~2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.2.tgz#3c9fde4dc5b95608211bdefeda7e5d33dffa5714"
+  dependencies:
+    chartjs-color "^2.1.0"
+    moment "^2.10.2"
+
+chartjs-chart-timeline@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/chartjs-chart-timeline/-/chartjs-chart-timeline-0.2.0.tgz#f16462311f23c0596632fb2ecab9ae41ed27e571"
+  dependencies:
+    chart.js "^2.7.2"
+    moment "^2.22.0"
+
+chartjs-color-string@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
+  dependencies:
+    color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
+  dependencies:
+    chartjs-color-string "^0.5.0"
+    color-convert "^0.5.3"
+
 check-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -1976,10 +3780,39 @@ chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.0"
+  optionalDependencies:
+    fsevents "^1.1.2"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
 
+chrome-trace-event@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz#d395af2d31c87b90a716c831fe326f69768ec084"
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
 circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
@@ -1990,6 +3823,15 @@ class-extend@^0.1.0:
   dependencies:
     object-assign "^2.0.0"
 
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
 clean-css@3.4.x:
   version "3.4.28"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
@@ -2003,10 +3845,6 @@ clean-css@4.1.x:
   dependencies:
     source-map "0.5.x"
 
-cleankill@^1.0.0, cleankill@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cleankill/-/cleankill-1.0.3.tgz#e7419bd24abc07f2d182d3a09a935c1bcdede6bd"
-
 cleankill@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/cleankill/-/cleankill-2.0.0.tgz#59830dfc8b411d53dc72ad09d45a78ea33161a91"
@@ -2015,7 +3853,7 @@ cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
 
-cli-cursor@^1.0.1:
+cli-cursor@^1.0.1, cli-cursor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
   dependencies:
@@ -2027,12 +3865,23 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-spinners@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
+
 cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
   dependencies:
     colors "1.0.3"
 
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -2045,10 +3894,24 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
 
+clone-response@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  dependencies:
+    mimic-response "^1.0.0"
+
 clone-stats@^0.0.1, clone-stats@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
@@ -2089,13 +3952,24 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
+
 color-convert@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
     color-name "^1.1.1"
 
-color-name@^1.1.1:
+color-name@^1.0.0, color-name@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
@@ -2107,6 +3981,10 @@ colors@1.0.3, colors@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
+colors@^1.1.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.4.tgz#e0cb41d3e4b20806b3bfc27f4559f01b94bc2f7c"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -2143,9 +4021,9 @@ commander@2.11.0, commander@2.11.x, commander@^2.9.0, commander@~2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
-commander@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
+commander@2.15.x, commander@~2.15.0:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
 commander@2.8.x:
   version "2.8.1"
@@ -2167,10 +4045,6 @@ commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
 
-commander@~2.15.0:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -2179,11 +4053,7 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
-component-emitter@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
-
-component-emitter@1.2.1:
+component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
@@ -2230,7 +4100,7 @@ concat-stream@1.5.x:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@^1.4.7, concat-stream@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -2238,6 +4108,15 @@ concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat-stream@^1.6.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 configstore@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-2.1.0.tgz#737a3a7036e9886102aa6099e47bb33ab1aba1a1"
@@ -2263,6 +4142,12 @@ configstore@^3.0.0:
     write-file-atomic "^2.0.0"
     xdg-basedir "^3.0.0"
 
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  dependencies:
+    date-now "^0.1.4"
+
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -2274,6 +4159,10 @@ constant-case@^1.1.0:
     snake-case "^1.1.0"
     upper-case "^1.1.1"
 
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+
 contains-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
@@ -2286,6 +4175,10 @@ content-type@^1.0.2, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
+convert-source-map@^1.1.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
 convert-source-map@^1.1.1, convert-source-map@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
@@ -2298,6 +4191,21 @@ cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
 
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
@@ -2325,12 +4233,40 @@ crc@^3.4.4:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
 
+create-ecdh@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
 create-error-class@^3.0.0, create-error-class@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
   dependencies:
     capture-stack-trace "^1.0.0"
 
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
 cross-spawn@^5.0.1, cross-spawn@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2339,6 +4275,16 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 crypt@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
@@ -2355,19 +4301,26 @@ cryptiles@3.x.x:
   dependencies:
     boom "5.x.x"
 
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
 
-css-slam@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/css-slam/-/css-slam-1.2.1.tgz#2467e5aecb7e989bd04f656011dd1cf8eb3e7165"
-  dependencies:
-    command-line-args "^3.0.1"
-    command-line-usage "^3.0.5"
-    dom5 "^1.3.1"
-    shady-css-parser "0.0.8"
-
 css-slam@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/css-slam/-/css-slam-2.0.2.tgz#356ab778cae1a777f35842e7192d5f279cd0153a"
@@ -2378,10 +4331,28 @@ css-slam@^2.0.2:
     parse5 "^2.2.3"
     shady-css-parser "^0.1.0"
 
+css-slam@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/css-slam/-/css-slam-2.1.1.tgz#455da20958caddbe35a9fc2999f5aab4a4681dfe"
+  dependencies:
+    command-line-args "^3.0.1"
+    command-line-usage "^3.0.5"
+    dom5 "^3.0.0"
+    parse5 "^4.0.0"
+    shady-css-parser "^0.1.0"
+
+css-what@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+
 cssbeautify@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cssbeautify/-/cssbeautify-0.3.1.tgz#12dd1f734035c2e6faca67dcbdcef74e42811397"
 
+cssfilter@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -2392,6 +4363,10 @@ cycle@1.0.x:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2"
 
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+
 dargs@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829"
@@ -2402,6 +4377,14 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+date-fns@^1.27.2:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+
 dateformat@^1.0.7-1.2.3:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9"
@@ -2413,31 +4396,23 @@ dateformat@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
 
-debug@2, debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
+dateformat@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+
+debug@2, debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@^2.1.2, debug@^2.3.3, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
-debug@2.2.0, debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
-debug@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
-  dependencies:
-    ms "0.7.2"
-
 debug@2.6.8, debug@^2.2.0, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@^3.1.0:
+debug@3.1.0, debug@^3.0.0, debug@^3.0.1, debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
@@ -2449,10 +4424,26 @@ debug@~2.1.1:
   dependencies:
     ms "0.7.0"
 
-decamelize@^1.0.0, decamelize@^1.1.2:
+debug@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+
+decompress-response@^3.2.0, decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  dependencies:
+    mimic-response "^1.0.0"
+
 deep-eql@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
@@ -2469,6 +4460,10 @@ deep-extend@^0.4.0, deep-extend@~0.4.0, deep-extend@~0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
+deep-extend@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f"
+
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -2486,7 +4481,26 @@ define-properties@^1.1.2:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
-del@^2.0.2, del@^2.2.2:
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+del@^2.0.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
   dependencies:
@@ -2533,6 +4547,13 @@ deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
 
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
 destroy@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.3.tgz#b433b4724e71fd8551d9885174851c5fc377e2c9"
@@ -2551,6 +4572,10 @@ detect-file@^0.1.0:
   dependencies:
     fs-exists-sync "^0.1.0"
 
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -2588,6 +4613,25 @@ diff@^3.1.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
 
+diff@^3.3.1, diff@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -2614,17 +4658,7 @@ dom-urls@^1.1.0:
   dependencies:
     urijs "^1.16.1"
 
-dom5@^1.3.1:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/dom5/-/dom5-1.3.6.tgz#a7088a9fc5f3b08dc9f6eda4c7abaeb241945e0d"
-  dependencies:
-    "@types/clone" "^0.1.29"
-    "@types/node" "^4.0.30"
-    "@types/parse5" "^0.0.31"
-    clone "^1.0.2"
-    parse5 "^1.4.1"
-
-dom5@^2.0.0, dom5@^2.0.1, dom5@^2.1.0, dom5@^2.2.0, dom5@^2.3.0:
+dom5@^2.0.1, dom5@^2.1.0, dom5@^2.2.0, dom5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/dom5/-/dom5-2.3.0.tgz#f8204975bd0dacbbe5b58a8a93ffc1fed0ffcd2a"
   dependencies:
@@ -2634,6 +4668,18 @@ dom5@^2.0.0, dom5@^2.0.1, dom5@^2.1.0, dom5@^2.2.0, dom5@^2.3.0:
     clone "^2.1.0"
     parse5 "^2.2.2"
 
+dom5@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/dom5/-/dom5-3.0.0.tgz#77a36871751cf6344bcd1859ab20304e628425a1"
+  dependencies:
+    "@types/parse5" "^2.2.32"
+    clone "^2.1.0"
+    parse5 "^4.0.0"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+
 domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
@@ -2702,6 +4748,15 @@ duplexify@^3.1.2, duplexify@^3.2.0, duplexify@^3.5.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
+duplexify@^3.4.2:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -2712,6 +4767,10 @@ editions@^1.1.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.3.tgz#0907101bdda20fac3cbe334c27cbd0688dc99a5b"
 
+editions@^1.3.3:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
+
 ee-first@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.0.tgz#6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"
@@ -2724,10 +4783,38 @@ ejs@^2.3.1:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
+ejs@^2.5.9:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
+
 electron-to-chromium@^1.3.30:
   version "1.3.32"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz#11d0684c0840e003c4be8928f8ac5f35dbc2b4e6"
 
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+
+elliptic@^6.0.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emitter-component@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.1.1.tgz#065e2dbed6959bf470679edabeaf7981d1003ab6"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
 encodeurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
@@ -2754,23 +4841,6 @@ ends-with@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a"
 
-engine.io-client@~1.8.4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.4.tgz#9fe85dee25853ca6babe25bd2ad68710863e91c2"
-  dependencies:
-    component-emitter "1.2.1"
-    component-inherit "0.0.3"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parsejson "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    ws "1.1.2"
-    xmlhttprequest-ssl "1.5.3"
-    yeast "0.1.2"
-
 engine.io-client@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.3.tgz#d705e48985dfe8b54a98c9f77052b8b08258be05"
@@ -2787,17 +4857,6 @@ engine.io-client@~3.1.0:
     xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
-engine.io-parser@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.2.tgz#937b079f0007d0893ec56d46cb220b8cb435220a"
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "0.0.6"
-    base64-arraybuffer "0.1.5"
-    blob "0.0.4"
-    has-binary "0.1.7"
-    wtf-8 "1.0.0"
-
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.1.tgz#e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668"
@@ -2808,17 +4867,6 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
     blob "0.0.4"
     has-binary2 "~1.0.2"
 
-engine.io@~1.8.4:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.4.tgz#77bce12b80e5d60429337fec3b0daf691ebc9003"
-  dependencies:
-    accepts "1.3.3"
-    base64id "1.0.0"
-    cookie "0.3.1"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
-    ws "1.1.4"
-
 engine.io@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.3.tgz#7aecf71bf8a310f9fa21461999c4fcc035f8a877"
@@ -2832,11 +4880,29 @@ engine.io@~3.1.0:
   optionalDependencies:
     uws "~0.14.4"
 
+enhanced-resolve@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    tapable "^1.0.0"
+
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-error-ex@^1.2.0:
+envinfo@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-4.4.2.tgz#472c49f3a8b9bca73962641ce7cb692bf623cd1c"
+
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  dependencies:
+    prr "~1.0.1"
+
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
@@ -2883,11 +4949,11 @@ escape-html@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.1.tgz#181a286ead397a39a92857cfb1d43052e356bff0"
 
-escape-html@~1.0.3:
+escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
@@ -2922,12 +4988,6 @@ eslint-module-utils@^2.1.1:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
-eslint-plugin-html@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-html/-/eslint-plugin-html-4.0.2.tgz#0e56149e42c2ffc3f0df6261a8bb96b1a9f2280d"
-  dependencies:
-    htmlparser2 "^3.8.2"
-
 eslint-plugin-import@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894"
@@ -2956,7 +5016,7 @@ eslint-restricted-globals@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"
 
-eslint-scope@^3.7.1:
+eslint-scope@^3.7.1, eslint-scope@~3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
   dependencies:
@@ -2968,8 +5028,8 @@ eslint-visitor-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
 eslint@^4.11.0:
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.17.0.tgz#dc24bb51ede48df629be7031c71d9dc0ee4f3ddf"
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
   dependencies:
     ajv "^5.3.0"
     babel-code-frame "^6.22.0"
@@ -2980,7 +5040,7 @@ eslint@^4.11.0:
     doctrine "^2.1.0"
     eslint-scope "^3.7.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^3.5.2"
+    espree "^3.5.4"
     esquery "^1.0.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
@@ -3002,11 +5062,12 @@ eslint@^4.11.0:
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
+    regexpp "^1.0.1"
     require-uncached "^1.0.3"
     semver "^5.3.0"
     strip-ansi "^4.0.0"
     strip-json-comments "~2.0.1"
-    table "^4.0.1"
+    table "4.0.2"
     text-table "~0.2.0"
 
 espree@^3.1.7, espree@^3.4.0:
@@ -3016,33 +5077,32 @@ espree@^3.1.7, espree@^3.4.0:
     acorn "^5.1.1"
     acorn-jsx "^3.0.0"
 
-espree@^3.5.2:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.3.tgz#931e0af64e7fbbed26b050a29daad1fc64799fa6"
+espree@^3.5.2, espree@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
-    acorn "^5.4.0"
+    acorn "^5.5.0"
     acorn-jsx "^3.0.0"
 
 esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
 esquery@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
   dependencies:
     estraverse "^4.1.0"
-    object-assign "^4.0.1"
 
 estraverse@^1.9.1:
   version "1.9.3"
@@ -3098,6 +5158,17 @@ eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
 
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -3120,6 +5191,18 @@ expand-brackets@^0.1.4:
   dependencies:
     is-posix-bracket "^0.1.0"
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  dependencies:
+    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"
+
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
@@ -3132,7 +5215,7 @@ expand-tilde@^1.2.2:
   dependencies:
     os-homedir "^1.0.1"
 
-expand-tilde@^2.0.2:
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
   dependencies:
@@ -3200,7 +5283,7 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
-extend-shallow@^3.0.2:
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
   dependencies:
@@ -3219,9 +5302,9 @@ external-editor@^1.1.0:
     spawn-sync "^1.0.15"
     tmp "^0.0.29"
 
-external-editor@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+external-editor@^2.0.4, external-editor@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   dependencies:
     chardet "^0.4.0"
     iconv-lite "^0.4.17"
@@ -3233,6 +5316,19 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  dependencies:
+    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"
+
 extsprintf@1.3.0, extsprintf@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -3250,8 +5346,22 @@ fancy-log@^1.1.0, fancy-log@^1.3.2:
     time-stamp "^1.0.0"
 
 fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+
+fast-glob@^2.0.2:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.1.tgz#686c2345be88f3741e174add0be6f2e5b6078889"
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.1"
+    micromatch "^3.1.10"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -3285,11 +5395,11 @@ feature-detect-es6@^1.3.1:
   dependencies:
     array-back "^1.0.3"
 
-fecha@^2.3.3:
+fecha@^2.3.3, "fecha@https://github.com/balloob/fecha/archive/51d14fd0eb4781e2ecf265d1c3080706259133b5.tar.gz":
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
+  resolved "https://github.com/balloob/fecha/archive/51d14fd0eb4781e2ecf265d1c3080706259133b5.tar.gz#bfb1e49121dd7821601af35faf4fe93dbd19200a"
 
-figures@^1.3.5:
+figures@^1.3.5, figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
   dependencies:
@@ -3323,6 +5433,15 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
 filled-array@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/filled-array/-/filled-array-1.1.0.tgz#c3c4f6c663b923459a9aa29912d2d031f1507f84"
@@ -3339,6 +5458,14 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+find-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.0.0"
+
 find-index@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
@@ -3369,7 +5496,7 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-findup-sync@^0.4.2, findup-sync@^0.4.3:
+findup-sync@^0.4.2:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
   dependencies:
@@ -3378,14 +5505,14 @@ findup-sync@^0.4.2, findup-sync@^0.4.3:
     micromatch "^2.3.7"
     resolve-dir "^0.1.0"
 
-findup-sync@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-1.0.0.tgz#6f7e4b57b6ee3a4037b4414eaedea3f58f71e0ec"
+findup-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
   dependencies:
-    detect-file "^0.1.0"
-    is-glob "^2.0.1"
-    micromatch "^2.3.7"
-    resolve-dir "^0.1.0"
+    detect-file "^1.0.0"
+    is-glob "^3.1.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
 
 fined@^1.0.1:
   version "1.1.0"
@@ -3420,6 +5547,17 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
+flow-parser@^0.*:
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.72.0.tgz#6c8041e76ac7d0be1a71ce29c00cd1435fb6013c"
+
+flush-write-stream@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.4"
+
 follow-redirects@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-0.0.7.tgz#34b90bab2a911aa347571da90f22bd36ecd8a919"
@@ -3427,7 +5565,7 @@ follow-redirects@0.0.7:
     debug "^2.2.0"
     stream-consume "^0.1.0"
 
-for-in@^1.0.1:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
@@ -3487,6 +5625,12 @@ forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  dependencies:
+    map-cache "^0.2.2"
+
 freeport@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/freeport/-/freeport-1.0.5.tgz#255e8ab84170c33ba85d990e821ae5f4a1a9bc5d"
@@ -3503,6 +5647,13 @@ fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
 
+from2@^2.1.0, from2@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
 from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
@@ -3511,6 +5662,21 @@ fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -3522,6 +5688,13 @@ fsevents@^1.0.0:
     nan "^2.3.0"
     node-pre-gyp "^0.6.36"
 
+fsevents@^1.1.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.3.tgz#08292982e7059f6674c93d8b829c1e8604979ac0"
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.9.0"
+
 fstream-ignore@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
@@ -3576,6 +5749,10 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
+get-caller-file@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+
 get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
@@ -3584,10 +5761,14 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
-get-stream@^3.0.0:
+get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -3601,12 +5782,25 @@ gh-got@^5.0.0:
     got "^6.2.0"
     is-plain-obj "^1.1.0"
 
+gh-got@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-6.0.0.tgz#d74353004c6ec466647520a10bd46f7299d268d0"
+  dependencies:
+    got "^7.0.0"
+    is-plain-obj "^1.1.0"
+
 github-username@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/github-username/-/github-username-3.0.0.tgz#0a772219b3130743429f2456d0bdd3db55dce7b1"
   dependencies:
     gh-got "^5.0.0"
 
+github-username@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/github-username/-/github-username-4.1.0.tgz#cbe280041883206da4212ae9e4b5f169c30bf417"
+  dependencies:
+    gh-got "^6.0.0"
+
 github@^7.2.1:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/github/-/github-7.3.2.tgz#fe10cde6964352c5d91e11a7616d26d5ffb6f87b"
@@ -3616,6 +5810,13 @@ github@^7.2.1:
     mime "^1.2.11"
     netrc "^0.1.4"
 
+glob-all@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab"
+  dependencies:
+    glob "^7.0.5"
+    yargs "~1.2.6"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -3629,7 +5830,7 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob-parent@^3.0.0:
+glob-parent@^3.0.0, glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
   dependencies:
@@ -3660,6 +5861,10 @@ glob-stream@^5.3.2:
     to-absolute-glob "^0.1.1"
     unique-stream "^2.0.2"
 
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+
 glob-watcher@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
@@ -3751,6 +5956,14 @@ global-modules@^0.2.3:
     global-prefix "^0.1.4"
     is-windows "^0.2.0"
 
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
 global-prefix@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
@@ -3760,9 +5973,23 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
-globals@^11.0.1:
-  version "11.3.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0"
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+globals@^10.0.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
+
+globals@^11.0.1, globals@^11.1.0:
+  version "11.5.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.5.0.tgz#6bc840de6771173b191f13d3a9c94d441ee92642"
 
 globals@^9.18.0:
   version "9.18.0"
@@ -3800,6 +6027,18 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^8.0.0, globby@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    fast-glob "^2.0.2"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 globule@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
@@ -3850,6 +6089,47 @@ got@^6.2.0, got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
+got@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
+  dependencies:
+    decompress-response "^3.2.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-plain-obj "^1.1.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    p-cancelable "^0.3.0"
+    p-timeout "^1.1.1"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
+    url-parse-lax "^1.0.0"
+    url-to-options "^1.0.1"
+
+got@^8.2.0:
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/got/-/got-8.3.1.tgz#093324403d4d955f5a16a7a8d39955d055ae10ed"
+  dependencies:
+    "@sindresorhus/is" "^0.7.0"
+    cacheable-request "^2.1.1"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    into-stream "^3.1.0"
+    is-retry-allowed "^1.1.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    mimic-response "^1.0.0"
+    p-cancelable "^0.4.0"
+    p-timeout "^2.0.1"
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+    timed-out "^4.0.1"
+    url-parse-lax "^3.0.0"
+    url-to-options "^1.0.1"
+
 graceful-fs@^3.0.0:
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
@@ -3868,7 +6148,7 @@ graceful-fs@~1.2.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
-grouped-queue@^0.3.0:
+grouped-queue@^0.3.0, grouped-queue@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/grouped-queue/-/grouped-queue-0.3.3.tgz#c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"
   dependencies:
@@ -3949,7 +6229,7 @@ gulp-html-minifier@^0.1.8:
     html-minifier "^1.1.1"
     htmllint "^0.2.7"
 
-gulp-if@^2.0.0, gulp-if@^2.0.2:
+gulp-if@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/gulp-if/-/gulp-if-2.0.2.tgz#a497b7e7573005041caa2bc8b7dda3c80444d629"
   dependencies:
@@ -4166,12 +6446,6 @@ has-binary2@~1.0.2:
   dependencies:
     isarray "2.0.1"
 
-has-binary@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.7.tgz#68e61eb16210c9545a0a5cce06a873912fe1e68c"
-  dependencies:
-    isarray "0.0.1"
-
 has-color@~0.1.0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
@@ -4184,30 +6458,73 @@ has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
   dependencies:
     sparkles "^1.0.0"
 
+has-symbol-support-x@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+
+has-to-string-tag-x@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  dependencies:
+    has-symbol-support-x "^1.4.1"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
 has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
     function-bind "^1.0.2"
 
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.0"
+
 hawk@3.1.3, hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -4234,6 +6551,14 @@ he@1.1.1, he@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
@@ -4285,18 +6610,17 @@ html-minifier@^1.1.1:
     relateurl "0.2.x"
     uglify-js "2.6.x"
 
-html-minifier@^3.0.1:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.5.tgz#3bdc9427e638bbe3dbde96c0eb988b044f02739e"
+html-minifier@^3.5.10:
+  version "3.5.15"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.15.tgz#f869848d4543cbfd84f26d5514a2a87cbf9a05e0"
   dependencies:
     camel-case "3.0.x"
     clean-css "4.1.x"
-    commander "2.11.x"
+    commander "2.15.x"
     he "1.1.x"
-    ncname "1.0.x"
     param-case "2.1.x"
     relateurl "0.2.x"
-    uglify-js "3.1.x"
+    uglify-js "3.3.x"
 
 html-minifier@^3.5.6:
   version "3.5.6"
@@ -4320,7 +6644,7 @@ htmllint@^0.2.7:
     lodash "^2.4.1"
     promise "^6.0.1"
 
-htmlparser2@^3.7.3, htmlparser2@^3.8.2:
+htmlparser2@^3.7.3:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
   dependencies:
@@ -4331,6 +6655,10 @@ htmlparser2@^3.7.3, htmlparser2@^3.8.2:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
+http-cache-semantics@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -4384,6 +6712,10 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+
 https-proxy-agent@1.0.0, https-proxy-agent@^1.0.0, https-proxy-agent@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"
@@ -4392,18 +6724,45 @@ https-proxy-agent@1.0.0, https-proxy-agent@^1.0.0, https-proxy-agent@~1.0.0:
     debug "2"
     extend "3"
 
-iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
+iconv-lite@0.4.19, iconv-lite@~0.4.13:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-ignore@^3.3.3:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+iconv-lite@^0.4.17, iconv-lite@^0.4.4:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+ieee754@^1.1.4:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
+ignore@^3.3.3, ignore@^3.3.5:
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b"
 
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
 
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  dependencies:
+    pkg-dir "^2.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -4414,6 +6773,14 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
+indent-string@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+
+indent@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/indent/-/indent-0.0.2.tgz#8c79f080190559b687034b84c7aefa97d5a911d9"
+
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -4425,18 +6792,10 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
-
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@1, inherits@2, inherits@2.0.1, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-
 ini@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
@@ -4464,7 +6823,7 @@ inquirer@^1.0.2:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^3.0.6:
+inquirer@^3.0.6, inquirer@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   dependencies:
@@ -4483,30 +6842,73 @@ inquirer@^3.0.6:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
+inquirer@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.1.0"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^5.5.2"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
 interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
+interpret@^1.0.4:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
 intersect@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/intersect/-/intersect-1.0.1.tgz#332650e10854d8c0ac58c192bdc27a8bf7e7a30c"
 
+intl-messageformat-parser@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075"
+
+intl-messageformat@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz#345bcd46de630b7683330c2e52177ff5eab484fc"
+  dependencies:
+    intl-messageformat-parser "1.4.0"
+
+into-stream@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  dependencies:
+    from2 "^2.1.1"
+    p-is-promise "^1.1.0"
+
+invariant@^2.2.0:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  dependencies:
+    loose-envify "^1.0.0"
+
 invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
     loose-envify "^1.0.0"
 
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+
 ipaddr.js@1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
 
-is-absolute@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.1.7.tgz#847491119fccb5fb436217cc737f7faad50f603f"
-  dependencies:
-    is-relative "^0.1.0"
-
 is-absolute@^0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
@@ -4514,6 +6916,18 @@ is-absolute@^0.2.3:
     is-relative "^0.2.1"
     is-windows "^0.2.0"
 
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -4542,6 +6956,18 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
 
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
@@ -4550,6 +6976,22 @@ is-deflate@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-deflate/-/is-deflate-1.0.0.tgz#c862901c3c161fb09dac7cdc7e784f80e98f2f14"
 
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
@@ -4574,7 +7016,7 @@ is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
-is-extglob@^2.1.0:
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
 
@@ -4606,6 +7048,12 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-gzip@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
@@ -4652,17 +7100,37 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
+is-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+
+is-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2"
+  dependencies:
+    symbol-observable "^0.2.2"
+
+is-odd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
+  dependencies:
+    is-number "^4.0.0"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
 
 is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
   dependencies:
     is-path-inside "^1.0.0"
 
@@ -4676,7 +7144,7 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   dependencies:
@@ -4686,6 +7154,10 @@ is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
 
+is-potential-custom-element-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
+
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
@@ -4708,10 +7180,6 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-relative@^0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
-
 is-relative@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
@@ -4722,10 +7190,16 @@ is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
-is-retry-allowed@^1.0.0:
+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
 
+is-scoped@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-scoped/-/is-scoped-1.0.0.tgz#449ca98299e713038256289ecb2b540dc437cb30"
+  dependencies:
+    scoped-regex "^1.0.0"
+
 is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -4762,6 +7236,10 @@ is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -4774,6 +7252,10 @@ isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
 
+isbinaryfile@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -4807,13 +7289,28 @@ istextorbinary@^2.1.0:
     editions "^1.1.1"
     textextensions "1 || 2"
 
+istextorbinary@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz#a5231a08ef6dd22b268d0895084cf8d58b5bec53"
+  dependencies:
+    binaryextensions "2"
+    editions "^1.3.3"
+    textextensions "2"
+
+isurl@^1.0.0-alpha5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  dependencies:
+    has-to-string-tag-x "^1.2.0"
+    is-object "^1.0.1"
+
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
 js-yaml@^3.9.1:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4822,14 +7319,66 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
+jscodeshift@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.4.1.tgz#da91a1c2eccfa03a3387a21d39948e251ced444a"
+  dependencies:
+    async "^1.5.0"
+    babel-plugin-transform-flow-strip-types "^6.8.0"
+    babel-preset-es2015 "^6.9.0"
+    babel-preset-stage-1 "^6.5.0"
+    babel-register "^6.9.0"
+    babylon "^6.17.3"
+    colors "^1.1.2"
+    flow-parser "^0.*"
+    lodash "^4.13.1"
+    micromatch "^2.3.7"
+    node-dir "0.1.8"
+    nomnom "^1.8.1"
+    recast "^0.12.5"
+    temp "^0.8.1"
+    write-file-atomic "^1.2.0"
+
+jscodeshift@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.5.0.tgz#bdb7b6cc20dd62c16aa728c3fa2d2fe66ca7c748"
+  dependencies:
+    babel-plugin-transform-flow-strip-types "^6.8.0"
+    babel-preset-es2015 "^6.9.0"
+    babel-preset-stage-1 "^6.5.0"
+    babel-register "^6.9.0"
+    babylon "^7.0.0-beta.30"
+    colors "^1.1.2"
+    flow-parser "^0.*"
+    lodash "^4.13.1"
+    micromatch "^2.3.7"
+    neo-async "^2.5.0"
+    node-dir "0.1.8"
+    nomnom "^1.8.1"
+    recast "^0.14.1"
+    temp "^0.8.1"
+    write-file-atomic "^1.2.0"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+
+json-parse-better-errors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -4856,7 +7405,7 @@ json3@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
 
-json5@^0.5.1:
+json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
@@ -4895,11 +7444,17 @@ just-extend@^1.1.27:
   version "1.1.27"
   resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905"
 
+keyv@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  dependencies:
+    json-buffer "3.0.0"
+
 kind-of@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
 
-kind-of@^3.0.2:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -4911,6 +7466,14 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
 latest-version@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-2.0.0.tgz#56f8d6139620847b8017f8f1f4d78e211324168b"
@@ -4923,9 +7486,9 @@ latest-version@^3.0.0:
   dependencies:
     package-json "^4.0.0"
 
-launchpad@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/launchpad/-/launchpad-0.6.0.tgz#6a122deaa3cbd7b9bedc13e7c8dd20a90951aaa3"
+launchpad@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/launchpad/-/launchpad-0.7.0.tgz#f427d3c0e15e869ee15513828bafefc16f9c7bc3"
   dependencies:
     async "^2.0.1"
     browserstack "^1.2.0"
@@ -4948,6 +7511,20 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  dependencies:
+    invert-kv "^1.0.0"
+
+leaflet@^1.0.2:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.1.tgz#86f336d2fb0e2d0ff446677049a5dc34cf0ea60e"
+
+leb@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/leb/-/leb-0.3.0.tgz#32bee9fad168328d6aea8522d833f4180eed1da3"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -4969,6 +7546,54 @@ liftoff@^2.1.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+
+listr-update-renderer@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35"
+  dependencies:
+    chalk "^1.1.3"
+    cli-cursor "^1.0.2"
+    date-fns "^1.27.2"
+    figures "^1.7.0"
+
+listr@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d"
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    figures "^1.7.0"
+    indent-string "^2.1.0"
+    is-observable "^0.2.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.4.0"
+    listr-verbose-renderer "^0.4.0"
+    log-symbols "^1.0.2"
+    log-update "^1.0.2"
+    ora "^0.2.3"
+    p-map "^1.1.1"
+    rxjs "^5.4.2"
+    stream-to-observable "^0.2.0"
+    strip-ansi "^3.0.1"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -4988,6 +7613,27 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
+loader-runner@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+
+loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -5258,6 +7904,10 @@ lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
 
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+
 lodash.support@~2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/lodash.support/-/lodash.support-2.4.1.tgz#320e0b67031673c28d7a2bb5d9e0331a45240515"
@@ -5323,10 +7973,6 @@ lodash.values@~2.4.1:
   dependencies:
     lodash.keys "~2.4.1"
 
-lodash@3.9.3:
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.9.3.tgz#0159e86832feffc6d61d852b12a953b99496bd32"
-
 lodash@4.16.2:
   version "4.16.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652"
@@ -5343,20 +7989,33 @@ lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.17.2,
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
-lodash@^4.17.4, lodash@^4.3.0:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
 
-log-symbols@^1.0.1:
+log-symbols@^1.0.0, log-symbols@^1.0.1, log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
   dependencies:
     chalk "^1.0.0"
 
+log-symbols@^2.1.0, log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  dependencies:
+    chalk "^2.0.1"
+
+log-update@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1"
+  dependencies:
+    ansi-escapes "^1.0.0"
+    cli-cursor "^1.0.2"
+
 lolex@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
@@ -5369,6 +8028,10 @@ lolex@^2.2.0, lolex@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.3.2.tgz#85f9450425103bf9e7a60668ea25dc43274ca807"
 
+long@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -5396,7 +8059,7 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
-lowercase-keys@^1.0.0:
+lowercase-keys@1.0.0, lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
@@ -5404,7 +8067,14 @@ lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
 
-lru-cache@^4.0.1, lru-cache@^4.0.2:
+lru-cache@^4.0.1, lru-cache@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+lru-cache@^4.0.2:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
   dependencies:
@@ -5423,6 +8093,12 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
+make-dir@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  dependencies:
+    pify "^3.0.0"
+
 make-error-cause@^1.1.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/make-error-cause/-/make-error-cause-1.2.2.tgz#df0388fcd0b37816dff0a5fb8108939777dcbc9d"
@@ -5433,7 +8109,7 @@ make-error@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
 
-map-cache@^0.2.0:
+map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
 
@@ -5445,6 +8121,29 @@ map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
 
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  dependencies:
+    object-visit "^1.0.0"
+
+marked@^0.3.19:
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
+
+matcher@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.0.tgz#4ad3a9cb6585186dc95cb8a08c7de936caed17ee"
+  dependencies:
+    escape-string-regexp "^1.0.4"
+
+md5.js@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
 md5@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
@@ -5476,6 +8175,22 @@ mem-fs-editor@^3.0.0:
     through2 "^2.0.0"
     vinyl "^2.0.1"
 
+mem-fs-editor@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-4.0.2.tgz#55a79b1e824da631254c4c95ba6366602c77af90"
+  dependencies:
+    commondir "^1.0.1"
+    deep-extend "^0.5.1"
+    ejs "^2.5.9"
+    glob "^7.0.3"
+    globby "^8.0.0"
+    isbinaryfile "^3.0.2"
+    mkdirp "^0.5.0"
+    multimatch "^2.0.0"
+    rimraf "^2.2.8"
+    through2 "^2.0.0"
+    vinyl "^2.0.1"
+
 mem-fs@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/mem-fs/-/mem-fs-1.1.3.tgz#b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"
@@ -5484,6 +8199,19 @@ mem-fs@^1.1.0:
     vinyl "^1.1.0"
     vinyl-file "^2.0.0"
 
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+memory-fs@^0.4.0, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
 meow@^3.1.0, meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -5509,6 +8237,10 @@ merge-stream@^1.0.0, merge-stream@^1.0.1:
   dependencies:
     readable-stream "^2.0.1"
 
+merge2@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -5531,6 +8263,31 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  dependencies:
+    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"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
 "mime-db@>= 1.29.0 < 2", mime-db@^1.28.0, mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
@@ -5567,10 +8324,18 @@ mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
+mimic-response@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz#df3d3652a73fded6b9b0b24146e6fd052353458e"
+
 minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
 
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+
 minimatch-all@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minimatch-all/-/minimatch-all-1.1.0.tgz#40c496a27a2e128d19bf758e76bb01a0c7145787"
@@ -5607,9 +8372,9 @@ minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.0.tgz#cdf225e8898f840a258ded44fc91776770afdc93"
+minimist@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
 
 minimist@^0.2.0:
   version "0.2.0"
@@ -5619,25 +8384,52 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
 minipass@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.2.1.tgz#5ada97538b1027b4cf7213432428578cb564011f"
   dependencies:
     yallist "^3.0.0"
 
-minizlib@^1.0.4:
+minipass@^2.2.4:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.0.tgz#2e11b1c46df7fe7f1afbe9a490280add21ffe384"
+  dependencies:
+    safe-buffer "^5.1.1"
+    yallist "^3.0.0"
+
+minizlib@^1.0.4, minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
   dependencies:
     minipass "^2.2.1"
 
-mkdirp@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
+mississippi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
   dependencies:
-    minimist "0.0.8"
+    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 "^2.0.1"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
 
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -5675,6 +8467,25 @@ mocha@^5.0.0:
     mkdirp "0.5.1"
     supports-color "4.4.0"
 
+moment@^2.10.2, moment@^2.20.0, moment@^2.22.0:
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+
+mout@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.1.0.tgz#0b29d41e6a80fa9e2d4a5be9d602e1d9d02177f6"
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
 ms@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.0.tgz#865be94c2e7397ad8a57da6a633a6e2f30798b83"
@@ -5750,6 +8561,27 @@ nan@^2.3.0:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
+nan@^2.9.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nanomatch@^1.2.9:
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-odd "^2.0.0"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 native-promise-only@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
@@ -5768,14 +8600,30 @@ ncname@1.0.x:
   dependencies:
     xml-char-classes "^1.0.0"
 
+needle@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
+neo-async@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
+
 netrc@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/netrc/-/netrc-0.1.4.tgz#6be94fcaca8d77ade0a9670dc460914c94472444"
 
+nice-try@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4"
+
 nise@^1.2.0:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/nise/-/nise-1.2.5.tgz#a143371b65014b6807d3a6e6b4556063f3a53363"
@@ -5792,6 +8640,10 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
+node-dir@0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.8.tgz#55fb8deb699070707fb67f91a460f0448294c77d"
+
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -5799,6 +8651,34 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-libs-browser@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.0"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
 node-pre-gyp@^0.6.36:
   version "0.6.36"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
@@ -5829,6 +8709,21 @@ node-pre-gyp@^0.6.4:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+node-pre-gyp@^0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.0"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
 node-status-codes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
@@ -5872,12 +8767,31 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1:
+normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-url@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -5901,10 +8815,6 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
 object-assign@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
@@ -5921,6 +8831,14 @@ object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
@@ -5929,6 +8847,12 @@ object-keys@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  dependencies:
+    isobject "^3.0.0"
+
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -5945,7 +8869,7 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-object.pick@^1.2.0:
+object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
   dependencies:
@@ -5999,6 +8923,13 @@ opn@^3.0.2:
   dependencies:
     object-assign "^4.0.1"
 
+optimist@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@@ -6010,9 +8941,14 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-options@>=0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+ora@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4"
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^1.0.2"
+    cli-spinners "^0.1.2"
+    object-assign "^4.0.1"
 
 orchestrator@^0.3.0:
   version "0.3.8"
@@ -6033,10 +8969,22 @@ ordered-read-streams@^0.3.0:
     is-stream "^1.0.1"
     readable-stream "^2.0.1"
 
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
 os-shim@^0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
@@ -6045,7 +8993,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
-osenv@^0.1.0:
+osenv@^0.1.0, osenv@^0.1.3:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   dependencies:
@@ -6059,10 +9007,32 @@ osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+p-cancelable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
+
+p-cancelable@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+
+p-each-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+  dependencies:
+    p-reduce "^1.0.0"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+
+p-lazy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-lazy/-/p-lazy-1.0.0.tgz#ec53c802f2ee3ac28f166cc82d0b2b02de27a835"
+
 p-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
@@ -6077,6 +9047,22 @@ p-map@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz#05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a"
 
+p-reduce@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+
+p-timeout@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
+  dependencies:
+    p-finally "^1.0.0"
+
+p-timeout@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  dependencies:
+    p-finally "^1.0.0"
+
 package-json@^2.0.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-2.4.0.tgz#0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"
@@ -6099,6 +9085,18 @@ pako@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
 
+pako@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  dependencies:
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
 param-case@2.1.x:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
@@ -6111,6 +9109,16 @@ param-case@^1.1.0:
   dependencies:
     sentence-case "^1.1.2"
 
+parse-asn1@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+
 parse-filepath@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
@@ -6134,14 +9142,17 @@ parse-json@^2.1.0, parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
-parse5@^1.4.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
-
 parse5@^2.2.1, parse5@^2.2.2, parse5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-2.2.3.tgz#0c4fc41c1000c5e6b93d48b03f8083837834e9f6"
@@ -6152,11 +9163,9 @@ parse5@^3.0.3:
   dependencies:
     "@types/node" "*"
 
-parsejson@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
-  dependencies:
-    better-assert "~1.0.0"
+parse5@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
 
 parseqs@0.0.5:
   version "0.0.5"
@@ -6181,6 +9190,14 @@ pascal-case@^1.1.0:
     camel-case "^1.1.1"
     upper-case-first "^1.1.0"
 
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+
 path-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/path-case/-/path-case-1.1.2.tgz#50ce6ba0d3bed3dd0b5c2a9c4553697434409514"
@@ -6209,7 +9226,7 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
@@ -6251,6 +9268,12 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  dependencies:
+    pify "^3.0.0"
+
 pathval@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
@@ -6261,6 +9284,16 @@ pause-stream@0.0.11:
   dependencies:
     through "~2.3"
 
+pbkdf2@^3.0.3:
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
 peek-stream@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/peek-stream/-/peek-stream-1.1.2.tgz#97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"
@@ -6313,6 +9346,12 @@ pkg-dir@^1.0.0:
   dependencies:
     find-up "^1.0.0"
 
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  dependencies:
+    find-up "^2.1.0"
+
 plist@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025"
@@ -6344,12 +9383,6 @@ pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
 
-plylog@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/plylog/-/plylog-0.4.0.tgz#d8e0cecc4cfe6c34d1109e0e9daaa26fee8d4b73"
-  dependencies:
-    winston "^2.2.0"
-
 plylog@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/plylog/-/plylog-0.5.0.tgz#c976eba1d80d2dd991005d7c110daf874154788f"
@@ -6358,7 +9391,7 @@ plylog@^0.5.0:
     "@types/winston" "^2.2.0"
     winston "^2.2.0"
 
-polymer-analyzer@^2.0.0, polymer-analyzer@^2.0.2, polymer-analyzer@^2.3.0:
+polymer-analyzer@^2.0.2, polymer-analyzer@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/polymer-analyzer/-/polymer-analyzer-2.3.0.tgz#1cb4b3290e458353454c1b77133ffb9a1d070e1d"
   dependencies:
@@ -6385,6 +9418,49 @@ polymer-analyzer@^2.0.0, polymer-analyzer@^2.0.2, polymer-analyzer@^2.3.0:
     shady-css-parser "^0.1.0"
     strip-indent "^2.0.0"
 
+polymer-analyzer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/polymer-analyzer/-/polymer-analyzer-3.0.0.tgz#4358b389f924ce9cd4a45a2edf589c2b6f0b6e5a"
+  dependencies:
+    "@babel/generator" "^7.0.0-beta.42"
+    "@babel/traverse" "^7.0.0-beta.42"
+    "@babel/types" "^7.0.0-beta.42"
+    "@types/babel-generator" "^6.25.1"
+    "@types/babel-traverse" "^6.25.2"
+    "@types/babel-types" "^6.25.1"
+    "@types/babylon" "^6.16.2"
+    "@types/chai-subset" "^1.3.0"
+    "@types/chalk" "^0.4.30"
+    "@types/clone" "^0.1.30"
+    "@types/cssbeautify" "^0.3.1"
+    "@types/doctrine" "^0.0.1"
+    "@types/is-windows" "^0.2.0"
+    "@types/minimatch" "^3.0.1"
+    "@types/node" "^9.6.4"
+    "@types/parse5" "^2.2.34"
+    "@types/path-is-inside" "^1.0.0"
+    "@types/resolve" "0.0.6"
+    "@types/whatwg-url" "^6.4.0"
+    babylon "^7.0.0-beta.42"
+    cancel-token "^0.1.1"
+    chalk "^1.1.3"
+    clone "^2.0.0"
+    cssbeautify "^0.3.1"
+    doctrine "^2.0.2"
+    dom5 "^3.0.0"
+    indent "0.0.2"
+    is-windows "^1.0.2"
+    jsonschema "^1.1.0"
+    minimatch "^3.0.4"
+    parse5 "^4.0.0"
+    path-is-inside "^1.0.2"
+    resolve "^1.5.0"
+    shady-css-parser "^0.1.0"
+    stable "^0.1.6"
+    strip-indent "^2.0.0"
+    vscode-uri "^1.0.1"
+    whatwg-url "^6.4.0"
+
 polymer-build@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/polymer-build/-/polymer-build-2.1.0.tgz#fac7c2e11a62f4b5f27d5546c18fc55663e855d3"
@@ -6406,6 +9482,76 @@ polymer-build@^2.1.0:
     vinyl "^1.2.0"
     vinyl-fs "^2.4.4"
 
+polymer-build@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/polymer-build/-/polymer-build-3.0.0.tgz#d78872e0d28dea4532123bf8f7dc8f4429585913"
+  dependencies:
+    "@babel/core" "^7.0.0-beta.46"
+    "@babel/plugin-external-helpers" "^7.0.0-beta.46"
+    "@babel/plugin-proposal-async-generator-functions" "^7.0.0-beta.46"
+    "@babel/plugin-proposal-object-rest-spread" "^7.0.0-beta.46"
+    "@babel/plugin-syntax-async-generators" "^7.0.0-beta.46"
+    "@babel/plugin-syntax-dynamic-import" "^7.0.0-beta.46"
+    "@babel/plugin-syntax-import-meta" "^7.0.0-beta.46"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0-beta.46"
+    "@babel/plugin-transform-arrow-functions" "^7.0.0-beta.46"
+    "@babel/plugin-transform-async-to-generator" "^7.0.0-beta.46"
+    "@babel/plugin-transform-block-scoped-functions" "^7.0.0-beta.46"
+    "@babel/plugin-transform-block-scoping" "^7.0.0-beta.46"
+    "@babel/plugin-transform-classes" "=7.0.0-beta.35"
+    "@babel/plugin-transform-computed-properties" "^7.0.0-beta.46"
+    "@babel/plugin-transform-destructuring" "^7.0.0-beta.46"
+    "@babel/plugin-transform-duplicate-keys" "^7.0.0-beta.46"
+    "@babel/plugin-transform-exponentiation-operator" "^7.0.0-beta.46"
+    "@babel/plugin-transform-for-of" "^7.0.0-beta.46"
+    "@babel/plugin-transform-function-name" "^7.0.0-beta.46"
+    "@babel/plugin-transform-instanceof" "^7.0.0-beta.46"
+    "@babel/plugin-transform-literals" "^7.0.0-beta.46"
+    "@babel/plugin-transform-modules-amd" "^7.0.0-beta.46"
+    "@babel/plugin-transform-object-super" "^7.0.0-beta.46"
+    "@babel/plugin-transform-parameters" "^7.0.0-beta.46"
+    "@babel/plugin-transform-regenerator" "^7.0.0-beta.46"
+    "@babel/plugin-transform-shorthand-properties" "^7.0.0-beta.46"
+    "@babel/plugin-transform-spread" "^7.0.0-beta.46"
+    "@babel/plugin-transform-sticky-regex" "^7.0.0-beta.46"
+    "@babel/plugin-transform-template-literals" "^7.0.0-beta.46"
+    "@babel/plugin-transform-typeof-symbol" "^7.0.0-beta.46"
+    "@babel/plugin-transform-unicode-regex" "^7.0.0-beta.46"
+    "@babel/traverse" "^7.0.0-beta.46"
+    "@polymer/esm-amd-loader" "^1.0.0"
+    "@types/babel-types" "^6.25.1"
+    "@types/babylon" "^6.16.2"
+    "@types/gulp-if" "0.0.33"
+    "@types/html-minifier" "^3.5.1"
+    "@types/is-windows" "^0.2.0"
+    "@types/mz" "0.0.31"
+    "@types/node" "^9.6.4"
+    "@types/parse5" "^2.2.34"
+    "@types/resolve" "0.0.7"
+    "@types/uuid" "^3.4.3"
+    "@types/vinyl" "^2.0.0"
+    "@types/vinyl-fs" "^2.4.8"
+    babel-preset-minify "=0.4.0-alpha.caaefb4c"
+    babylon "^7.0.0-beta.42"
+    css-slam "^2.1.1"
+    dom5 "^3.0.0"
+    gulp-if "^2.0.2"
+    html-minifier "^3.5.10"
+    matcher "^1.1.0"
+    multipipe "^1.0.2"
+    mz "^2.6.0"
+    parse5 "^4.0.0"
+    plylog "^0.5.0"
+    polymer-analyzer "^3.0.0"
+    polymer-bundler "^4.0.0"
+    polymer-project-config "^4.0.0"
+    regenerator-runtime "^0.11.1"
+    stream "0.0.2"
+    sw-precache "^5.1.1"
+    uuid "^3.2.1"
+    vinyl "^1.2.0"
+    vinyl-fs "^2.4.4"
+
 polymer-bundler@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/polymer-bundler/-/polymer-bundler-3.1.0.tgz#a029c93471d4f13c66cbc94858265693c16d004d"
@@ -6420,20 +9566,41 @@ polymer-bundler@^3.1.0:
     polymer-analyzer "^2.3.0"
     source-map "^0.5.6"
 
-polymer-cli@^1.5.6:
-  version "1.5.6"
-  resolved "https://registry.yarnpkg.com/polymer-cli/-/polymer-cli-1.5.6.tgz#c8d66803169cb06591e04634e8f37398e6b11ea5"
+polymer-bundler@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/polymer-bundler/-/polymer-bundler-4.0.0.tgz#a3dbd0652e2f7c8ecee96d6be36e5c70e1d248ff"
+  dependencies:
+    "@types/acorn" "^4.0.3"
+    "@types/babel-generator" "^6.25.1"
+    "@types/babel-traverse" "^6.25.3"
+    acorn-import-meta "^0.2.1"
+    babel-generator "^6.26.1"
+    babel-traverse "^6.26.0"
+    clone "^2.1.0"
+    command-line-args "^3.0.1"
+    command-line-usage "^3.0.3"
+    dom5 "^2.2.0"
+    espree "^3.5.2"
+    magic-string "^0.22.4"
+    mkdirp "^0.5.1"
+    parse5 "^2.2.2"
+    polymer-analyzer "^3.0.0"
+    rollup "^0.58.2"
+    source-map "^0.5.6"
+    vscode-uri "^1.0.1"
+
+polymer-cli@^1.7.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/polymer-cli/-/polymer-cli-1.7.1.tgz#d578bef0b492c0275514ac8a3a7dbafca3edd210"
   dependencies:
-    "@types/babel-core" "^6.7.14"
     "@types/chalk" "^0.4.31"
-    "@types/del" "^2.2.31"
+    "@types/del" "^3.0.0"
     "@types/findup-sync" "^0.3.29"
-    "@types/gulp-if" "0.0.30"
-    "@types/html-minifier" "^1.1.30"
+    "@types/globby" "^6.1.0"
     "@types/inquirer" "0.0.32"
     "@types/merge-stream" "^1.0.28"
     "@types/mz" "^0.0.31"
-    "@types/request" "0.0.39"
+    "@types/request" "2.0.3"
     "@types/resolve" "0.0.4"
     "@types/rimraf" "^0.0.28"
     "@types/semver" "^5.3.30"
@@ -6442,61 +9609,62 @@ polymer-cli@^1.5.6:
     "@types/vinyl" "^2.0.0"
     "@types/vinyl-fs" "0.0.28"
     "@types/yeoman-generator" "^1.0.0"
-    babel-core "^6.24.1"
-    babel-plugin-external-helpers "^6.22.0"
-    babel-preset-es2015 "^6.18.0"
-    babel-preset-minify "0.2.0"
-    bower "1.8.0"
+    bower "1.8.2"
     bower-json "^0.8.1"
     bower-logger "^0.2.2"
     chalk "^1.1.3"
+    chokidar "^1.7.0"
     command-line-args "^3.0.0"
     command-line-commands "^1.0.3"
     command-line-usage "^3.0.1"
-    css-slam "^1.1.0"
-    del "^2.2.2"
+    del "^3.0.0"
     findup-sync "^0.4.2"
     github "^7.2.1"
-    gulp-if "^2.0.0"
+    globby "^8.0.1"
     gunzip-maybe "^1.3.1"
-    html-minifier "^3.0.1"
     inquirer "^1.0.2"
     merge-stream "^1.0.1"
     mz "^2.6.0"
-    plylog "^0.4.0"
-    polymer-analyzer "^2.3.0"
-    polymer-build "^2.1.0"
-    polymer-linter "^2.0.2"
-    polymer-project-config "^3.4.0"
-    polyserve "^0.23.0"
+    plylog "^0.5.0"
+    polymer-analyzer "^3.0.0"
+    polymer-build "^3.0.0"
+    polymer-bundler "^4.0.0"
+    polymer-linter "^3.0.0"
+    polymer-project-config "^4.0.0"
+    polyserve "^0.27.11"
     request "^2.72.0"
     rimraf "^2.6.1"
     semver "^5.3.0"
     tar-fs "^1.12.0"
     temp "^0.8.3"
     update-notifier "^1.0.0"
+    validate-element-name "^2.1.1"
     vinyl "^1.1.1"
     vinyl-fs "^2.4.3"
-    web-component-tester "^6.3.0"
+    web-component-tester "^6.6.0"
     yeoman-environment "^1.5.2"
     yeoman-generator "^1.0.1"
 
-polymer-linter@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/polymer-linter/-/polymer-linter-2.0.3.tgz#a2d404dd85fc0fd01e471d1c10dd6accfccd64e6"
+polymer-linter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/polymer-linter/-/polymer-linter-3.0.0.tgz#531ae7a98eb9465856912d63a36e902b82a042a9"
   dependencies:
-    "@types/estree" "0.0.34"
     "@types/fast-levenshtein" "0.0.1"
-    "@types/node" "^6"
     "@types/parse5" "^2.2.34"
-    dom5 "^2.0.0"
-    estraverse "^4.2.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    cancel-token "^0.1.1"
+    css-what "^2.1.0"
+    dom5 "^3.0.0"
     fast-levenshtein "^2.0.6"
-    parse5 "^2.2.1"
-    polymer-analyzer "^2.0.0"
+    parse5 "^4.0.0"
+    polymer-analyzer "^3.0.0"
+    shady-css-parser "^0.1.0"
+    stable "^0.1.6"
     strip-indent "^2.0.0"
+    validate-element-name "^2.1.1"
 
-polymer-project-config@^3.2.1, polymer-project-config@^3.4.0:
+polymer-project-config@^3.2.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/polymer-project-config/-/polymer-project-config-3.4.0.tgz#3eac1d94072b2acca819c6536eca93f7243d42d2"
   dependencies:
@@ -6505,53 +9673,40 @@ polymer-project-config@^3.2.1, polymer-project-config@^3.4.0:
     minimatch-all "^1.1.0"
     plylog "^0.5.0"
 
-polyserve@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/polyserve/-/polyserve-0.23.0.tgz#23ab66057b160a1bc316dd2162f2df3a47d0f739"
+polymer-project-config@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/polymer-project-config/-/polymer-project-config-4.0.0.tgz#a6d830123ed1ab0751c28ed4f68d26569846f818"
+  dependencies:
+    "@types/node" "^9.6.4"
+    browser-capabilities "^1.0.0"
+    jsonschema "^1.1.1"
+    minimatch-all "^1.1.0"
+    plylog "^0.5.0"
+
+polyserve@^0.27.11:
+  version "0.27.11"
+  resolved "https://registry.yarnpkg.com/polyserve/-/polyserve-0.27.11.tgz#445b06849b2b1b131732c6661791a42cf810a33f"
   dependencies:
-    "@types/assert" "0.0.29"
-    "@types/babel-core" "^6.7.14"
-    "@types/babylon" "^6.16.2"
     "@types/compression" "^0.0.33"
     "@types/content-type" "^1.1.0"
+    "@types/escape-html" "0.0.20"
     "@types/express" "^4.0.36"
     "@types/mime" "0.0.29"
     "@types/mz" "0.0.29"
-    "@types/node" "^8.0.0"
+    "@types/node" "^9.6.4"
     "@types/opn" "^3.0.28"
     "@types/parse5" "^2.2.34"
     "@types/pem" "^1.8.1"
+    "@types/resolve" "0.0.6"
     "@types/serve-static" "^1.7.31"
     "@types/spdy" "^3.4.1"
-    "@types/ua-parser-js" "^0.7.30"
-    babel-core "^6.18.2"
-    babel-plugin-transform-es2015-arrow-functions "^6.8.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.8.0"
-    babel-plugin-transform-es2015-block-scoping "^6.18.0"
-    babel-plugin-transform-es2015-classes "^6.18.0"
-    babel-plugin-transform-es2015-computed-properties "^6.8.0"
-    babel-plugin-transform-es2015-destructuring "^6.19.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.8.0"
-    babel-plugin-transform-es2015-for-of "^6.18.0"
-    babel-plugin-transform-es2015-function-name "^6.9.0"
-    babel-plugin-transform-es2015-literals "^6.8.0"
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-plugin-transform-es2015-object-super "^6.8.0"
-    babel-plugin-transform-es2015-parameters "^6.18.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.18.0"
-    babel-plugin-transform-es2015-spread "^6.8.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.8.0"
-    babel-plugin-transform-es2015-template-literals "^6.8.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.18.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.11.0"
-    babel-plugin-transform-regenerator "^6.16.1"
-    babylon "^6.17.4"
-    browser-capabilities "^0.2.0"
+    bower-config "^1.4.1"
+    browser-capabilities "^1.0.0"
     command-line-args "^3.0.1"
     command-line-usage "^3.0.3"
     compression "^1.6.2"
     content-type "^1.0.2"
-    dom5 "^2.0.1"
+    escape-html "^1.0.3"
     express "^4.8.5"
     find-port "^1.0.1"
     http-proxy-middleware "^0.17.2"
@@ -6559,14 +9714,18 @@ polyserve@^0.23.0:
     mime "^1.3.4"
     mz "^2.4.0"
     opn "^3.0.2"
-    parse5 "^2.2.3"
     pem "^1.8.3"
-    polymer-build "^2.1.0"
+    polymer-build "^3.0.0"
+    polymer-project-config "^4.0.0"
     requirejs "^2.3.4"
-    resolve "^1.0.0"
+    resolve "^1.5.0"
     send "^0.14.1"
     spdy "^3.3.3"
 
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+
 preact@^8.2.6:
   version "8.2.7"
   resolved "https://registry.yarnpkg.com/preact/-/preact-8.2.7.tgz#316249fb678cd5e93e7cee63cea7bfb62dbd6814"
@@ -6579,10 +9738,18 @@ prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
 
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
+prettier@^1.5.3:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
+
 pretty-bytes@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
@@ -6595,6 +9762,10 @@ private@^0.1.6, private@^0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
+private@~0.1.5:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
 process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -6603,14 +9774,18 @@ process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
 
-progress@1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
 
-progress@^2.0.0:
+progress@2.0.0, progress@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
 
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+
 promise@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
@@ -6651,10 +9826,24 @@ proxy-addr@~2.0.2:
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
+public-encrypt@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+
 pump@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.2.tgz#3b3ee6512f94f0e575538c17995f9f16990a5d51"
@@ -6662,6 +9851,13 @@ pump@^1.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+pump@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -6677,10 +9873,18 @@ pumpify@^1.3.3:
     inherits "^2.0.1"
     pump "^1.0.0"
 
-punycode@^1.4.1:
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
+punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
@@ -6701,6 +9905,22 @@ qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+
 randomatic@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -6708,6 +9928,19 @@ randomatic@^1.1.3:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
 range-parser@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.0.3.tgz#6872823535c692e2c2a0103826afd82c2e0ff175"
@@ -6750,7 +9983,7 @@ read-all-stream@^3.0.0:
     pinkie-promise "^2.0.0"
     readable-stream "^2.0.0"
 
-read-chunk@^2.0.0:
+read-chunk@^2.0.0, read-chunk@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"
   dependencies:
@@ -6771,6 +10004,13 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
+read-pkg-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^3.0.0"
+
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -6787,6 +10027,26 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+read-pkg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  dependencies:
+    load-json-file "^4.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^3.0.0"
+
+"readable-stream@1 || 2", readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    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"
+
 readable-stream@1.1.x, readable-stream@^1.0.26-2, readable-stream@^1.0.26-4, readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -6805,7 +10065,7 @@ readable-stream@1.1.x, readable-stream@^1.0.26-2, readable-stream@^1.0.26-4, rea
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2:
+readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071"
   dependencies:
@@ -6849,6 +10109,25 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
+recast@^0.12.5:
+  version "0.12.9"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.12.9.tgz#e8e52bdb9691af462ccbd7c15d5a5113647a15f1"
+  dependencies:
+    ast-types "0.10.1"
+    core-js "^2.4.1"
+    esprima "~4.0.0"
+    private "~0.1.5"
+    source-map "~0.6.1"
+
+recast@^0.14.1:
+  version "0.14.7"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.7.tgz#4f1497c2b5826d42a66e8e3c9d80c512983ff61d"
+  dependencies:
+    ast-types "0.11.3"
+    esprima "~4.0.0"
+    private "~0.1.5"
+    source-map "~0.6.1"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -6866,14 +10145,28 @@ reduce-flatten@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-1.0.1.tgz#258c78efd153ddf93cb561237f61184f3696e327"
 
+regenerate-unicode-properties@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-6.0.0.tgz#0fc26f9d5142289df4e177dec58f303d2d097c16"
+  dependencies:
+    regenerate "^1.3.3"
+
 regenerate@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
 
+regenerate@^1.3.3, regenerate@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+
 regenerator-runtime@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
 
+regenerator-runtime@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+
 regenerator-transform@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
@@ -6882,12 +10175,29 @@ regenerator-transform@^0.10.0:
     babel-types "^6.19.0"
     private "^0.1.6"
 
+regenerator-transform@^0.12.3:
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.12.3.tgz#459adfb64f6a27164ab991b7873f45ab969eca8b"
+  dependencies:
+    private "^0.1.6"
+
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
   dependencies:
     is-equal-shallow "^0.1.3"
 
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+regexpp@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+
 regexpu-core@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
@@ -6896,6 +10206,17 @@ regexpu-core@^2.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
+regexpu-core@^4.1.3:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.1.4.tgz#f6c847261ba4cf869a7874442f9d25251b713fc8"
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^6.0.0"
+    regjsgen "^0.4.0"
+    regjsparser "^0.3.0"
+    unicode-match-property-ecmascript "^1.0.3"
+    unicode-match-property-value-ecmascript "^1.0.1"
+
 registry-auth-token@^3.0.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
@@ -6913,12 +10234,22 @@ regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
 
+regjsgen@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561"
+
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96"
+  dependencies:
+    jsesc "~0.5.0"
+
 reify@^0.14.1:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/reify/-/reify-0.14.1.tgz#2f79c546f72812afaaaf3afddf560b0eca759afd"
@@ -6939,7 +10270,7 @@ repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
 
-repeat-string@^1.5.2:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
@@ -7009,7 +10340,7 @@ request@2.81.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@^2.53.0, request@^2.72.0:
+request@^2.72.0:
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
@@ -7036,10 +10367,45 @@ request@^2.53.0, request@^2.72.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
+request@^2.85.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
 require-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/require-dir/-/require-dir-1.0.0.tgz#c2639de72960ea1ee280279f2da35e03c6536b2d"
 
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+
 require-relative@0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -7059,6 +10425,12 @@ requires-port@1.x.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
 
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  dependencies:
+    resolve-from "^3.0.0"
+
 resolve-dir@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
@@ -7066,15 +10438,24 @@ resolve-dir@^0.1.0:
     expand-tilde "^1.2.2"
     global-modules "^0.2.3"
 
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
-resolve@^1.0.0, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.3.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
-  dependencies:
-    path-parse "^1.0.5"
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
 resolve@^1.1.6, resolve@^1.4.0:
   version "1.5.0"
@@ -7082,6 +10463,24 @@ resolve@^1.1.6, resolve@^1.4.0:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.1.7, resolve@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86"
+  dependencies:
+    path-parse "^1.0.5"
+
+resolve@^1.3.2, resolve@^1.5.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
+  dependencies:
+    path-parse "^1.0.5"
+
+responselike@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  dependencies:
+    lowercase-keys "^1.0.0"
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -7096,6 +10495,10 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -7108,7 +10511,7 @@ rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
-rimraf@^2.2.0, rimraf@^2.2.8, rimraf@^2.5.4:
+rimraf@^2.2.0, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
@@ -7118,6 +10521,13 @@ rimraf@~2.2.6:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
 
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
 rollup-plugin-babel@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.3.tgz#63adedc863130327512a4a9006efc2241c5b7c15"
@@ -7180,12 +10590,25 @@ rollup@^0.56.0:
   version "0.56.0"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.56.0.tgz#4aefe9cef84a01ac3245e3fbba155e38dc2cc2e8"
 
+rollup@^0.58.2:
+  version "0.58.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.58.2.tgz#2feddea8c0c022f3e74b35c48e3c21b3433803ce"
+  dependencies:
+    "@types/estree" "0.0.38"
+    "@types/node" "*"
+
 run-async@^2.0.0, run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
   dependencies:
     is-promise "^2.1.0"
 
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  dependencies:
+    aproba "^1.1.1"
+
 run-sequence@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/run-sequence/-/run-sequence-2.2.1.tgz#1ce643da36fd8c7ea7e1a9329da33fc2b8898495"
@@ -7208,23 +10631,35 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+rxjs@^5.4.2, rxjs@^5.5.2:
+  version "5.5.10"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
+  dependencies:
+    symbol-observable "1.0.1"
+
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+
 safe-buffer@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
-samsam@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  dependencies:
+    ret "~0.1.10"
 
-samsam@1.3.0, samsam@1.x, samsam@^1.1.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-samsam@~1.1:
+samsam@1.1.2, samsam@1.1.3, samsam@1.3.0, samsam@1.x, samsam@^1.1.3, samsam@~1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
 
@@ -7238,24 +10673,41 @@ sauce-connect-launcher@^1.0.0:
     lodash "^4.16.6"
     rimraf "^2.5.4"
 
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
+schema-utils@^0.4.4, schema-utils@^0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+scoped-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-1.0.0.tgz#a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
 
-selenium-standalone@^5.8.0:
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-5.11.2.tgz#724ccaa72fb26f3711e0e20989e478c4133df844"
+selenium-standalone@^6.7.0:
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-6.14.0.tgz#b49dab2055c827fc90feb0c7a3877e0aa0a94b7d"
   dependencies:
-    async "1.2.1"
-    commander "2.6.0"
-    lodash "3.9.3"
-    minimist "1.1.0"
-    mkdirp "0.5.0"
-    progress "1.1.8"
+    async "^2.1.4"
+    commander "^2.9.0"
+    cross-spawn "^6.0.0"
+    debug "^3.0.0"
+    lodash "^4.17.4"
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    progress "2.0.0"
     request "2.79.0"
     tar-stream "1.5.2"
-    urijs "1.16.1"
-    which "1.1.1"
+    urijs "^1.18.4"
+    which "^1.2.12"
     yauzl "^2.5.0"
 
 semver-diff@^2.0.0:
@@ -7264,7 +10716,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -7337,6 +10789,10 @@ sequencify@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
 
+serialize-javascript@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+
 serve-static@1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
@@ -7354,7 +10810,7 @@ serviceworker-cache-polyfill@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz#de19ee73bef21ab3c0740a37b33db62464babdeb"
 
-set-blocking@~2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
 
@@ -7362,7 +10818,25 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
-setimmediate@^1.0.5:
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
@@ -7378,9 +10852,12 @@ setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
-shady-css-parser@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/shady-css-parser/-/shady-css-parser-0.0.8.tgz#01eec5a6b9ec8e47edbda91b44dfe591279ea0d1"
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 shady-css-parser@^0.1.0:
   version "0.1.0"
@@ -7404,6 +10881,14 @@ shelljs@^0.7.0:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+shelljs@^0.8.0:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
 sigmund@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -7454,6 +10939,10 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+
 slice-ansi@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
@@ -7470,6 +10959,33 @@ snake-case@^1.1.0:
   dependencies:
     sentence-case "^1.1.2"
 
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -7482,33 +10998,10 @@ sntp@2.x.x:
   dependencies:
     hoek "4.x.x"
 
-socket.io-adapter@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
-  dependencies:
-    debug "2.3.3"
-    socket.io-parser "2.3.1"
-
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
 
-socket.io-client@1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.4.tgz#ec9f820356ed99ef6d357f0756d648717bdd4281"
-  dependencies:
-    backo2 "1.0.2"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "2.3.3"
-    engine.io-client "~1.8.4"
-    has-binary "0.1.7"
-    indexof "0.0.1"
-    object-component "0.0.3"
-    parseuri "0.0.5"
-    socket.io-parser "2.3.1"
-    to-array "0.1.4"
-
 socket.io-client@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
@@ -7527,15 +11020,6 @@ socket.io-client@2.0.4:
     socket.io-parser "~3.1.1"
     to-array "0.1.4"
 
-socket.io-parser@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
-  dependencies:
-    component-emitter "1.1.2"
-    debug "2.2.0"
-    isarray "0.0.1"
-    json3 "3.3.2"
-
 socket.io-parser@~3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.2.tgz#dbc2282151fc4faebbe40aeedc0772eba619f7f2"
@@ -7545,18 +11029,6 @@ socket.io-parser@~3.1.1:
     has-binary2 "~1.0.2"
     isarray "2.0.1"
 
-socket.io@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.4.tgz#2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"
-  dependencies:
-    debug "2.3.3"
-    engine.io "~1.8.4"
-    has-binary "0.1.7"
-    object-assign "4.1.0"
-    socket.io-adapter "0.5.0"
-    socket.io-client "1.7.4"
-    socket.io-parser "2.3.1"
-
 socket.io@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
@@ -7579,32 +11051,56 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-list-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  dependencies:
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
 source-map-support@^0.4.15:
   version "0.4.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.16.tgz#16fecf98212467d017d586a2af68d628b9421cd8"
   dependencies:
     source-map "^0.5.6"
 
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+
 source-map@0.4.x:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.6, source-map@~0.5.1:
+source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
+source-map@^0.6.1, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
 sparkles@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
@@ -7653,6 +11149,12 @@ spdy@^3.3.3:
     select-hose "^2.0.0"
     spdy-transport "^2.0.18"
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  dependencies:
+    extend-shallow "^3.0.0"
+
 split@0.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
@@ -7681,6 +11183,16 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
+ssri@^5.2.4:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  dependencies:
+    safe-buffer "^5.1.1"
+
+stable@^0.1.6:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
@@ -7692,10 +11204,24 @@ stacky@^1.3.1:
     chalk "^1.1.1"
     lodash "^3.0.0"
 
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
 "statuses@>= 1.3.1 < 2", statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+stream-browserify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
@@ -7706,6 +11232,23 @@ stream-consume@^0.1.0, stream-consume@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
 
+stream-each@^1.1.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz#4126e8c6b107004465918aa2fc35549e77402c87"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -7716,6 +11259,18 @@ stream-to-array@^2.0.2, stream-to-array@^2.3.0:
   dependencies:
     any-promise "^1.1.0"
 
+stream-to-observable@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10"
+  dependencies:
+    any-observable "^0.2.0"
+
+stream@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/stream/-/stream-0.0.2.tgz#7f5363f057f6592c5595f00bc80a27f5cec1f0ef"
+  dependencies:
+    emitter-component "^1.1.1"
+
 streamfilter@^1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.7.tgz#ae3e64522aa5a35c061fd17f67620c7653c643c9"
@@ -7732,6 +11287,10 @@ streamsearch@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -7751,6 +11310,12 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string_decoder@^1.0.0, string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -7836,38 +11401,12 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-supports-color@3.1.2:
+supports-color@3.1.2, supports-color@4.4.0, supports-color@^0.2.0, supports-color@^2.0.0, supports-color@^4.0.0, supports-color@^5.1.0, supports-color@^5.3.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^5.1.0, supports-color@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a"
-  dependencies:
-    has-flag "^3.0.0"
-
 sw-precache@^5.1.1:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/sw-precache/-/sw-precache-5.2.0.tgz#eb6225ce580ceaae148194578a0ad01ab7ea199c"
@@ -7912,6 +11451,14 @@ swap-case@^1.1.0:
     lower-case "^1.1.1"
     upper-case "^1.1.1"
 
+symbol-observable@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+
+symbol-observable@^0.2.2:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
+
 table-layout@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-0.3.0.tgz#6ee20dc483db371b3e5c87f704ed2f7c799d2c9a"
@@ -7923,7 +11470,7 @@ table-layout@^0.3.0:
     typical "^2.6.0"
     wordwrapjs "^2.0.0-0"
 
-table@^4.0.1:
+table@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
@@ -7934,6 +11481,10 @@ table@^4.0.1:
     slice-ansi "1.0.0"
     string-width "^2.1.1"
 
+tapable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
+
 tar-fs@^1.12.0:
   version "1.16.0"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896"
@@ -7982,6 +11533,18 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+tar@^4:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.2.4"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 temp@^0.8.1, temp@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
@@ -8023,6 +11586,10 @@ text-table@^0.2.0, text-table@~0.2.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.1.0.tgz#1be0dc2a0dc244d44be8a09af6a85afb93c4dbc3"
 
+textextensions@2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz#38ac676151285b658654581987a0ce1a4490d286"
+
 thenify-all@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
@@ -8088,10 +11655,16 @@ timed-out@^3.0.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
 
-timed-out@^4.0.0:
+timed-out@^4.0.0, timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
 
+timers-browserify@^2.0.4:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  dependencies:
+    setimmediate "^1.0.4"
+
 title-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/title-case/-/title-case-1.1.2.tgz#fae4a6ae546bfa22d083a0eea910a40d12ed4f5a"
@@ -8121,10 +11694,40 @@ to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
 
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
 tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
@@ -8137,6 +11740,12 @@ tough-cookie@~2.3.3:
   dependencies:
     punycode "^1.4.1"
 
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  dependencies:
+    punycode "^2.1.0"
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -8145,6 +11754,10 @@ trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -8165,22 +11778,10 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
-
-type-detect@^1.0.0:
+type-detect@0.1.1, type-detect@1.0.0, type-detect@^1.0.0, type-detect@^4.0.0, type-detect@^4.0.5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
 
-type-detect@^4.0.0:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
-
-type-detect@^4.0.5:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-
 type-is@^1.6.4, type-is@~1.6.15:
   version "1.6.15"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
@@ -8196,15 +11797,15 @@ typical@^2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/typical/-/typical-2.6.1.tgz#5c080e5d661cbbe38259d2e70a3c7253e873881d"
 
-ua-parser-js@^0.7.14:
-  version "0.7.14"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.14.tgz#110d53fa4c3f326c121292bbeac904d2e03387ca"
+ua-parser-js@^0.7.15:
+  version "0.7.18"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
 
 ua-parser-js@^0.7.9:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
 
-uglify-es@^3.1.9:
+uglify-es@^3.1.9, uglify-es@^3.3.4:
   version "3.3.9"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
   dependencies:
@@ -8227,6 +11828,13 @@ uglify-js@3.1.x:
     commander "~2.11.0"
     source-map "~0.5.1"
 
+uglify-js@3.3.x:
+  version "3.3.25"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.25.tgz#3266ccb87c5bea229f69041a0296010d6477d539"
+  dependencies:
+    commander "~2.15.0"
+    source-map "~0.6.1"
+
 uglify-js@^3.0.5:
   version "3.0.28"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.0.28.tgz#96b8495f0272944787b5843a1679aa326640d5f7"
@@ -8245,14 +11853,23 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+uglifyjs-webpack-plugin@^1.2.4:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
+  dependencies:
+    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"
+
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-ultron@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
-
 ultron@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.0.tgz#b07a2e6a541a815fc6a34ccd4533baec307ca864"
@@ -8280,6 +11897,46 @@ unfetch@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-3.0.0.tgz#8d1e0513a4ecd0e5ff2d41a6ba77771aae8b6482"
 
+unicode-canonical-property-names-ecmascript@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.3.tgz#f6119f417467593c0086357c85546b6ad5abc583"
+
+unicode-match-property-ecmascript@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.3.tgz#db9b1cb4ffc67e0c5583780b1b59370e4cbe97b9"
+  dependencies:
+    unicode-canonical-property-names-ecmascript "^1.0.2"
+    unicode-property-aliases-ecmascript "^1.0.3"
+
+unicode-match-property-value-ecmascript@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.1.tgz#fea059120a016f403afd3bf586162b4db03e0604"
+
+unicode-property-aliases-ecmascript@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.3.tgz#ac3522583b9e630580f916635333e00c5ead690d"
+
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+unique-filename@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
+  dependencies:
+    imurmurhash "^0.1.4"
+
 unique-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
@@ -8301,12 +11958,23 @@ unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
-untildify@^2.0.0:
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+untildify@^2.0.0, untildify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
   dependencies:
     os-homedir "^1.0.0"
 
+untildify@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1"
+
 unzip-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
@@ -8315,6 +11983,10 @@ unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
+upath@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.5.tgz#02cab9ecebe95bbec6d5fc2566325725ab6d1a73"
+
 update-notifier@^1.0.0, update-notifier@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-1.0.3.tgz#8f92c515482bd6831b7c93013e70f87552c7cf5a"
@@ -8352,20 +12024,49 @@ upper-case@^1.0.3, upper-case@^1.1.0, upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
-urijs@1.16.1:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.16.1.tgz#859ad31890f5f9528727be89f1932c94fb4731e2"
+uri-js@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.1.tgz#4595a80a51f356164e22970df64c7abd6ade9850"
+  dependencies:
+    punycode "^2.1.0"
 
-urijs@^1.16.1:
+urijs@^1.16.1, urijs@^1.18.4:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
 
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
   dependencies:
     prepend-http "^1.0.1"
 
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  dependencies:
+    prepend-http "^2.0.0"
+
+url-to-options@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
+  dependencies:
+    kind-of "^6.0.2"
+
 user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
@@ -8380,7 +12081,7 @@ util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-"util@>=0.10.3 <1":
+util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -8398,10 +12099,18 @@ uuid@^3.0.0, uuid@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
+uuid@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
 uws@~0.14.4:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/uws/-/uws-0.14.5.tgz#67aaf33c46b2a587a5f6666d00f7691328f149dc"
 
+v8-compile-cache@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4"
+
 v8flags@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
@@ -8412,6 +12121,14 @@ vali-date@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
 
+validate-element-name@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/validate-element-name/-/validate-element-name-2.1.1.tgz#8ff75f7da69f73e7c510588362130508b7ac644e"
+  dependencies:
+    is-potential-custom-element-name "^1.0.0"
+    log-symbols "^1.0.0"
+    meow "^3.7.0"
+
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
@@ -8531,42 +12248,76 @@ vlq@^0.2.1:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
 
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  dependencies:
+    indexof "0.0.1"
+
+vscode-uri@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.3.tgz#631bdbf716dccab0e65291a8dc25c23232085a52"
+
 walkdir@^0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.0.11.tgz#a16d025eb931bd03b52f308caed0f40fcebe9532"
 
+watchpack@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  dependencies:
+    chokidar "^2.0.2"
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+
 wbuf@^1.1.0, wbuf@^1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe"
   dependencies:
     minimalistic-assert "^1.0.0"
 
-wct-local@^2.0.15:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/wct-local/-/wct-local-2.0.15.tgz#b5e3758e32e5d70c54d129fd6571d7cc14cf31e2"
+wct-browser-legacy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wct-browser-legacy/-/wct-browser-legacy-1.0.0.tgz#99f538854b823a3921580199dc5331f98fa96566"
+  dependencies:
+    "@polymer/polymer" "^3.0.0-pre.1"
+    "@polymer/sinonjs" "^1.14.1"
+    "@polymer/test-fixture" "^3.0.0-pre.1"
+    "@webcomponents/webcomponentsjs" "^1.0.7"
+    accessibility-developer-tools "^2.12.0"
+    async "^1.5.2"
+    chai "^3.5.0"
+    lodash "^3.10.1"
+    mocha "^3.4.2"
+    sinon "^1.17.1"
+    sinon-chai "^2.10.0"
+    stacky "^1.3.1"
+
+wct-local@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wct-local/-/wct-local-2.1.0.tgz#8c66517295094328645bb571d419a87642cc6120"
   dependencies:
-    "@types/chalk" "^0.4.28"
     "@types/express" "^4.0.30"
     "@types/freeport" "^1.0.19"
     "@types/launchpad" "^0.6.0"
-    "@types/node" "^6.0.31"
-    "@types/which" "^1.0.27"
-    chalk "^1.1.1"
-    cleankill "^1.0.3"
+    "@types/node" "^9.3.0"
+    "@types/which" "^1.3.1"
+    chalk "^2.3.0"
+    cleankill "^2.0.0"
     freeport "^1.0.4"
-    launchpad "^0.6.0"
+    launchpad "^0.7.0"
     promisify-node "^0.4.0"
-    selenium-standalone "^5.8.0"
+    selenium-standalone "^6.7.0"
     which "^1.0.8"
 
-wct-sauce@^2.0.0-pre.1:
-  version "2.0.0-pre.1"
-  resolved "https://registry.yarnpkg.com/wct-sauce/-/wct-sauce-2.0.0-pre.1.tgz#3b804607c550a0325de9137f3316be9562c06035"
+wct-sauce@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/wct-sauce/-/wct-sauce-2.0.1.tgz#74eb891ce3a1ac352e90c177be3c310cdadc607e"
   dependencies:
     chalk "^1.1.1"
-    cleankill "^1.0.0"
+    cleankill "^2.0.0"
     lodash "^3.0.1"
-    request "^2.53.0"
+    request "^2.85.0"
     sauce-connect-launcher "^1.0.0"
     temp "^0.8.1"
     uuid "^2.0.1"
@@ -8584,45 +12335,13 @@ wd@^1.2.0:
     underscore.string "3.3.4"
     vargs "0.1.0"
 
-web-component-tester@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/web-component-tester/-/web-component-tester-6.3.0.tgz#6279050ca03b1861169910c206e2e5af0efd9197"
-  dependencies:
-    "@polymer/sinonjs" "^1.14.1"
-    "@polymer/test-fixture" "^0.0.3"
-    "@webcomponents/webcomponentsjs" "^1.0.7"
-    accessibility-developer-tools "^2.12.0"
-    async "^1.5.2"
-    body-parser "^1.17.2"
-    chai "^3.5.0"
-    chalk "^1.1.3"
-    cleankill "^1.0.3"
-    express "^4.15.3"
-    findup-sync "^0.4.3"
-    glob "^7.1.2"
-    lodash "^3.10.1"
-    mocha "^3.4.2"
-    multer "^1.3.0"
-    nomnom "^1.8.1"
-    polyserve "^0.23.0"
-    promisify-node "^0.4.0"
-    resolve "^1.3.3"
-    semver "^5.3.0"
-    send "^0.11.1"
-    server-destroy "^1.0.1"
-    sinon "^1.17.1"
-    sinon-chai "^2.10.0"
-    socket.io "^1.7.4"
-    stacky "^1.3.1"
-    wd "^1.2.0"
-  optionalDependencies:
-    update-notifier "^1.0.0"
-    wct-local "^2.0.15"
-    wct-sauce "^2.0.0-pre.1"
+web-animations-js@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/web-animations-js/-/web-animations-js-2.3.1.tgz#3a6d9bc15196377a90f8e2803fa5262165b04510"
 
-web-component-tester@^6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/web-component-tester/-/web-component-tester-6.4.0.tgz#1b37eb9b49dcfe847b06d4af1716516aaa32d063"
+web-component-tester@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/web-component-tester/-/web-component-tester-6.6.0.tgz#a732f2945c762ce7de03a7bb0fe4ab8a27e44b4e"
   dependencies:
     "@polymer/sinonjs" "^1.14.1"
     "@polymer/test-fixture" "^0.0.3"
@@ -8630,19 +12349,20 @@ web-component-tester@^6.4.0:
     accessibility-developer-tools "^2.12.0"
     async "^2.4.1"
     body-parser "^1.17.2"
+    bower-config "^1.4.0"
     chai "^4.0.2"
     chalk "^1.1.3"
     cleankill "^2.0.0"
     express "^4.15.3"
-    findup-sync "^1.0.0"
+    findup-sync "^2.0.0"
     glob "^7.1.2"
     lodash "^3.10.1"
     mocha "^3.4.2"
     multer "^1.3.0"
     nomnom "^1.8.1"
-    polyserve "^0.23.0"
+    polyserve "^0.27.11"
     promisify-node "^0.4.0"
-    resolve "^1.3.3"
+    resolve "^1.5.0"
     semver "^5.3.0"
     send "^0.11.1"
     server-destroy "^1.0.1"
@@ -8653,20 +12373,111 @@ web-component-tester@^6.4.0:
     wd "^1.2.0"
   optionalDependencies:
     update-notifier "^2.2.0"
-    wct-local "^2.0.15"
-    wct-sauce "^2.0.0-pre.1"
+    wct-local "^2.1.0"
+    wct-sauce "^2.0.0"
+
+webassemblyjs@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.3.1.tgz#2bb8ebc724d0fe09b9562ab20e32ce3f5bac5c74"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/validation" "1.3.1"
+    "@webassemblyjs/wasm-parser" "1.3.1"
+    "@webassemblyjs/wast-parser" "1.3.1"
+    long "^3.2.0"
+
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+
+webpack-addons@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/webpack-addons/-/webpack-addons-1.1.5.tgz#2b178dfe873fb6e75e40a819fa5c26e4a9bc837a"
+  dependencies:
+    jscodeshift "^0.4.0"
+
+webpack-cli@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.1.3.tgz#65d166851abaa56067ef3f716b02a97ba6bbe84d"
+  dependencies:
+    chalk "^2.3.2"
+    cross-spawn "^6.0.5"
+    diff "^3.5.0"
+    enhanced-resolve "^4.0.0"
+    envinfo "^4.4.2"
+    glob-all "^3.1.0"
+    global-modules "^1.0.0"
+    got "^8.2.0"
+    import-local "^1.0.0"
+    inquirer "^5.1.0"
+    interpret "^1.0.4"
+    jscodeshift "^0.5.0"
+    listr "^0.13.0"
+    loader-utils "^1.1.0"
+    lodash "^4.17.5"
+    log-symbols "^2.2.0"
+    mkdirp "^0.5.1"
+    p-each-series "^1.0.0"
+    p-lazy "^1.0.0"
+    prettier "^1.5.3"
+    supports-color "^5.3.0"
+    v8-compile-cache "^1.1.2"
+    webpack-addons "^1.1.5"
+    yargs "^11.1.0"
+    yeoman-environment "^2.0.0"
+    yeoman-generator "^2.0.4"
+
+webpack-sources@^1.0.1, webpack-sources@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@^4.8.1:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.8.1.tgz#59e38f99f2751c931dd09a035aba7bec4b5f916e"
+  dependencies:
+    "@webassemblyjs/ast" "1.3.1"
+    "@webassemblyjs/wasm-edit" "1.3.1"
+    "@webassemblyjs/wasm-parser" "1.3.1"
+    acorn "^5.0.0"
+    acorn-dynamic-import "^3.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^0.1.1"
+    enhanced-resolve "^4.0.0"
+    eslint-scope "^3.7.1"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^0.4.4"
+    tapable "^1.0.0"
+    uglifyjs-webpack-plugin "^1.2.4"
+    watchpack "^1.5.0"
+    webpack-sources "^1.0.1"
 
 whatwg-fetch@>=0.10.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
 
-which@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.1.1.tgz#9ce512459946166e12c083f08ec073380fc8cbbb"
+whatwg-url@^6.4.0:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.1.tgz#fdb94b440fd4ad836202c16e9737d511f012fd67"
   dependencies:
-    is-absolute "^0.1.7"
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
 
-which@^1.0.8, which@^1.2.12, which@^1.2.4, which@^1.2.9:
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+
+which@^1.0.8, which@^1.2.12, which@^1.2.14, which@^1.2.4, which@^1.2.9:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -8703,6 +12514,10 @@ wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -8716,11 +12531,24 @@ wordwrapjs@^2.0.0-0:
     reduce-flatten "^1.0.1"
     typical "^2.6.0"
 
+worker-farm@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  dependencies:
+    errno "~0.1.7"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
-write-file-atomic@^1.1.2:
+write-file-atomic@^1.1.2, write-file-atomic@^1.2.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
   dependencies:
@@ -8742,20 +12570,6 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
-ws@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.4.tgz#57f40d036832e5f5055662a397c4de76ed66bf61"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
 ws@~2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-2.3.1.tgz#6b94b3e447cb6a363f785eaf94af6359e8e81c80"
@@ -8763,10 +12577,6 @@ ws@~2.3.1:
     safe-buffer "~5.0.1"
     ultron "~1.1.0"
 
-wtf-8@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
-
 xdg-basedir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2"
@@ -8789,14 +12599,17 @@ xmldom@0.1.x:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 
-xmlhttprequest-ssl@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
-
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz#04f560915724b389088715cc0ed7813e9677bf57"
 
+xss@^0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/xss/-/xss-0.3.8.tgz#d0cbe23bde490bc98c139f08de3899165a68af0e"
+  dependencies:
+    commander "^2.9.0"
+    cssfilter "0.0.10"
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -8811,14 +12624,51 @@ xtend@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
 
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
-yallist@^3.0.0:
+yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^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 "^9.0.2"
+
+yargs@~1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"
+  dependencies:
+    minimist "^0.1.0"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
@@ -8856,6 +12706,24 @@ yeoman-environment@^1.1.0, yeoman-environment@^1.5.2:
     text-table "^0.2.0"
     untildify "^2.0.0"
 
+yeoman-environment@^2.0.0, yeoman-environment@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.0.6.tgz#ae1b21d826b363f3d637f88a7fc9ea7414cb5377"
+  dependencies:
+    chalk "^2.1.0"
+    debug "^3.1.0"
+    diff "^3.3.1"
+    escape-string-regexp "^1.0.2"
+    globby "^6.1.0"
+    grouped-queue "^0.3.3"
+    inquirer "^3.3.0"
+    is-scoped "^1.0.0"
+    lodash "^4.17.4"
+    log-symbols "^2.1.0"
+    mem-fs "^1.1.0"
+    text-table "^0.2.0"
+    untildify "^3.0.2"
+
 yeoman-generator@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-1.1.1.tgz#40c2b4f6cdfbe05e1952fdd72933f0d8925dbdf5"
@@ -8891,6 +12759,36 @@ yeoman-generator@^1.0.1:
     user-home "^2.0.0"
     yeoman-environment "^1.1.0"
 
+yeoman-generator@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-2.0.5.tgz#57b0b3474701293cc9ec965288f3400b00887c81"
+  dependencies:
+    async "^2.6.0"
+    chalk "^2.3.0"
+    cli-table "^0.3.1"
+    cross-spawn "^6.0.5"
+    dargs "^5.1.0"
+    dateformat "^3.0.3"
+    debug "^3.1.0"
+    detect-conflict "^1.0.0"
+    error "^7.0.2"
+    find-up "^2.1.0"
+    github-username "^4.0.0"
+    istextorbinary "^2.2.1"
+    lodash "^4.17.10"
+    make-dir "^1.1.0"
+    mem-fs-editor "^4.0.0"
+    minimist "^1.2.0"
+    pretty-bytes "^4.0.2"
+    read-chunk "^2.1.0"
+    read-pkg-up "^3.0.0"
+    rimraf "^2.6.2"
+    run-async "^2.0.0"
+    shelljs "^0.8.0"
+    text-table "^0.2.0"
+    through2 "^2.0.0"
+    yeoman-environment "^2.0.5"
+
 zip-stream@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"