Remove light card for generated mode

Alert user when add-on not started (#4485 )
Add group binding to the ZHA config panel and misc. cleanup (#4466 )
2026-05-18 07:07:36 +00:00 · 2020-01-17 21:53:38 +01:00 · 2020-01-17 17:02:56 +01:00 · 2020-01-17 16:39:57 +01:00 · 2020-01-17 09:54:16 +01:00 · 2020-01-17 09:44:57 +01:00
740 changed files with 110005 additions and 61909 deletions
@@ -1,6 +1,7 @@
 {
  "extends": ["airbnb-base", "prettier"],
  "parserOptions": {
+    "ecmaVersion": "2020",
    "ecmaFeatures": {
      "jsx": true,
      "modules": true
@@ -1,12 +1,9 @@
 {
  "extends": "./.eslintrc-hound.json",
-  "plugins": [
-    "react"
-  ],
+  "plugins": ["react"],
  "env": {
    "browser": true
  },
-  "parser": "babel-eslint",
  "rules": {
    "import/no-unresolved": 2,
    "linebreak-style": 0,
@@ -1,11 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ""
+labels: bug
+assignees: ""
+---
+
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
 - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
- This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
 - Provide as many details as possible. Do not delete any text from this template!
 -->

+**Checklist:**
+
+- [ ] I updated to the latest version available
+- [ ] I cleared the cache of my browser
+
 **Home Assistant release with the issue:**
+
 <!--
 - Frontend -> Developer tools -> Info
 - Or use this command: hass --version
@@ -14,22 +27,50 @@
 **Last working Home Assistant release (if known):**

 **UI (States or Lovelace UI?):**
+
 <!--
 - Frontend -> Developer tools -> Info
 -->

 **Browser and Operating System:**
+
 <!--
 Provide details about what browser (and version) you are seeing the issue in. And also which operating system this is on. If possible try to replicate the issue in other browsers and include your findings here.
 -->

 **Description of problem:**
+
 <!--
-Explain what the issue is, and how things should look/behave. If possible provide a screenshot with a description.
+Explain what the issue is, and what is the current behaviour. If possible provide a screenshot with a description.
 -->

+**Expected behaviour:**
+
+<!--
+Explain how things should look/behave. If possible provide a screenshot with a description.
+-->
+
+**Relevant config:**
+
+<!--
+Give the config of both the integration that is used, the Lovelace config, scene, automation or otherwise relevant configuration.
+-->
+
+**Steps to reproduce this problem:**
+
+<!--
+Sum up all steps that are necessary to reproduce this bug.
+For example:
+1. Add a climate integration
+2. Navigate to Lovelace
+3. Click more info of the climate entity
+4. Set the hvac action to heat
+5. Set the temperature higher than the current temperature
+6. Set the hvac action to cool
+-->

 **Javascript errors shown in the web inspector (if applicable):**
+
 ```

 ```
@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ""
+labels: feature request
+assignees: ""
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,27 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 1
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: 2020-01-01
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: false
+
+# Limit to only `issues` or `pulls`
+only: pulls
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+issues:
+   daysUntilLock: 30
@@ -25,6 +25,9 @@ dist
 .vscode/*
 !.vscode/extensions.json

+# Cast dev settings 
+src/cast/dev_const.ts
+
 # Secrets
 .lokalise_token
 yarn-error.log
@@ -8,19 +8,11 @@ install: yarn install
 script:
  - npm run build
  - hassio/script/build_hassio
+  # Because else eslint fails because hassio has cleaned that build
+  - ./node_modules/.bin/gulp gen-icons-app
  - npm run test
  # - 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'
-deploy:
-  provider: script
-  script: script/travis_deploy
-  'on':
-    branch: master
 dist: trusty
 addons:
  sauce_connect: true
-
@@ -2,9 +2,9 @@

 This is the repository for the official [Home Assistant](https://home-assistant.io) frontend.

-[![Screenshot of the frontend](https://raw.githubusercontent.com/home-assistant/home-assistant-polymer/master/docs/screenshot.png)](https://home-assistant.io/demo/)
+[![Screenshot of the frontend](https://raw.githubusercontent.com/home-assistant/home-assistant-polymer/master/docs/screenshot.png)](https://demo.home-assistant.io/)

- [View demo of the Polymer frontend](https://home-assistant.io/demo/)
+- [View demo of Home Assistant](https://demo.home-assistant.io/)
 - [More information about Home Assistant](https://home-assistant.io)
 - [Frontend development instructions](https://developers.home-assistant.io/docs/en/frontend_index.html)

@@ -31,3 +31,5 @@ It is possible to compile the project and/or run commands in the development env
 ## License

 Home Assistant is open-source and Apache 2 licensed. Feel free to browse the repository, learn and reuse parts in your own projects.
+
+We use [BrowserStack](https://www.browserstack.com) to test Home Assistant on a large variation of devices.
@@ -7,31 +7,23 @@ trigger:
      - "*"
 pr: none
 variables:
-  - name: versionBuilder
-    value: "5.2"
-  - group: github
+  - name: versionWheels
+    value: '1.3-3.7-alpine3.10'
+  - name: versionNode
+    value: '12.1'
  - group: twine
+resources:
+  repositories:
+    - repository: azure
+      type: github
+      name: 'home-assistant/ci-azure'
+      endpoint: 'home-assistant'
+

 stages:
  - stage: "Validate"
    jobs:
-      - job: "VersionValidate"
-        pool:
-          vmImage: "ubuntu-latest"
-        steps:
-          - task: UsePythonVersion@0
-            displayName: "Use Python 3.7"
-            inputs:
-              versionSpec: "3.7"
-          - script: |
-              setup_version="$(python setup.py -V)"
-              branch_version="$(Build.SourceBranchName)"
-
-              if [ "${setup_version}" != "${branch_version}" ]; then
-                echo "Version of tag ${branch_version} don't match with ${setup_version}!"
-                exit 1
-              fi
-            displayName: "Check version of branch/tag"
+    - template: templates/azp-job-version.yaml@azure

  - stage: "Build"
    jobs:
@@ -44,9 +36,9 @@ stages:
            inputs:
              versionSpec: "3.7"
          - task: NodeTool@0
-            displayName: "Use Node 12.1"
+            displayName: "Use Node $(versionNode)"
            inputs:
-              versionSpec: "12.1"
+              versionSpec: "$(versionNode)"
          - script: pip install twine wheel
            displayName: "Install tools"
          - script: |
@@ -55,3 +47,18 @@ stages:

              script/release
            displayName: "Build and release package"
+      - template: templates/azp-job-wheels.yaml@azure
+        parameters:
+          builderVersion: '$(versionWheels)'
+          builderApk: 'build-base'
+          wheelsLocal: true
+          preBuild:
+          - task: NodeTool@0
+            displayName: "Use Node $(versionNode)"
+            inputs:
+              versionSpec: "$(versionNode)"
+          - script: |
+              set -e
+
+              yarn install
+              script/build_frontend
@@ -0,0 +1,70 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  batch: true
+  branches:
+    include:
+    - dev
+  paths:
+    include:
+    - translations/en.json
+pr: none
+schedules:
+  - cron: "30 0 * * *"
+    displayName: "translation update"
+    branches:
+      include:
+      - dev
+    always: true
+variables:
+- group: translation
+resources:
+  repositories:
+  - repository: azure
+    type: github
+    name: 'home-assistant/ci-azure'
+    endpoint: 'home-assistant'
+
+
+jobs:
+
+- job: 'Upload'
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - task: NodeTool@0
+    displayName: 'Use Node 12.x'
+    inputs:
+      versionSpec: '12.x'
+  - script: |
+      export LOKALISE_TOKEN="$(lokaliseToken)"
+      export AZURE_BRANCH="$(Build.SourceBranchName)"
+
+      ./script/translations_upload_base
+    displayName: 'Upload Translation'
+
+- job: 'Download'
+  dependsOn:
+  - 'Upload'
+  condition: or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual'))
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - task: NodeTool@0
+    displayName: 'Use Node 12.x'
+    inputs:
+      versionSpec: '12.x'
+  - template: templates/azp-step-git-init.yaml@azure
+  - script: |
+      export LOKALISE_TOKEN="$(lokaliseToken)"
+      export AZURE_BRANCH="$(Build.SourceBranchName)"
+
+      npm install
+      ./script/translations_download
+    displayName: 'Download Translation'
+  - script: |
+      git checkout dev
+      git add translation
+      git commit -am "[ci skip] Translation update"
+      git push
+    displayName: 'Update translation'
@@ -33,6 +33,7 @@ module.exports.babelLoaderConfig = ({ latestBuild }) => {
              pragma: "h",
            },
          ],
+          "@babel/plugin-proposal-optional-chaining",
          [
            require("@babel/plugin-proposal-decorators").default,
            { decoratorsBeforeExport: true },
@@ -0,0 +1,6 @@
+module.exports = {
+  isProdBuild: process.env.NODE_ENV === "production",
+  isStatsBuild: process.env.STATS === "1",
+  isTravis: process.env.TRAVIS === "true",
+  isNetlify: process.env.NETLIFY === "true",
+};
@@ -1,10 +1,13 @@
 // Run HA develop mode
 const gulp = require("gulp");

+const envVars = require("../env");
+
 require("./clean.js");
 require("./translations.js");
 require("./gen-icons.js");
 require("./gather-static.js");
+require("./compress.js");
 require("./webpack.js");
 require("./service-worker.js");
 require("./entry-html.js");
@@ -18,7 +21,7 @@ gulp.task(
    "clean",
    gulp.parallel(
      "gen-service-worker-dev",
-      "gen-icons",
+      gulp.parallel("gen-icons-app", "gen-icons-mdi"),
      "gen-pages-dev",
      "gen-index-app-dev",
      gulp.series("create-test-translation", "build-translations")
@@ -35,13 +38,11 @@ gulp.task(
      process.env.NODE_ENV = "production";
    },
    "clean",
-    gulp.parallel("gen-icons", "build-translations"),
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
    "copy-static",
-    gulp.parallel(
-      "webpack-prod-app",
-      // Do not compress static files in CI, it's SLOW.
-      ...(process.env.CI === "true" ? [] : ["compress-static"])
-    ),
+    "webpack-prod-app",
+    ...// Don't compress running tests
+    (envVars.isTravis ? [] : ["compress-app"]),
    gulp.parallel(
      "gen-pages-prod",
      "gen-index-app-prod",
@@ -1,4 +1,3 @@
-// Run cast develop mode
 const gulp = require("gulp");

 require("./clean.js");
@@ -16,7 +15,12 @@ gulp.task(
      process.env.NODE_ENV = "development";
    },
    "clean-cast",
-    gulp.parallel("gen-icons", "gen-index-cast-dev", "build-translations"),
+    gulp.parallel(
+      "gen-icons-app",
+      "gen-icons-mdi",
+      "gen-index-cast-dev",
+      "build-translations"
+    ),
    "copy-static-cast",
    "webpack-dev-server-cast"
  )
@@ -29,7 +33,7 @@ gulp.task(
      process.env.NODE_ENV = "production";
    },
    "clean-cast",
-    gulp.parallel("gen-icons", "build-translations"),
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
    "copy-static-cast",
    "webpack-prod-cast",
    "gen-index-cast-prod"
@@ -9,15 +9,31 @@ gulp.task(
    return del([config.root, config.build_dir]);
  })
 );
+
 gulp.task(
  "clean-demo",
  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
    return del([config.demo_root, config.build_dir]);
  })
 );
+
 gulp.task(
  "clean-cast",
  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
    return del([config.cast_root, config.build_dir]);
  })
 );
+
+gulp.task(
+  "clean-hassio",
+  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
+    return del([config.hassio_root, config.build_dir]);
+  })
+);
+
+gulp.task(
+  "clean-gallery",
+  gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
+    return del([config.gallery_root, config.build_dir]);
+  })
+);
@@ -0,0 +1,38 @@
+// Tasks to compress
+
+const gulp = require("gulp");
+const zopfli = require("gulp-zopfli-green");
+const merge = require("merge-stream");
+const path = require("path");
+const paths = require("../paths");
+
+gulp.task("compress-app", function compressApp() {
+  const jsLatest = gulp
+    .src(path.resolve(paths.output, "**/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(paths.output));
+
+  const jsEs5 = gulp
+    .src(path.resolve(paths.output_es5, "**/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(paths.output_es5));
+
+  const polyfills = gulp
+    .src(path.resolve(paths.static, "polyfills/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(path.resolve(paths.static, "polyfills")));
+
+  const translations = gulp
+    .src(path.resolve(paths.static, "translations/*.json"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(path.resolve(paths.static, "translations")));
+
+  return merge(jsLatest, jsEs5, polyfills, translations);
+});
+
+gulp.task("compress-hassio", function compressApp() {
+  return gulp
+    .src(path.resolve(paths.hassio_root, "**/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(paths.hassio_root));
+});
@@ -17,7 +17,8 @@ gulp.task(
    },
    "clean-demo",
    gulp.parallel(
-      "gen-icons",
+      "gen-icons-app",
+      "gen-icons-mdi",
      "gen-icons-demo",
      "gen-index-demo-dev",
      "build-translations"
@@ -34,7 +35,12 @@ gulp.task(
      process.env.NODE_ENV = "production";
    },
    "clean-demo",
-    gulp.parallel("gen-icons", "gen-icons-demo", "build-translations"),
+    gulp.parallel(
+      "gen-icons-app",
+      "gen-icons-mdi",
+      "gen-icons-demo",
+      "build-translations"
+    ),
    "copy-static-demo",
    "webpack-prod-demo",
    "gen-index-demo-prod"
@@ -0,0 +1,73 @@
+const del = require("del");
+const gulp = require("gulp");
+const mapStream = require("map-stream");
+
+const inDir = "translations";
+const downloadDir = inDir + "/downloads";
+
+const tasks = [];
+
+function hasHtml(data) {
+  return /<[a-z][\s\S]*>/i.test(data);
+}
+
+function recursiveCheckHasHtml(file, data, errors, recKey) {
+  Object.keys(data).forEach(function(key) {
+    if (typeof data[key] === "object") {
+      const nextRecKey = recKey ? `${recKey}.${key}` : key;
+      recursiveCheckHasHtml(file, data[key], errors, nextRecKey);
+    } else if (hasHtml(data[key])) {
+      errors.push(`HTML found in ${file.path} at key ${recKey}.${key}`);
+    }
+  });
+}
+
+function checkHtml() {
+  const errors = [];
+
+  return mapStream(function(file, cb) {
+    const content = file.contents;
+    let error;
+    if (content) {
+      if (hasHtml(String(content))) {
+        const data = JSON.parse(String(content));
+        recursiveCheckHasHtml(file, data, errors);
+        if (errors.length > 0) {
+          error = errors.join("\r\n");
+        }
+      }
+    }
+    cb(error, file);
+  });
+}
+
+let taskName = "clean-downloaded-translations";
+gulp.task(taskName, function() {
+  return del([`${downloadDir}/**`]);
+});
+tasks.push(taskName);
+
+taskName = "check-translations-html";
+gulp.task(taskName, function() {
+  return gulp.src(`${downloadDir}/*.json`).pipe(checkHtml());
+});
+tasks.push(taskName);
+
+taskName = "move-downloaded-translations";
+gulp.task(taskName, function() {
+  return gulp.src(`${downloadDir}/*.json`).pipe(gulp.dest(inDir));
+});
+tasks.push(taskName);
+
+taskName = "check-downloaded-translations";
+gulp.task(
+  taskName,
+  gulp.series(
+    "check-translations-html",
+    "move-downloaded-translations",
+    "clean-downloaded-translations"
+  )
+);
+tasks.push(taskName);
+
+module.exports = tasks;
@@ -11,12 +11,6 @@ const config = require("../paths.js");
 const templatePath = (tpl) =>
  path.resolve(config.polymer_dir, "src/html/", `${tpl}.html.template`);

-const demoTemplatePath = (tpl) =>
-  path.resolve(config.demo_dir, "src/html/", `${tpl}.html.template`);
-
-const castTemplatePath = (tpl) =>
-  path.resolve(config.cast_dir, "src/html/", `${tpl}.html.template`);
-
 const readFile = (pth) => fs.readFileSync(pth).toString();

 const renderTemplate = (pth, data = {}, pathFunc = templatePath) => {
@@ -25,10 +19,19 @@ const renderTemplate = (pth, data = {}, pathFunc = templatePath) => {
 };

 const renderDemoTemplate = (pth, data = {}) =>
-  renderTemplate(pth, data, demoTemplatePath);
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(config.demo_dir, "src/html/", `${tpl}.html.template`)
+  );

 const renderCastTemplate = (pth, data = {}) =>
-  renderTemplate(pth, data, castTemplatePath);
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(config.cast_dir, "src/html/", `${tpl}.html.template`)
+  );
+
+const renderGalleryTemplate = (pth, data = {}) =>
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(config.gallery_dir, "src/html/", `${tpl}.html.template`)
+  );

 const minifyHtml = (content) =>
  minify(content, {
@@ -209,8 +212,33 @@ gulp.task("gen-index-demo-prod", (done) => {
    es5Compatibility: es5Manifest["compatibility.js"],
    es5DemoJS: es5Manifest["main.js"],
  });
-  const minified = minifyHtml(content).replace(/#THEMEC/g, "{{ theme_color }}");
+  const minified = minifyHtml(content);

  fs.outputFileSync(path.resolve(config.demo_root, "index.html"), minified);
  done();
 });
+
+gulp.task("gen-index-gallery-dev", (done) => {
+  // In dev mode we don't mangle names, so we hardcode urls. That way we can
+  // run webpack as last in watch mode, which blocks output.
+  const content = renderGalleryTemplate("index", {
+    latestGalleryJS: "./entrypoint.js",
+  });
+
+  fs.outputFileSync(path.resolve(config.gallery_root, "index.html"), content);
+  done();
+});
+
+gulp.task("gen-index-gallery-prod", (done) => {
+  const latestManifest = require(path.resolve(
+    config.gallery_output,
+    "manifest.json"
+  ));
+  const content = renderGalleryTemplate("index", {
+    latestGalleryJS: latestManifest["entrypoint.js"],
+  });
+  const minified = minifyHtml(content);
+
+  fs.outputFileSync(path.resolve(config.gallery_root, "index.html"), minified);
+  done();
+});
@@ -0,0 +1,38 @@
+// Run demo develop mode
+const gulp = require("gulp");
+
+require("./clean.js");
+require("./translations.js");
+require("./gen-icons.js");
+require("./gather-static.js");
+require("./webpack.js");
+require("./service-worker.js");
+require("./entry-html.js");
+
+gulp.task(
+  "develop-gallery",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "development";
+    },
+    "clean-gallery",
+    gulp.parallel("gen-icons-app", "gen-icons-app", "build-translations"),
+    "copy-static-gallery",
+    "gen-index-gallery-dev",
+    "webpack-dev-server-gallery"
+  )
+);
+
+gulp.task(
+  "build-gallery",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "production";
+    },
+    "clean-gallery",
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
+    "copy-static-gallery",
+    "webpack-prod-gallery",
+    "gen-index-gallery-prod"
+  )
+);
@@ -4,8 +4,6 @@ const gulp = require("gulp");
 const path = require("path");
 const cpx = require("cpx");
 const fs = require("fs-extra");
-const zopfli = require("gulp-zopfli-green");
-const merge = require("merge-stream");
 const paths = require("../paths");

 const npmPath = (...parts) =>
@@ -67,20 +65,6 @@ function copyMapPanel(staticDir) {
  );
 }

-function compressStatic(staticDir) {
-  const staticPath = genStaticPath(staticDir);
-  const polyfills = gulp
-    .src(staticPath("polyfills/*.js"))
-    .pipe(zopfli())
-    .pipe(gulp.dest(staticPath("polyfills")));
-  const translations = gulp
-    .src(staticPath("translations/*.json"))
-    .pipe(zopfli())
-    .pipe(gulp.dest(staticPath("translations")));
-
-  return merge(polyfills, translations);
-}
-
 gulp.task("copy-static", (done) => {
  const staticDir = paths.static;
  const staticPath = genStaticPath(paths.static);
@@ -100,11 +84,12 @@ gulp.task("copy-static", (done) => {
  done();
 });

-gulp.task("compress-static", () => compressStatic(paths.static));
-
 gulp.task("copy-static-demo", (done) => {
  // Copy app static files
-  fs.copySync(polyPath("public"), paths.demo_root);
+  fs.copySync(
+    polyPath("public/static"),
+    path.resolve(paths.demo_root, "static")
+  );
  // Copy demo static files
  fs.copySync(path.resolve(paths.demo_dir, "public"), paths.demo_root);

@@ -126,3 +111,15 @@ gulp.task("copy-static-cast", (done) => {
  copyTranslations(paths.cast_static);
  done();
 });
+
+gulp.task("copy-static-gallery", (done) => {
+  // Copy app static files
+  fs.copySync(polyPath("public/static"), paths.gallery_static);
+  // Copy gallery static files
+  fs.copySync(path.resolve(paths.gallery_dir, "public"), paths.gallery_root);
+
+  copyMapPanel(paths.gallery_static);
+  copyFonts(paths.gallery_static);
+  copyTranslations(paths.gallery_static);
+  done();
+});
@@ -57,18 +57,6 @@ function generateIconset(iconsetName, iconNames) {
  return `<ha-iconset-svg name="${iconsetName}" size="24"><svg><defs>${iconDefs}</defs></svg></ha-iconset-svg>`;
 }

-// Generate the full MDI iconset
-function genMDIIcons() {
-  const meta = JSON.parse(
-    fs.readFileSync(path.resolve(ICON_PACKAGE_PATH, META_PATH), "UTF-8")
-  );
-  const iconNames = meta.map((iconInfo) => iconInfo.name);
-  if (!fs.existsSync(OUTPUT_DIR)) {
-    fs.mkdirSync(OUTPUT_DIR);
-  }
-  fs.writeFileSync(MDI_OUTPUT_PATH, generateIconset("mdi", iconNames));
-}
-
 // Helper function to map recursively over files in a folder and it's subfolders
 function mapFiles(startPath, filter, mapFunc) {
  const files = fs.readdirSync(startPath);
@@ -101,24 +89,27 @@ function findIcons(searchPath, iconsetName) {
  return icons;
 }

-function genHassIcons() {
+gulp.task("gen-icons-mdi", (done) => {
+  const meta = JSON.parse(
+    fs.readFileSync(path.resolve(ICON_PACKAGE_PATH, META_PATH), "UTF-8")
+  );
+  const iconNames = meta.map((iconInfo) => iconInfo.name);
+  if (!fs.existsSync(OUTPUT_DIR)) {
+    fs.mkdirSync(OUTPUT_DIR);
+  }
+  fs.writeFileSync(MDI_OUTPUT_PATH, generateIconset("mdi", iconNames));
+  done();
+});
+
+gulp.task("gen-icons-app", (done) => {
  const iconNames = findIcons("./src", "hass");
  BUILT_IN_PANEL_ICONS.forEach((name) => iconNames.add(name));
  if (!fs.existsSync(OUTPUT_DIR)) {
    fs.mkdirSync(OUTPUT_DIR);
  }
  fs.writeFileSync(HASS_OUTPUT_PATH, generateIconset("hass", iconNames));
-}
-
-gulp.task("gen-icons-mdi", (done) => {
-  genMDIIcons();
  done();
 });
-gulp.task("gen-icons-hass", (done) => {
-  genHassIcons();
-  done();
-});
-gulp.task("gen-icons", gulp.series("gen-icons-hass", "gen-icons-mdi"));

 gulp.task("gen-icons-demo", (done) => {
  const iconNames = findIcons(path.resolve(paths.demo_dir, "./src"), "hademo");
@@ -129,8 +120,21 @@ gulp.task("gen-icons-demo", (done) => {
  done();
 });

-module.exports = {
-  findIcons,
-  generateIconset,
-  genMDIIcons,
-};
+gulp.task("gen-icons-hassio", (done) => {
+  const iconNames = findIcons(
+    path.resolve(paths.hassio_dir, "./src"),
+    "hassio"
+  );
+  // Find hassio icons inside HA main repo.
+  for (const item of findIcons(
+    path.resolve(paths.polymer_dir, "./src"),
+    "hassio"
+  )) {
+    iconNames.add(item);
+  }
+  fs.writeFileSync(
+    path.resolve(paths.hassio_dir, "hassio-icons.html"),
+    generateIconset("hassio", iconNames)
+  );
+  done();
+});
@@ -0,0 +1,34 @@
+const gulp = require("gulp");
+
+const envVars = require("../env");
+
+require("./clean.js");
+require("./gen-icons.js");
+require("./webpack.js");
+require("./compress.js");
+
+gulp.task(
+  "develop-hassio",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "development";
+    },
+    "clean-hassio",
+    gulp.parallel("gen-icons-hassio", "gen-icons-mdi"),
+    "webpack-watch-hassio"
+  )
+);
+
+gulp.task(
+  "build-hassio",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "production";
+    },
+    "clean-hassio",
+    gulp.parallel("gen-icons-hassio", "gen-icons-mdi"),
+    "webpack-prod-hassio",
+    ...// Don't compress running tests
+    (envVars.isTravis ? [] : ["compress-hassio"])
+  )
+);
@@ -45,11 +45,10 @@ function recursiveFlatten(prefix, data) {
  let output = {};
  Object.keys(data).forEach(function(key) {
    if (typeof data[key] === "object") {
-      output = Object.assign(
-        {},
-        output,
-        recursiveFlatten(prefix + key + ".", data[key])
-      );
+      output = {
+        ...output,
+        ...recursiveFlatten(prefix + key + ".", data[key]),
+      };
    } else {
      output[prefix + key] = data[key];
    }
@@ -99,18 +98,16 @@ function recursiveEmpty(data) {
 * @link https://docs.lokalise.co/article/KO5SZWLLsy-key-referencing
 */
 const re_key_reference = /\[%key:([^%]+)%\]/;
-function lokalise_transform(data, original) {
+function lokaliseTransform(data, original, file) {
  const output = {};
  Object.entries(data).forEach(([key, value]) => {
    if (value instanceof Object) {
-      output[key] = lokalise_transform(value, original);
+      output[key] = lokaliseTransform(value, original, file);
    } else {
      output[key] = value.replace(re_key_reference, (match, key) => {
        const replace = key.split("::").reduce((tr, k) => tr[k], original);
        if (typeof replace !== "string") {
-          throw Error(
-            `Invalid key placeholder ${key} in src/translations/en.json`
-          );
+          throw Error(`Invalid key placeholder ${key} in ${file.path}`);
        }
        return replace;
      });
@@ -183,7 +180,7 @@ gulp.task(
      .src("src/translations/en.json")
      .pipe(
        transform(function(data, file) {
-          return lokalise_transform(data, data);
+          return lokaliseTransform(data, data, file);
        })
      )
      .pipe(rename("translationMaster.json"))
@@ -198,6 +195,11 @@ gulp.task(
  gulp.series("build-master-translation", function() {
    return gulp
      .src([inDir + "/*.json", workDir + "/test.json"], { allowEmpty: true })
+      .pipe(
+        transform(function(data, file) {
+          return lokaliseTransform(data, data, file);
+        })
+      )
      .pipe(
        foreach(function(stream, file) {
          // For each language generate a merged json file. It begins with the master
@@ -214,7 +216,7 @@ gulp.task(
            const lang = subtags.slice(0, i).join("-");
            if (lang === "test") {
              src.push(workDir + "/test.json");
-            } else {
+            } else if (lang !== "en") {
              src.push(inDir + "/" + lang + ".json");
            }
          }
@@ -1,6 +1,5 @@
 // Tasks to run webpack.
 const gulp = require("gulp");
-const path = require("path");
 const webpack = require("webpack");
 const WebpackDevServer = require("webpack-dev-server");
 const log = require("fancy-log");
@@ -9,8 +8,33 @@ const {
  createAppConfig,
  createDemoConfig,
  createCastConfig,
+  createHassioConfig,
+  createGalleryConfig,
 } = require("../webpack");

+const bothBuilds = (createConfigFunc, params) => [
+  createConfigFunc({ ...params, latestBuild: true }),
+  createConfigFunc({ ...params, latestBuild: false }),
+];
+
+const runDevServer = ({
+  compiler,
+  contentBase,
+  port,
+  listenHost = "localhost",
+}) =>
+  new WebpackDevServer(compiler, {
+    open: true,
+    watchContentBase: true,
+    contentBase,
+  }).listen(port, listenHost, function(err) {
+    if (err) {
+      throw err;
+    }
+    // Server listening
+    log("[webpack-dev-server]", `http://localhost:${port}`);
+  });
+
 const handler = (done) => (err, stats) => {
  if (err) {
    console.log(err.stack || err);
@@ -32,20 +56,11 @@ const handler = (done) => (err, stats) => {
 };

 gulp.task("webpack-watch-app", () => {
-  const compiler = webpack([
-    createAppConfig({
-      isProdBuild: false,
-      latestBuild: true,
-      isStatsBuild: false,
-    }),
-    createAppConfig({
-      isProdBuild: false,
-      latestBuild: false,
-      isStatsBuild: false,
-    }),
-  ]);
-  compiler.watch({}, handler());
  // we are not calling done, so this command will run forever
+  webpack(bothBuilds(createAppConfig, { isProdBuild: false })).watch(
+    {},
+    handler()
+  );
 });

 gulp.task(
@@ -53,47 +68,17 @@ gulp.task(
  () =>
    new Promise((resolve) =>
      webpack(
-        [
-          createAppConfig({
-            isProdBuild: true,
-            latestBuild: true,
-            isStatsBuild: false,
-          }),
-          createAppConfig({
-            isProdBuild: true,
-            latestBuild: false,
-            isStatsBuild: false,
-          }),
-        ],
+        bothBuilds(createAppConfig, { isProdBuild: true }),
        handler(resolve)
      )
    )
 );

 gulp.task("webpack-dev-server-demo", () => {
-  const compiler = webpack([
-    createDemoConfig({
-      isProdBuild: false,
-      latestBuild: false,
-      isStatsBuild: false,
-    }),
-    createDemoConfig({
-      isProdBuild: false,
-      latestBuild: true,
-      isStatsBuild: false,
-    }),
-  ]);
-
-  new WebpackDevServer(compiler, {
-    open: true,
-    watchContentBase: true,
-    contentBase: path.resolve(paths.demo_dir, "dist"),
-  }).listen(8090, "localhost", function(err) {
-    if (err) {
-      throw err;
-    }
-    // Server listening
-    log("[webpack-dev-server]", "http://localhost:8090");
+  runDevServer({
+    compiler: webpack(bothBuilds(createDemoConfig, { isProdBuild: false })),
+    contentBase: paths.demo_root,
+    port: 8090,
  });
 });

@@ -102,51 +87,22 @@ gulp.task(
  () =>
    new Promise((resolve) =>
      webpack(
-        [
-          createDemoConfig({
-            isProdBuild: true,
-            latestBuild: false,
-            isStatsBuild: false,
-          }),
-          createDemoConfig({
-            isProdBuild: true,
-            latestBuild: true,
-            isStatsBuild: false,
-          }),
-        ],
+        bothBuilds(createDemoConfig, {
+          isProdBuild: true,
+        }),
        handler(resolve)
      )
    )
 );

 gulp.task("webpack-dev-server-cast", () => {
-  const compiler = webpack([
-    createCastConfig({
-      isProdBuild: false,
-      latestBuild: false,
-    }),
-    createCastConfig({
-      isProdBuild: false,
-      latestBuild: true,
-    }),
-  ]);
-
-  new WebpackDevServer(compiler, {
-    open: true,
-    watchContentBase: true,
-    contentBase: path.resolve(paths.cast_dir, "dist"),
-  }).listen(
-    8080,
+  runDevServer({
+    compiler: webpack(bothBuilds(createCastConfig, { isProdBuild: false })),
+    contentBase: paths.cast_root,
+    port: 8080,
    // Accessible from the network, because that's how Cast hits it.
-    "0.0.0.0",
-    function(err) {
-      if (err) {
-        throw err;
-      }
-      // Server listening
-      log("[webpack-dev-server]", "http://localhost:8080");
-    }
-  );
+    listenHost: "0.0.0.0",
+  });
 });

 gulp.task(
@@ -154,16 +110,59 @@ gulp.task(
  () =>
    new Promise((resolve) =>
      webpack(
-        [
-          createCastConfig({
-            isProdBuild: true,
-            latestBuild: false,
-          }),
-          createCastConfig({
-            isProdBuild: true,
-            latestBuild: true,
-          }),
-        ],
+        bothBuilds(createCastConfig, {
+          isProdBuild: true,
+        }),
+
+        handler(resolve)
+      )
+    )
+);
+
+gulp.task("webpack-watch-hassio", () => {
+  // we are not calling done, so this command will run forever
+  webpack(
+    createHassioConfig({
+      isProdBuild: false,
+      latestBuild: false,
+    })
+  ).watch({}, handler());
+});
+
+gulp.task(
+  "webpack-prod-hassio",
+  () =>
+    new Promise((resolve) =>
+      webpack(
+        createHassioConfig({
+          isProdBuild: true,
+          latestBuild: false,
+        }),
+        handler(resolve)
+      )
+    )
+);
+
+gulp.task("webpack-dev-server-gallery", () => {
+  runDevServer({
+    compiler: webpack(
+      createGalleryConfig({ latestBuild: true, isProdBuild: false })
+    ),
+    contentBase: paths.gallery_root,
+    port: 8100,
+  });
+});
+
+gulp.task(
+  "webpack-prod-gallery",
+  () =>
+    new Promise((resolve) =>
+      webpack(
+        createGalleryConfig({
+          isProdBuild: true,
+          latestBuild: true,
+        }),
+
        handler(resolve)
      )
    )
@@ -20,4 +20,13 @@ module.exports = {
  cast_static: path.resolve(__dirname, "../cast/dist/static"),
  cast_output: path.resolve(__dirname, "../cast/dist/frontend_latest"),
  cast_output_es5: path.resolve(__dirname, "../cast/dist/frontend_es5"),
+
+  gallery_dir: path.resolve(__dirname, "../gallery"),
+  gallery_root: path.resolve(__dirname, "../gallery/dist"),
+  gallery_output: path.resolve(__dirname, "../gallery/dist/frontend_latest"),
+  gallery_static: path.resolve(__dirname, "../gallery/dist/static"),
+
+  hassio_dir: path.resolve(__dirname, "../hassio"),
+  hassio_root: path.resolve(__dirname, "../hassio/build"),
+  hassio_publicPath: "/api/hassio/app/",
 };
@@ -3,8 +3,6 @@ const fs = require("fs");
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
 const WorkboxPlugin = require("workbox-webpack-plugin");
-const CompressionPlugin = require("compression-webpack-plugin");
-const zopfli = require("@gfx/zopfli");
 const ManifestPlugin = require("webpack-manifest-plugin");
 const paths = require("./paths.js");
 const { babelLoaderConfig } = require("./babel.js");
@@ -17,253 +15,246 @@ if (!version) {
 }
 version = version[0];

-const genMode = (isProdBuild) => (isProdBuild ? "production" : "development");
-const genDevTool = (isProdBuild) =>
-  isProdBuild ? "source-map" : "inline-cheap-module-source-map";
-const genFilename = (isProdBuild, dontHash = new Set()) => ({ chunk }) => {
-  if (!isProdBuild || dontHash.has(chunk.name)) {
-    return `${chunk.name}.js`;
-  }
-  return `${chunk.name}.${chunk.hash.substr(0, 8)}.js`;
-};
-const genChunkFilename = (isProdBuild, isStatsBuild) =>
-  isProdBuild && !isStatsBuild ? "chunk.[chunkhash].js" : "[name].chunk.js";
-
-const resolve = {
-  extensions: [".ts", ".js", ".json", ".tsx"],
-  alias: {
-    react: "preact-compat",
-    "react-dom": "preact-compat",
-    // Not necessary unless you consume a module using `createClass`
-    "create-react-class": "preact-compat/lib/create-react-class",
-    // Not necessary unless you consume a module requiring `react-dom-factories`
-    "react-dom-factories": "preact-compat/lib/react-dom-factories",
-  },
-};
-
-const cssLoader = {
-  test: /\.css$/,
-  use: "raw-loader",
-};
-const htmlLoader = {
-  test: /\.(html)$/,
-  use: {
-    loader: "html-loader",
-    options: {
-      exportAsEs6Default: true,
-    },
-  },
-};
-
-const plugins = [
-  // Ignore moment.js locales
-  new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-  // Color.js is bloated, it contains all color definitions for all material color sets.
-  new webpack.NormalModuleReplacementPlugin(
-    /@polymer\/paper-styles\/color\.js$/,
-    path.resolve(paths.polymer_dir, "src/util/empty.js")
-  ),
-  // Ignore roboto pointing at CDN. We use local font-roboto-local.
-  new webpack.NormalModuleReplacementPlugin(
-    /@polymer\/font-roboto\/roboto\.js$/,
-    path.resolve(paths.polymer_dir, "src/util/empty.js")
-  ),
-  // Ignore mwc icons pointing at CDN.
-  new webpack.NormalModuleReplacementPlugin(
-    /@material\/mwc-icon\/mwc-icon-font\.js$/,
-    path.resolve(paths.polymer_dir, "src/util/empty.js")
-  ),
-];
-
-const optimization = (latestBuild) => ({
-  minimizer: [
-    new TerserPlugin({
-      cache: true,
-      parallel: true,
-      extractComments: true,
-      sourceMap: true,
-      terserOptions: {
-        safari10: true,
-        ecma: latestBuild ? undefined : 5,
-      },
-    }),
-  ],
-});
-
-const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  const isCI = process.env.CI === "true";
-
-  // Create an object mapping browser urls to their paths during build
-  const translationMetadata = require("../build-translations/translationMetadata.json");
-  const workBoxTranslationsTemplatedURLs = {};
-  const englishFP = translationMetadata.translations.en.fingerprints;
-  Object.keys(englishFP).forEach((key) => {
-    workBoxTranslationsTemplatedURLs[
-      `/static/translations/${englishFP[key]}`
-    ] = `build-translations/output/${key}.json`;
-  });
-
-  const entry = {
-    app: "./src/entrypoints/app.ts",
-    authorize: "./src/entrypoints/authorize.ts",
-    onboarding: "./src/entrypoints/onboarding.ts",
-    core: "./src/entrypoints/core.ts",
-    compatibility: "./src/entrypoints/compatibility.ts",
-    "custom-panel": "./src/entrypoints/custom-panel.ts",
-    "hass-icons": "./src/entrypoints/hass-icons.ts",
-  };
-
+const createWebpackConfig = ({
+  entry,
+  outputRoot,
+  defineOverlay,
+  isProdBuild,
+  latestBuild,
+  isStatsBuild,
+}) => {
  return {
-    mode: genMode(isProdBuild),
-    devtool: genDevTool(isProdBuild),
+    mode: isProdBuild ? "production" : "development",
+    devtool: isProdBuild ? "source-map" : "inline-cheap-module-source-map",
    entry,
    module: {
-      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
+      rules: [
+        babelLoaderConfig({ latestBuild }),
+        {
+          test: /\.css$/,
+          use: "raw-loader",
+        },
+        {
+          test: /\.(html)$/,
+          use: {
+            loader: "html-loader",
+            options: {
+              exportAsEs6Default: true,
+            },
+          },
+        },
+      ],
+    },
+    optimization: {
+      minimizer: [
+        new TerserPlugin({
+          cache: true,
+          parallel: true,
+          extractComments: true,
+          sourceMap: true,
+          terserOptions: {
+            safari10: true,
+            ecma: latestBuild ? undefined : 5,
+          },
+        }),
+      ],
    },
-    optimization: optimization(latestBuild),
    plugins: [
      new ManifestPlugin(),
      new webpack.DefinePlugin({
-        __DEV__: JSON.stringify(!isProdBuild),
-        __DEMO__: false,
+        __DEV__: !isProdBuild,
        __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
        __VERSION__: JSON.stringify(version),
+        __DEMO__: false,
        __STATIC_PATH__: "/static/",
        "process.env.NODE_ENV": JSON.stringify(
          isProdBuild ? "production" : "development"
        ),
+        ...defineOverlay,
      }),
-      ...plugins,
-      isProdBuild &&
-        !isCI &&
-        !isStatsBuild &&
-        new CompressionPlugin({
-          cache: true,
-          exclude: [/\.js\.map$/, /\.LICENSE$/, /\.py$/, /\.txt$/],
-          algorithm(input, compressionOptions, callback) {
-            return zopfli.gzip(input, compressionOptions, callback);
-          },
-        }),
-      latestBuild &&
-        new WorkboxPlugin.InjectManifest({
-          swSrc: "./src/entrypoints/service-worker-hass.js",
-          swDest: "service_worker.js",
-          importWorkboxFrom: "local",
-          include: [/\.js$/],
-          templatedURLs: {
-            ...workBoxTranslationsTemplatedURLs,
-            "/static/icons/favicon-192x192.png":
-              "public/icons/favicon-192x192.png",
-            "/static/fonts/roboto/Roboto-Light.woff2":
-              "node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2",
-            "/static/fonts/roboto/Roboto-Medium.woff2":
-              "node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2",
-            "/static/fonts/roboto/Roboto-Regular.woff2":
-              "node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2",
-            "/static/fonts/roboto/Roboto-Bold.woff2":
-              "node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2",
-          },
-        }),
+      // Ignore moment.js locales
+      new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+      // Color.js is bloated, it contains all color definitions for all material color sets.
+      new webpack.NormalModuleReplacementPlugin(
+        /@polymer\/paper-styles\/color\.js$/,
+        path.resolve(paths.polymer_dir, "src/util/empty.js")
+      ),
+      // Ignore roboto pointing at CDN. We use local font-roboto-local.
+      new webpack.NormalModuleReplacementPlugin(
+        /@polymer\/font-roboto\/roboto\.js$/,
+        path.resolve(paths.polymer_dir, "src/util/empty.js")
+      ),
+      // Ignore mwc icons pointing at CDN.
+      new webpack.NormalModuleReplacementPlugin(
+        /@material\/mwc-icon\/mwc-icon-font\.js$/,
+        path.resolve(paths.polymer_dir, "src/util/empty.js")
+      ),
    ].filter(Boolean),
-    output: {
-      filename: genFilename(isProdBuild),
-      chunkFilename: genChunkFilename(isProdBuild, isStatsBuild),
-      path: latestBuild ? paths.output : paths.output_es5,
-      publicPath: latestBuild ? "/frontend_latest/" : "/frontend_es5/",
+    resolve: {
+      extensions: [".ts", ".js", ".json"],
+      alias: {
+        react: "preact-compat",
+        "react-dom": "preact-compat",
+        // Not necessary unless you consume a module using `createClass`
+        "create-react-class": "preact-compat/lib/create-react-class",
+        // Not necessary unless you consume a module requiring `react-dom-factories`
+        "react-dom-factories": "preact-compat/lib/react-dom-factories",
+      },
+    },
+    output: {
+      filename: ({ chunk }) => {
+        const dontHash = new Set();
+
+        if (!isProdBuild || dontHash.has(chunk.name)) {
+          return `${chunk.name}.js`;
+        }
+        return `${chunk.name}.${chunk.hash.substr(0, 8)}.js`;
+      },
+      chunkFilename:
+        isProdBuild && !isStatsBuild
+          ? "chunk.[chunkhash].js"
+          : "[name].chunk.js",
+      path: path.resolve(
+        outputRoot,
+        latestBuild ? "frontend_latest" : "frontend_es5"
+      ),
+      publicPath: latestBuild ? "/frontend_latest/" : "/frontend_es5/",
+      // For workerize loader
+      globalObject: "self",
    },
-    resolve,
  };
 };

+const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
+  const config = createWebpackConfig({
+    entry: {
+      app: "./src/entrypoints/app.ts",
+      authorize: "./src/entrypoints/authorize.ts",
+      onboarding: "./src/entrypoints/onboarding.ts",
+      core: "./src/entrypoints/core.ts",
+      compatibility: "./src/entrypoints/compatibility.ts",
+      "custom-panel": "./src/entrypoints/custom-panel.ts",
+      "hass-icons": "./src/entrypoints/hass-icons.ts",
+    },
+    outputRoot: paths.root,
+    isProdBuild,
+    latestBuild,
+    isStatsBuild,
+  });
+
+  if (latestBuild) {
+    // Create an object mapping browser urls to their paths during build
+    const translationMetadata = require("../build-translations/translationMetadata.json");
+    const workBoxTranslationsTemplatedURLs = {};
+    const englishFP = translationMetadata.translations.en.fingerprints;
+    Object.keys(englishFP).forEach((key) => {
+      workBoxTranslationsTemplatedURLs[
+        `/static/translations/${englishFP[key]}`
+      ] = `build-translations/output/${key}.json`;
+    });
+
+    config.plugins.push(
+      new WorkboxPlugin.InjectManifest({
+        swSrc: "./src/entrypoints/service-worker-hass.js",
+        swDest: "service_worker.js",
+        importWorkboxFrom: "local",
+        include: [/\.js$/],
+        templatedURLs: {
+          ...workBoxTranslationsTemplatedURLs,
+          "/static/icons/favicon-192x192.png":
+            "public/icons/favicon-192x192.png",
+          "/static/fonts/roboto/Roboto-Light.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2",
+          "/static/fonts/roboto/Roboto-Medium.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2",
+          "/static/fonts/roboto/Roboto-Regular.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2",
+          "/static/fonts/roboto/Roboto-Bold.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2",
+        },
+      })
+    );
+  }
+
+  return config;
+};
+
 const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  return {
-    mode: genMode(isProdBuild),
-    devtool: genDevTool(isProdBuild),
+  return createWebpackConfig({
    entry: {
-      main: "./demo/src/entrypoint.ts",
-      compatibility: "./src/entrypoints/compatibility.ts",
-    },
-    module: {
-      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
-    },
-    optimization: optimization(latestBuild),
-    plugins: [
-      new ManifestPlugin(),
-      new webpack.DefinePlugin({
-        __DEV__: !isProdBuild,
-        __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
-        __VERSION__: JSON.stringify(`DEMO-${version}`),
-        __DEMO__: true,
-        __STATIC_PATH__: "/static/",
-        "process.env.NODE_ENV": JSON.stringify(
-          isProdBuild ? "production" : "development"
-        ),
-      }),
-      ...plugins,
-    ].filter(Boolean),
-    resolve,
-    output: {
-      filename: genFilename(isProdBuild),
-      chunkFilename: genChunkFilename(isProdBuild, isStatsBuild),
-      path: path.resolve(
-        paths.demo_root,
-        latestBuild ? "frontend_latest" : "frontend_es5"
+      main: path.resolve(paths.demo_dir, "src/entrypoint.ts"),
+      compatibility: path.resolve(
+        paths.polymer_dir,
+        "src/entrypoints/compatibility.ts"
      ),
-      publicPath: latestBuild ? "/frontend_latest/" : "/frontend_es5/",
    },
-  };
+    outputRoot: paths.demo_root,
+    defineOverlay: {
+      __VERSION__: JSON.stringify(`DEMO-${version}`),
+      __DEMO__: true,
+    },
+    isProdBuild,
+    latestBuild,
+    isStatsBuild,
+  });
 };

 const createCastConfig = ({ isProdBuild, latestBuild }) => {
-  const isStatsBuild = false;
  const entry = {
-    launcher: "./cast/src/launcher/entrypoint.ts",
+    launcher: path.resolve(paths.cast_dir, "src/launcher/entrypoint.ts"),
  };

  if (latestBuild) {
-    entry.receiver = "./cast/src/receiver/entrypoint.ts";
+    entry.receiver = path.resolve(paths.cast_dir, "src/receiver/entrypoint.ts");
  }

-  return {
-    mode: genMode(isProdBuild),
-    devtool: genDevTool(isProdBuild),
+  return createWebpackConfig({
    entry,
-    module: {
-      rules: [babelLoaderConfig({ latestBuild }), cssLoader, htmlLoader],
+    outputRoot: paths.cast_root,
+    isProdBuild,
+    latestBuild,
+  });
+};
+
+const createHassioConfig = ({ isProdBuild, latestBuild }) => {
+  if (latestBuild) {
+    throw new Error("Hass.io does not support latest build!");
+  }
+  const config = createWebpackConfig({
+    entry: {
+      entrypoint: path.resolve(paths.hassio_dir, "src/entrypoint.js"),
    },
-    optimization: optimization(latestBuild),
-    plugins: [
-      new ManifestPlugin(),
-      new webpack.DefinePlugin({
-        __DEV__: !isProdBuild,
-        __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
-        __VERSION__: JSON.stringify(version),
-        __DEMO__: false,
-        __STATIC_PATH__: "/static/",
-        "process.env.NODE_ENV": JSON.stringify(
-          isProdBuild ? "production" : "development"
-        ),
-      }),
-      ...plugins,
-    ].filter(Boolean),
-    resolve,
-    output: {
-      filename: genFilename(isProdBuild),
-      chunkFilename: genChunkFilename(isProdBuild, isStatsBuild),
-      path: path.resolve(
-        paths.cast_root,
-        latestBuild ? "frontend_latest" : "frontend_es5"
-      ),
-      publicPath: latestBuild ? "/frontend_latest/" : "/frontend_es5/",
+    outputRoot: "",
+    isProdBuild,
+    latestBuild,
+  });
+
+  config.output.path = paths.hassio_root;
+  config.output.publicPath = paths.hassio_publicPath;
+
+  return config;
+};
+
+const createGalleryConfig = ({ isProdBuild, latestBuild }) => {
+  if (!latestBuild) {
+    throw new Error("Gallery only supports latest build!");
+  }
+  const config = createWebpackConfig({
+    entry: {
+      entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"),
    },
-  };
+    outputRoot: paths.gallery_root,
+    isProdBuild,
+    latestBuild,
+  });
+
+  return config;
 };

 module.exports = {
-  resolve,
-  plugins,
-  optimization,
  createAppConfig,
  createDemoConfig,
  createCastConfig,
+  createHassioConfig,
+  createGalleryConfig,
 };
@@ -25,7 +25,7 @@ Home Assistant Cast is made up of two separate applications:

 ### Setting dev variables

-Open `src/cast/const.ts` and change `CAST_DEV` to `true` and `CAST_DEV_APP_ID` to the ID of the app you just created.
+Open `src/cast/dev_const.ts` and change `CAST_DEV_APP_ID` to the ID of the app you just created. And set the `CAST_DEV_HASS_URL` to the url of you development machine.

 ### Changing configuration

@@ -0,0 +1,20 @@
+/*
+  Cache-Control: public, max-age: 0, s-maxage=3600, must-revalidate
+  Content-Security-Policy: form-action https:
+  Feature-Policy: vibrate 'none'; geolocation 'none'; midi 'none'; microphone 'none'; camera 'none'; magnetometer 'none'; gyroscope 'none'; speaker 'none'; vibrate 'none'; payment 'none'
+  Referrer-Policy: no-referrer-when-downgrade
+  X-Content-Type-Options: nosniff
+  X-Frame-Options: DENY
+  X-XSS-Protection: 1; mode=block
+
+/images/*
+  Cache-Control: public, max-age: 604800, s-maxage=604800
+
+/manifest.json
+  Cache-Control: public, max-age: 3600, s-maxage=3600
+
+/frontend_es5/*
+  Cache-Control: public, max-age: 604800, s-maxage=604800
+
+/frontend_latest/*
+  Cache-Control: public, max-age: 604800, s-maxage=604800
@@ -1,3 +1,5 @@
 # Run it twice, second time we just delete.
 aws s3 sync dist s3://cast.home-assistant.io --acl public-read
-aws s3 sync dist s3://cast.home-assistant.io --acl public-read --delete
+# Don't delete as it might break open sites that need to load code splitted things.
+# aws s3 sync dist s3://cast.home-assistant.io --acl public-read --delete
+# Todo : update JS first, HTML last.
@@ -118,7 +118,42 @@
        </p>
      </div>

-      <div class="section-header">How does Home Assistant Cast work?</div>
+      <div class="section-header" id="https">
+        Why does Home Assistant Cast require me to authorize my Home Assistant
+        instance?
+      </div>
+      <div class="card-content">
+        <p>
+          You're currently looking at the Home Assistant Cast launcher
+          application. This is a standalone application to launch Home Assistant
+          Cast on your Chromecast. Because Chromecasts do not allow us to log in
+          to Home Assistant, we need to supply authentication to it from the
+          launcher. This authentication is obtained when you authorize your
+          instance. Your authentication credentials will remain in your browser
+          and on your Cast device.
+        </p>
+        <p>
+          Your authentication credentials or Home Assistant url are never sent
+          to the Cloud. You can validate this behavior in
+          <a
+            href="https://github.com/home-assistant/home-assistant-polymer/tree/dev/cast"
+            target="_blank"
+            >the source code</a
+          >.
+        </p>
+        <p>
+          The launcher application exists to make it possible to use Home
+          Assistant Cast with older versions of Home Assistant.
+        </p>
+        <p>
+          Starting with Home Assistant 0.97, Home Assistant Cast is also built
+          into the Lovelace UI as a special entities card row. Since the
+          Lovelace UI already has authentication, you will be able to start
+          casting right away.
+        </p>
+      </div>
+
+      <div class="section-header">Wat does Home Assistant Cast do?</div>
      <div class="card-content">
        <p>
          Home Assistant Cast is a receiver application for the Chromecast. When
@@ -42,10 +42,13 @@
      })();
    </script>
    <script>
-    var _gaq=[['_setAccount','UA-57927901-9'],['_trackPageview']];
-    (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-    g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-    s.parentNode.insertBefore(g,s)}(document,'script'));
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-57927901-9', 'auto');
+    ga('send', 'pageview', location.pathname.includes("auth_callback") === -1 ? location.pathname : "/");
    </script>
  </body>
 </html>
@@ -9,4 +9,10 @@
      font-size: initial;
    }
  </style>
+  <script>
+  var _gaq=[['_setAccount','UA-57927901-10'],['_trackPageview']];
+  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+  s.parentNode.insertBefore(g,s)}(document,'script'));
+  </script>
 </html>
@@ -29,6 +29,7 @@ import {
 } from "../../../../src/data/lovelace";
 import "./hc-layout";
 import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
+import { toggleAttribute } from "../../../../src/common/dom/toggle_attribute";

@customElement("hc-cast")
 class HcCast extends LitElement {
@@ -158,17 +159,8 @@ class HcCast extends LitElement {

  protected updated(changedProps) {
    super.updated(changedProps);
-    if (this.castManager && this.castManager.status) {
-      const selectEl = this.shadowRoot!.querySelector("select");
-      if (selectEl) {
-        this.shadowRoot!.querySelector("select")!.value =
-          this.castManager.castConnectedToOurHass &&
-          !this.castManager.status.showDemo
-            ? this.castManager.status.lovelacePath || ""
-            : "";
-      }
-    }
-    this.toggleAttribute(
+    toggleAttribute(
+      this,
      "hide-icons",
      this.lovelaceConfig
        ? !this.lovelaceConfig.views.some((view) => view.icon)
@@ -8,7 +8,8 @@ import {
  property,
 } from "lit-element";
 import { LovelaceConfig } from "../../../../src/data/lovelace";
-import "../../../../src/panels/lovelace/hui-view";
+import "../../../../src/panels/lovelace/views/hui-view";
+import "../../../../src/panels/lovelace/views/hui-panel-view";
 import { HomeAssistant } from "../../../../src/types";
 import { Lovelace } from "../../../../src/panels/lovelace/types";
 import "./hc-launch-screen";
@@ -16,8 +17,10 @@ import "./hc-launch-screen";
@customElement("hc-lovelace")
 class HcLovelace extends LitElement {
  @property() public hass!: HomeAssistant;
+
  @property() public lovelaceConfig!: LovelaceConfig;
-  @property() public viewPath?: string;
+
+  @property() public viewPath?: string | number;

  protected render(): TemplateResult | void {
    const index = this._viewIndex;
@@ -36,35 +39,52 @@ class HcLovelace extends LitElement {
      mode: "storage",
      language: "en",
      saveConfig: async () => undefined,
+      deleteConfig: async () => undefined,
      setEditMode: () => undefined,
    };
-    return html`
-      <hui-view
-        .hass=${this.hass}
-        .lovelace=${lovelace}
-        .index=${index}
-        columns="2"
-      ></hui-view>
-    `;
+    return this.lovelaceConfig.views[index].panel
+      ? html`
+          <hui-panel-view
+            .hass=${this.hass}
+            .config=${this.lovelaceConfig.views[index]}
+          ></hui-panel-view>
+        `
+      : html`
+          <hui-view
+            .hass=${this.hass}
+            .lovelace=${lovelace}
+            .index=${index}
+            columns="2"
+          ></hui-view>
+        `;
  }

  protected updated(changedProps) {
    super.updated(changedProps);
+
    if (changedProps.has("viewPath") || changedProps.has("lovelaceConfig")) {
      const index = this._viewIndex;

-      if (index) {
-        this.shadowRoot!.querySelector("hui-view")!.style.background =
+      if (index !== undefined) {
+        const configBackground =
          this.lovelaceConfig.views[index].background ||
-          this.lovelaceConfig.background ||
-          "";
+          this.lovelaceConfig.background;
+
+        if (configBackground) {
+          (this.shadowRoot!.querySelector(
+            "hui-view, hui-panel-view"
+          ) as HTMLElement)!.style.setProperty(
+            "--lovelace-background",
+            configBackground
+          );
+        }
      }
    }
  }

  private get _viewIndex() {
    const selectedView = this.viewPath;
-    const selectedViewInt = parseInt(selectedView!, 10);
+    const selectedViewInt = parseInt(selectedView as string, 10);
    for (let i = 0; i < this.lovelaceConfig.views.length; i++) {
      if (
        this.lovelaceConfig.views[i].path === selectedView ||
@@ -77,7 +97,6 @@ class HcLovelace extends LitElement {
  }

  static get styles(): CSSResult {
-    // We're applying a 10% transform so it all shows a little bigger.
    return css`
      :host {
        min-height: 100vh;
@@ -86,7 +105,7 @@ class HcLovelace extends LitElement {
        box-sizing: border-box;
        background: var(--primary-background-color);
      }
-      hui-view {
+      :host > * {
        flex: 1;
      }
    `;
@@ -1,10 +1,10 @@
-import { HassElement } from "../../../../src/state/hass-element";
 import {
  getAuth,
  createConnection,
  UnsubscribeFunc,
 } from "home-assistant-js-websocket";
 import { customElement, TemplateResult, html, property } from "lit-element";
+import { HassElement } from "../../../../src/state/hass-element";
 import {
  HassMessage,
  ConnectMessage,
@@ -26,9 +26,13 @@ import { isNavigationClick } from "../../../../src/common/dom/is-navigation-clic
@customElement("hc-main")
 export class HcMain extends HassElement {
  @property() private _showDemo = false;
+
  @property() private _lovelaceConfig?: LovelaceConfig;
-  @property() private _lovelacePath: string | null = null;
+
+  @property() private _lovelacePath: string | number | null = null;
+
  @property() private _error?: string;
+
  private _unsubLovelace?: UnsubscribeFunc;

  public processIncomingMessage(msg: HassMessage) {
@@ -53,7 +57,13 @@ export class HcMain extends HassElement {
      `;
    }

-    if (!this._lovelaceConfig || !this._lovelacePath) {
+    if (
+      !this._lovelaceConfig ||
+      this._lovelacePath === null ||
+      // Guard against part of HA not being loaded yet.
+      (this.hass &&
+        (!this.hass.states || !this.hass.config || !this.hass.services))
+    ) {
      return html`
        <hc-launch-screen
          .hass=${this.hass}
@@ -127,10 +137,16 @@ export class HcMain extends HassElement {
        }),
      });
    } catch (err) {
-      this._error = err;
+      this._error = this._getErrorMessage(err);
+      return;
+    }
+    let connection;
+    try {
+      connection = await createConnection({ auth });
+    } catch (err) {
+      this._error = this._getErrorMessage(err);
      return;
    }
-    const connection = await createConnection({ auth });
    if (this.hass) {
      this.hass.connection.close();
    }
@@ -159,9 +175,9 @@ export class HcMain extends HassElement {
      } catch (err) {
        // Generate a Lovelace config.
        this._unsubLovelace = () => undefined;
-        const {
-          generateLovelaceConfigFromHass,
-        } = await import("../../../../src/panels/lovelace/common/generate-lovelace-config");
+        const { generateLovelaceConfigFromHass } = await import(
+          "../../../../src/panels/lovelace/common/generate-lovelace-config"
+        );
        this._handleNewLovelaceConfig(
          await generateLovelaceConfigFromHass(this.hass!)
        );
@@ -197,6 +213,23 @@ export class HcMain extends HassElement {
    });
  }

+  private _getErrorMessage(error: number): string {
+    switch (error) {
+      case 1:
+        return "Unable to connect to the Home Assistant websocket API.";
+      case 2:
+        return "The supplied authentication is invalid.";
+      case 3:
+        return "The connection to Home Assistant was lost.";
+      case 4:
+        return "Missing hassUrl. This is required.";
+      case 5:
+        return "Home Assistant needs to be served over https:// to use with Home Assistant Cast.";
+      default:
+        return "Unknown Error";
+    }
+  }
+
  private _breakFree() {
    const controls = document.body.querySelector("touch-controls");
    if (controls) {
@@ -0,0 +1,11 @@
+const { createCastConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild } = require("../build-scripts/env.js");
+
+// File just used for stats builds
+
+const latestBuild = true;
+
+module.exports = createCastConfig({
+  isProdBuild,
+  latestBuild,
+});
@@ -0,0 +1,18 @@
+/*
+  Cache-Control: public, max-age: 0, s-maxage=3600, must-revalidate
+  Content-Security-Policy: form-action https:
+  Referrer-Policy: no-referrer-when-downgrade
+  X-Content-Type-Options: nosniff
+  X-XSS-Protection: 1; mode=block
+
+/api/*
+  Cache-Control: public, max-age: 604800, s-maxage=604800
+
+/assets/*
+  Cache-Control: public, max-age: 604800, s-maxage=604800
+
+/frontend_es5/*
+  Cache-Control: public, max-age: 604800, s-maxage=604800
+
+/frontend_latest/*
+  Cache-Control: public, max-age: 604800, s-maxage=604800
@@ -7,22 +7,26 @@
    {
      "src": "/static/icons/favicon-192x192.png",
      "sizes": "192x192",
-      "type": "image/png"
+      "type": "image/png",
+      "purpose": "maskable any"
    },
    {
      "src": "/static/icons/favicon-384x384.png",
      "sizes": "384x384",
-      "type": "image/png"
+      "type": "image/png",
+      "purpose": "maskable any"
    },
    {
      "src": "/static/icons/favicon-512x512.png",
      "sizes": "512x512",
-      "type": "image/png"
+      "type": "image/png",
+      "purpose": "maskable any"
    },
    {
      "src": "/static/icons/favicon-1024x1024.png",
      "sizes": "1024x1024",
-      "type": "image/png"
+      "type": "image/png",
+      "purpose": "maskable any"
    }
  ],
  "lang": "en-US",
@@ -115,10 +115,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
      attributes: {
        friendly_name: "Abode Updates",
        icon: "hademo:security",
-        templates: {
-          icon_color:
-            "if (state === 'on') return 'rgb(251, 210, 41)'; return 'rgb(54, 95, 140)';\n",
-        },
      },
    },
    "input_boolean.tv": {
@@ -127,10 +123,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
      attributes: {
        friendly_name: "TV",
        icon: "hademo:television",
-        templates: {
-          icon_color:
-            "if (state === 'on') return 'rgb(251, 210, 41)'; return 'rgb(54, 95, 140)';\n",
-        },
      },
    },
    "input_boolean.homeautomation": {
@@ -139,10 +131,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
      attributes: {
        friendly_name: "Home Automation",
        icon: "hass:home-automation",
-        templates: {
-          icon_color:
-            "if (state === 'on') return 'rgb(251, 210, 41)'; return 'rgb(54, 95, 140)';\n",
-        },
      },
    },
    "input_boolean.tvtime": {
@@ -151,12 +139,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
      attributes: {
        friendly_name: "TV Time",
        icon: "hademo:television-guide",
-        templates: {
-          icon:
-            "if (state === 'on') return 'hademo:television-classic'; return 'hademo:television-classic-off';\n",
-          icon_color:
-            "if (state === 'on') return 'rgb(251, 210, 41)'; return 'rgb(54, 95, 140)';\n",
-        },
      },
    },
    "input_select.livingroomharmony": {
@@ -235,6 +217,18 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
        icon: "hademo:currency-usd",
      },
    },
+    "sensor.study_temp": {
+      entity_id: "sensor.study_temp",
+      state: "20.9",
+      attributes: {
+        unit_of_measurement: "°C",
+        device_class: "temperature",
+        friendly_name: localize(
+          "ui.panel.page-demo.config.arsaboo.names.temperature_study"
+        ),
+        icon: "hademo:thermometer",
+      },
+    },
    "cover.garagedoor": {
      entity_id: "cover.garagedoor",
      state: "closed",
@@ -560,12 +554,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
      state: "off",
      attributes: {
        friendly_name: "Driveway Light",
-        templates: {
-          icon_color:
-            "if (state === 'on') return 'rgb(251, 210, 41)'; return 'rgb(54, 95, 140)';\n",
-          icon:
-            "if (state === 'on') return 'hademo:lightbulb-on'; return 'hademo:lightbulb';\n",
-        },
      },
    },
    "switch.wemoporch": {
@@ -573,12 +561,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
      state: "off",
      attributes: {
        friendly_name: "Porch Lights",
-        templates: {
-          icon_color:
-            "if (state === 'on') return 'rgb(251, 210, 41)'; return 'rgb(54, 95, 140)';\n",
-          icon:
-            "if (state === 'on') return 'hademo:lightbulb-on'; return 'hademo:lightbulb';\n",
-        },
      },
    },
  });
@@ -446,6 +446,11 @@ export const demoLovelaceArsaboo: DemoConfig["lovelace"] = (localize) => ({
            "script.tv_off",
          ],
        },
+        {
+          type: "sensor",
+          entity: "sensor.study_temp",
+          graph: "line",
+        },
        {
          type: "entities",
          title: "Doorbell",
@@ -23,27 +23,24 @@ export const demoThemeJimpower = () => ({
  "paper-listbox-background-color": "#2E333A",
  "table-row-background-color": "#353840",
  "paper-grey-50": "var(--primary-text-color)",
-  "paper-toggle-button-checked-button-color": "var(--accent-color)",
+  "switch-checked-color": "var(--accent-color)",
  "paper-dialog-background-color": "#434954",
  "secondary-text-color": "#5294E2",
  "google-red-500": "#E45E65",
  "divider-color": "rgba(0, 0, 0, .12)",
-  "paper-toggle-button-unchecked-ink-color": "var(--disabled-text-color)",
  "google-green-500": "#39E949",
-  "paper-toggle-button-unchecked-button-color": "var(--disabled-text-color)",
+  "switch-unchecked-button-color": "var(--disabled-text-color)",
  "label-badge-border-color": "green",
  "paper-listbox-color": "var(--primary-color)",
  "paper-slider-disabled-secondary-color": "var(--disabled-text-color)",
-  "paper-toggle-button-checked-ink-color": "var(--accent-color)",
  "paper-card-background-color": "#434954",
  "label-badge-text-color": "var(--primary-text-color)",
  "paper-slider-knob-start-color": "var(--accent-color)",
-  "paper-toggle-button-unchecked-bar-color": "var(--disabled-text-color)",
+  "switch-unchecked-track-color": "var(--disabled-text-color)",
  "dark-primary-color": "var(--accent-color)",
  "paper-slider-secondary-color": "var(--secondary-background-color)",
  "paper-slider-pin-color": "var(--accent-color)",
  "paper-item-icon-active-color": "#F9C536",
  "accent-color": "#E45E65",
-  "paper-toggle-button-checked-bar-color": "var(--accent-color)",
  "table-row-alternative-background-color": "#3E424B",
 });
@@ -24,27 +24,24 @@ export const demoThemeKernehed = () => ({
  "paper-listbox-background-color": "#141414",
  "table-row-background-color": "#292929",
  "paper-grey-50": "var(--primary-text-color)",
-  "paper-toggle-button-checked-button-color": "var(--accent-color)",
+  "switch-checked-color": "var(--accent-color)",
  "paper-dialog-background-color": "#292929",
  "secondary-text-color": "#b58e31",
  "google-red-500": "#b58e31",
  "divider-color": "rgba(0, 0, 0, .12)",
-  "paper-toggle-button-unchecked-ink-color": "var(--disabled-text-color)",
  "google-green-500": "#2980b9",
-  "paper-toggle-button-unchecked-button-color": "var(--disabled-text-color)",
+  "switch-unchecked-button-color": "var(--disabled-text-color)",
  "label-badge-border-color": "green",
  "paper-listbox-color": "#777777",
  "paper-slider-disabled-secondary-color": "var(--disabled-text-color)",
-  "paper-toggle-button-checked-ink-color": "var(--accent-color)",
  "paper-card-background-color": "#292929",
  "label-badge-text-color": "var(--primary-text-color)",
  "paper-slider-knob-start-color": "var(--accent-color)",
-  "paper-toggle-button-unchecked-bar-color": "var(--disabled-text-color)",
+  "switch-unchecked-track-color": "var(--disabled-text-color)",
  "dark-primary-color": "var(--accent-color)",
  "paper-slider-secondary-color": "var(--secondary-background-color)",
  "paper-slider-pin-color": "var(--accent-color)",
  "paper-item-icon-active-color": "#b58e31",
  "accent-color": "#2980b9",
-  "paper-toggle-button-checked-bar-color": "var(--accent-color)",
  "table-row-alternative-background-color": "#292929",
 });
@@ -12,8 +12,7 @@ export const demoThemeTeachingbirds = () => ({
  "paper-slider-knob-color": "var(--primary-color)",
  "paper-listbox-color": "#FFFFFF",
  "paper-toggle-button-checked-bar-color": "var(--light-primary-color)",
-  "paper-toggle-button-checked-ink-color": "var(--dark-primary-color)",
-  "paper-toggle-button-unchecked-bar-color": "var(--primary-text-color)",
+  "switch-unchecked-track-color": "var(--primary-text-color)",
  "paper-card-background-color": "#4e4e4e",
  "label-badge-text-color": "var(--text-primary-color)",
  "primary-background-color": "#303030",
@@ -22,7 +21,7 @@ export const demoThemeTeachingbirds = () => ({
  "secondary-background-color": "#2b2b2b",
  "paper-slider-knob-start-color": "var(--primary-color)",
  "paper-item-icon-active-color": "#d8bf50",
-  "paper-toggle-button-checked-button-color": "var(--primary-color)",
+  "switch-checked-color": "var(--primary-color)",
  "secondary-text-color": "#389638",
  "disabled-text-color": "#545454",
  "paper-item-icon_-_color": "var(--primary-text-color)",
@@ -53,7 +53,7 @@ class CardModder extends LitElement {
    for (var k in this._config.style) {
      if (window.cardTools.hasTemplate(this._config.style[k]))
        this.templated.push(k);
-      this.card.style.setProperty(k, '');
+      this.card.style.setProperty(k, "");
      target.style.setProperty(
        k,
        window.cardTools.parseTemplate(this._config.style[k])
@@ -161,8 +161,8 @@ if (!window.cardTools) {
  };

  cardTools.longpress = (element) => {
-    customElements.whenDefined("long-press").then(() => {
-      const longpress = document.body.querySelector("long-press");
+    customElements.whenDefined("action-handler").then(() => {
+      const longpress = document.body.querySelector("action-handler");
      longpress.bind(element);
    });
    return element;
@@ -54,7 +54,12 @@ class CastDemoRow extends LitElement implements EntityRow {
        mgr.castContext.addEventListener(
          cast.framework.CastContextEventType.SESSION_STATE_CHANGED,
          (ev) => {
-            if (ev.sessionState === "SESSION_STARTED") {
+            // On Android, opening a new session always results in SESSION_RESUMED.
+            // So treat both as the same.
+            if (
+              ev.sessionState === "SESSION_STARTED" ||
+              ev.sessionState === "SESSION_RESUMED"
+            ) {
              castSendShowDemo(mgr);
            }
          }
@@ -1,10 +1,4 @@
-import {
-  LitElement,
-  html,
-  CSSResult,
-  css,
-  PropertyDeclarations,
-} from "lit-element";
+import { LitElement, html, CSSResult, css, property } from "lit-element";
 import { until } from "lit-html/directives/until";
 import "@material/mwc-button";
 import "@polymer/paper-spinner/paper-spinner-lite";
@@ -20,19 +14,11 @@ import {
 } from "../configs/demo-configs";

 export class HADemoCard extends LitElement implements LovelaceCard {
-  public lovelace?: Lovelace;
-  public hass!: MockHomeAssistant;
-  private _switching?: boolean;
+  @property() public lovelace?: Lovelace;
+  @property() public hass!: MockHomeAssistant;
+  @property() private _switching?: boolean;
  private _hidden = localStorage.hide_demo_card;

-  static get properties(): PropertyDeclarations {
-    return {
-      lovelace: {},
-      hass: {},
-      _switching: {},
-    };
-  }
-
  public getCardSize() {
    return this._hidden ? 0 : 2;
  }
@@ -12,5 +12,7 @@ import "./resources/hademo-icons";

 /* polyfill for paper-dropdown */
 setTimeout(() => {
-  import(/* webpackChunkName: "polyfill-web-animations-next" */ "web-animations-js/web-animations-next-lite.min");
+  import(
+    /* webpackChunkName: "polyfill-web-animations-next" */ "web-animations-js/web-animations-next-lite.min"
+  );
 }, 1000);
@@ -65,74 +65,79 @@ const generateHistory = (state, deltas) => {
 const incrementalUnits = ["clients", "queries", "ads"];

 export const mockHistory = (mockHass: MockHomeAssistant) => {
-  mockHass.mockAPI(new RegExp("history/period/.+"), (
-    hass,
-    // @ts-ignore
-    method,
-    path,
-    // @ts-ignore
-    parameters
-  ) => {
-    const params = parseQuery<HistoryQueryParams>(path.split("?")[1]);
-    const entities = params.filter_entity_id.split(",");
+  mockHass.mockAPI(
+    new RegExp("history/period/.+"),
+    (
+      hass,
+      // @ts-ignore
+      method,
+      path,
+      // @ts-ignore
+      parameters
+    ) => {
+      const params = parseQuery<HistoryQueryParams>(path.split("?")[1]);
+      const entities = params.filter_entity_id.split(",");

-    const results: HassEntity[][] = [];
+      const results: HassEntity[][] = [];

-    for (const entityId of entities) {
-      const state = hass.states[entityId];
+      for (const entityId of entities) {
+        const state = hass.states[entityId];

-      if (!state) {
-        continue;
-      }
+        if (!state) {
+          continue;
+        }

-      if (!state.attributes.unit_of_measurement) {
-        results.push(generateHistory(state, [state.state]));
-        continue;
-      }
+        if (!state.attributes.unit_of_measurement) {
+          results.push(generateHistory(state, [state.state]));
+          continue;
+        }

-      const numberState = Number(state.state);
+        const numberState = Number(state.state);

-      if (isNaN(numberState)) {
-        // tslint:disable-next-line
-        console.log(
-          "Ignoring state with unparsable state but with a unit",
-          entityId,
-          state
+        if (isNaN(numberState)) {
+          // tslint:disable-next-line
+          console.log(
+            "Ignoring state with unparsable state but with a unit",
+            entityId,
+            state
+          );
+          continue;
+        }
+
+        const statesToGenerate = 15;
+        let genFunc;
+
+        if (incrementalUnits.includes(state.attributes.unit_of_measurement)) {
+          let initial = Math.floor(
+            numberState * 0.4 + numberState * Math.random() * 0.2
+          );
+          const diff = Math.max(
+            1,
+            Math.floor((numberState - initial) / statesToGenerate)
+          );
+          genFunc = () => {
+            initial += diff;
+            return Math.min(numberState, initial);
+          };
+        } else {
+          const diff = Math.floor(
+            numberState * (numberState > 80 ? 0.05 : 0.5)
+          );
+          genFunc = () =>
+            numberState - diff + Math.floor(Math.random() * 2 * diff);
+        }
+
+        results.push(
+          generateHistory(
+            {
+              entity_id: state.entity_id,
+              attributes: state.attributes,
+            },
+            Array.from({ length: statesToGenerate }, genFunc)
+          )
        );
-        continue;
      }
-
-      const statesToGenerate = 15;
-      let genFunc;
-
-      if (incrementalUnits.includes(state.attributes.unit_of_measurement)) {
-        let initial = Math.floor(
-          numberState * 0.4 + numberState * Math.random() * 0.2
-        );
-        const diff = Math.max(
-          1,
-          Math.floor((numberState - initial) / statesToGenerate)
-        );
-        genFunc = () => {
-          initial += diff;
-          return Math.min(numberState, initial);
-        };
-      } else {
-        const diff = Math.floor(numberState * (numberState > 80 ? 0.05 : 0.5));
-        genFunc = () =>
-          numberState - diff + Math.floor(Math.random() * 2 * diff);
-      }
-
-      results.push(
-        generateHistory(
-          {
-            entity_id: state.entity_id,
-            attributes: state.attributes,
-          },
-          Array.from({ length: statesToGenerate }, genFunc)
-        )
-      );
+      return results;
    }
-    return results;
-  });
+  );
 };
@@ -12,9 +12,10 @@ export const mockLovelace = (
  localizePromise: Promise<LocalizeFunc>
 ) => {
  hass.mockWS("lovelace/config", () =>
-    Promise.all([selectedDemoConfig, localizePromise]).then(
-      ([config, localize]) => config.lovelace(localize)
-    )
+    Promise.all([
+      selectedDemoConfig,
+      localizePromise,
+    ]).then(([config, localize]) => config.lovelace(localize))
  );

  hass.mockWS("lovelace/config/save", () => Promise.resolve());
@@ -97,7 +97,7 @@ export const mockTranslations = (hass: MockHomeAssistant) => {
      "component.nest.config.abort.authorize_url_timeout":
        "Timeout generating authorize url.",
      "component.nest.config.abort.no_flows":
-        "You need to configure Nest before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/nest/).",
+        "You need to configure Nest before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/integrations/nest/).",
      "component.nest.config.error.internal_error":
        "Internal error validating code",
      "component.nest.config.error.invalid_code": "Invalid code",
@@ -199,7 +199,7 @@ export const mockTranslations = (hass: MockHomeAssistant) => {
      "component.point.config.abort.external_setup":
        "Point successfully configured from another flow.",
      "component.point.config.abort.no_flows":
-        "You need to configure Point before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/point/).",
+        "You need to configure Point before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/integrations/point/).",
      "component.point.config.create_entry.default":
        "Successfully authenticated with Minut for your Point device(s)",
      "component.point.config.error.follow_link":
@@ -1,10 +1,9 @@
 const { createDemoConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild, isStatsBuild } = require("../build-scripts/env.js");

-// This file exists because we haven't migrated the stats script yet
+// File just used for stats builds

-const isProdBuild = process.env.NODE_ENV === "production";
-const isStatsBuild = process.env.STATS === "1";
-const latestBuild = false;
+const latestBuild = true;

 module.exports = createDemoConfig({
  isProdBuild,
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#2157BC">
-    <title>HAGallery</title>
-    <script src='./main.js' async></script>
-    <style>
-      body {
-        font-family: Roboto, Noto, sans-serif;
-        margin: 0;
-        padding: 0;
-      }
-    </style>
-  </head>
-  <body></body>
-</html>
@@ -4,14 +4,6 @@
 # Stop on errors
 set -e

-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."

-OUTPUT_DIR=dist
-
-rm -rf $OUTPUT_DIR
-
-cd ..
-./node_modules/.bin/gulp build-translations gen-icons
-cd gallery
-
-NODE_ENV=production ../node_modules/.bin/webpack -p --config webpack.config.js
+./node_modules/.bin/gulp build-gallery
@@ -4,10 +4,6 @@
 # Stop on errors
 set -e

-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."

-cd ..
-./node_modules/.bin/gulp build-translations gen-icons
-cd gallery
-
-../node_modules/.bin/webpack-dev-server
+./node_modules/.bin/gulp develop-gallery
@@ -1,6 +1,6 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
-import JsYaml from "js-yaml";
+import { safeLoad } from "js-yaml";

 import { createCardElement } from "../../../src/panels/lovelace/common/create-card-element";

@@ -62,7 +62,7 @@ class DemoCard extends PolymerElement {
      card.removeChild(card.lastChild);
    }

-    const el = createCardElement(JsYaml.safeLoad(config.config)[0]);
+    const el = createCardElement(safeLoad(config.config)[0]);
    el.hass = this.hass;
    card.appendChild(el);
  }
@@ -1,9 +1,9 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
-import "@polymer/paper-toggle-button/paper-toggle-button";

 import "./demo-card";
+import "../../../src/components/ha-switch";

 class DemoCards extends PolymerElement {
  static get template() {
@@ -26,9 +26,9 @@ class DemoCards extends PolymerElement {
      </style>
      <app-toolbar>
        <div class="filters">
-          <paper-toggle-button checked="{{_showConfig}}"
-            >Show config</paper-toggle-button
-          >
+          <ha-switch checked="[[_showConfig]]" on-change="_showConfigToggled">
+            Show config
+          </ha-switch>
        </div>
      </app-toolbar>
      <div class="cards">
@@ -53,6 +53,10 @@ class DemoCards extends PolymerElement {
      },
    };
  }
+
+  _showConfigToggled(ev) {
+    this._showConfig = ev.target.checked;
+  }
 }

 customElements.define("demo-cards", DemoCards);
@@ -1,9 +1,9 @@
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
-import "@polymer/paper-toggle-button/paper-toggle-button";

 import "./demo-more-info";
+import "../../../src/components/ha-switch";

 class DemoMoreInfos extends PolymerElement {
  static get template() {
@@ -26,9 +26,7 @@ class DemoMoreInfos extends PolymerElement {
      </style>
      <app-toolbar>
        <div class="filters">
-          <paper-toggle-button checked="{{_showConfig}}"
-            >Show entity</paper-toggle-button
-          >
+          <ha-switch checked="{{_showConfig}}">Show entity</ha-switch>
        </div>
      </app-toolbar>
      <div class="cards">
@@ -36,7 +36,7 @@ export default {
    attributes: {
      title: "Welcome Home!",
      message:
-        "Here are some resources to get started:\n\n - [Configuring Home Assistant](https://home-assistant.io/getting-started/configuration/)\n - [Available components](https://home-assistant.io/components/)\n - [Troubleshooting your configuration](https://home-assistant.io/docs/configuration/troubleshooting/)\n - [Getting help](https://home-assistant.io/help/)\n\nTo not see this card popup in the future, edit your config in\n`configuration.yaml` and disable the `introduction` component.",
+        "Here are some resources to get started:\n\n - [Configuring Home Assistant](https://home-assistant.io/getting-started/configuration/)\n - [Available integrations](https://home-assistant.io/integrations/)\n - [Troubleshooting your configuration](https://home-assistant.io/docs/configuration/troubleshooting/)\n - [Getting help](https://home-assistant.io/help/)\n\nTo not see this card popup in the future, edit your config in\n`configuration.yaml` and disable the `introduction` integration.",
    },
    last_changed: "2018-07-19T10:44:45.922241+00:00",
    last_updated: "2018-07-19T10:44:45.922241+00:00",
@@ -2,7 +2,8 @@ import { html, LitElement, TemplateResult } from "lit-element";
 import "@material/mwc-button";

 import "../../../src/components/ha-card";
-import { longPress } from "../../../src/panels/lovelace/common/directives/long-press-directive";
+import { actionHandler } from "../../../src/panels/lovelace/common/directives/action-handler-directive";
+import { ActionHandlerEvent } from "../../../src/data/lovelace";

 export class DemoUtilLongPress extends LitElement {
  protected render(): TemplateResult | void {
@@ -12,9 +13,8 @@ export class DemoUtilLongPress extends LitElement {
        () => html`
          <ha-card>
            <mwc-button
-              @ha-click="${this._handleTap}"
-              @ha-hold="${this._handleHold}"
-              .longPress="${longPress()}"
+              @action=${this._handleAction}
+              .actionHandler=${actionHandler({})}
            >
              (long) press me!
            </mwc-button>
@@ -28,12 +28,8 @@ export class DemoUtilLongPress extends LitElement {
    `;
  }

-  private _handleTap(ev: Event) {
-    this._addValue(ev, "tap");
-  }
-
-  private _handleHold(ev: Event) {
-    this._addValue(ev, "hold");
+  private _handleAction(ev: ActionHandlerEvent) {
+    this._addValue(ev, ev.detail.action!);
  }

  private _addValue(ev: Event, value: string) {
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta name="theme-color" content="#2157BC" />
+    <title>HAGallery</title>
+
+    <script type="module" src="<%= latestGalleryJS %>"></script>
+    <style>
+      body {
+        font-family: Roboto, Noto, sans-serif;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+  </head>
+  <body></body>
+</html>
@@ -1,7 +1,7 @@
 const path = require("path");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
+const { createGalleryConfig } = require("../build-scripts/webpack.js");
 const { babelLoaderConfig } = require("../build-scripts/babel.js");
-const webpackBase = require("../build-scripts/webpack.js");

 const isProd = process.env.NODE_ENV === "production";
 const chunkFilename = isProd ? "chunk.[chunkhash].js" : "[name].chunk.js";
@@ -9,58 +9,64 @@ const buildPath = path.resolve(__dirname, "dist");
 const publicPath = isProd ? "./" : "http://localhost:8080/";
 const latestBuild = true;

-module.exports = {
-  mode: isProd ? "production" : "development",
-  // Disabled in prod while we make Home Assistant able to serve the right files.
-  // Was source-map
-  devtool: isProd ? "none" : "inline-source-map",
-  entry: "./src/entrypoint.js",
-  module: {
-    rules: [
-      babelLoaderConfig({ latestBuild }),
-      {
-        test: /\.css$/,
-        use: "raw-loader",
-      },
-      {
-        test: /\.(html)$/,
-        use: {
-          loader: "html-loader",
-          options: {
-            exportAsEs6Default: true,
+module.exports = createGalleryConfig({
+  latestBuild: true,
+});
+
+const bla = () => {
+  const oldExports = {
+    mode: isProd ? "production" : "development",
+    // Disabled in prod while we make Home Assistant able to serve the right files.
+    // Was source-map
+    devtool: isProd ? "none" : "inline-source-map",
+    entry: "./src/entrypoint.js",
+    module: {
+      rules: [
+        babelLoaderConfig({ latestBuild }),
+        {
+          test: /\.css$/,
+          use: "raw-loader",
+        },
+        {
+          test: /\.(html)$/,
+          use: {
+            loader: "html-loader",
+            options: {
+              exportAsEs6Default: true,
+            },
          },
        },
-      },
-    ],
-  },
-  optimization: webpackBase.optimization(latestBuild),
-  plugins: [
-    new CopyWebpackPlugin([
-      "public",
-      { from: "../public", to: "static" },
-      { from: "../build-translations/output", to: "static/translations" },
-      {
-        from: "../node_modules/leaflet/dist/leaflet.css",
-        to: "static/images/leaflet/",
-      },
-      {
-        from: "../node_modules/roboto-fontface/fonts/roboto/*.woff2",
-        to: "static/fonts/roboto/",
-      },
-      {
-        from: "../node_modules/leaflet/dist/images",
-        to: "static/images/leaflet/",
-      },
-    ]),
-  ].filter(Boolean),
-  resolve: webpackBase.resolve,
-  output: {
-    filename: "[name].js",
-    chunkFilename: chunkFilename,
-    path: buildPath,
-    publicPath,
-  },
-  devServer: {
-    contentBase: "./public",
-  },
+      ],
+    },
+    optimization: webpackBase.optimization(latestBuild),
+    plugins: [
+      new CopyWebpackPlugin([
+        "public",
+        { from: "../public", to: "static" },
+        { from: "../build-translations/output", to: "static/translations" },
+        {
+          from: "../node_modules/leaflet/dist/leaflet.css",
+          to: "static/images/leaflet/",
+        },
+        {
+          from: "../node_modules/roboto-fontface/fonts/roboto/*.woff2",
+          to: "static/fonts/roboto/",
+        },
+        {
+          from: "../node_modules/leaflet/dist/images",
+          to: "static/images/leaflet/",
+        },
+      ]),
+    ].filter(Boolean),
+    resolve: webpackBase.resolve,
+    output: {
+      filename: "[name].js",
+      chunkFilename: chunkFilename,
+      path: buildPath,
+      publicPath,
+    },
+    devServer: {
+      contentBase: "./public",
+    },
+  };
 };
@@ -3,6 +3,7 @@ const path = require("path");
 module.exports = {
  // Target directory for the build.
  buildDir: path.resolve(__dirname, "build"),
+  nodeDir: path.resolve(__dirname, "../node_modules"),
  // Path where the Hass.io frontend will be publicly available.
  publicPath: "/api/hassio/app",
 };
@@ -4,11 +4,6 @@
 # Stop on errors
 set -e

-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."

-OUTPUT_DIR=build
-
-rm -rf $OUTPUT_DIR
-
-node script/gen-icons.js
-NODE_ENV=production CI=false ../node_modules/.bin/webpack -p --config webpack.config.js
+./node_modules/.bin/gulp build-hassio
@@ -4,11 +4,6 @@
 # Stop on errors
 set -e

-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")/../.."

-OUTPUT_DIR=build
-
-rm -rf $OUTPUT_DIR
-mkdir $OUTPUT_DIR
-node script/gen-icons.js
-../node_modules/.bin/webpack --watch --progress
+./node_modules/.bin/gulp develop-hassio
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-const fs = require("fs");
-const {
-  findIcons,
-  generateIconset,
-  genMDIIcons,
-} = require("../../build-scripts/gulp/gen-icons.js");
-
-function genHassioIcons() {
-  const iconNames = findIcons("./src", "hassio");
-
-  for (const item of findIcons("../src", "hassio")) {
-    iconNames.add(item);
-  }
-
-  fs.writeFileSync("./hassio-icons.html", generateIconset("hassio", iconNames));
-}
-
-genMDIIcons();
-genHassioIcons();
@@ -44,9 +44,7 @@ class HassioAddonAudio extends EventsMixin(PolymerElement) {
              selected="{{selectedInput}}"
            >
              <template is="dom-repeat" items="[[inputDevices]]">
-                <paper-item device\$="[[item.device]]"
-                  >[[item.name]]</paper-item
-                >
+                <paper-item device$="[[item.device]]">[[item.name]]</paper-item>
              </template>
            </paper-listbox>
          </paper-dropdown-menu>
@@ -57,9 +55,7 @@ class HassioAddonAudio extends EventsMixin(PolymerElement) {
              selected="{{selectedOutput}}"
            >
              <template is="dom-repeat" items="[[outputDevices]]">
-                <paper-item device\$="[[item.device]]"
-                  >[[item.name]]</paper-item
-                >
+                <paper-item device$="[[item.device]]">[[item.name]]</paper-item>
              </template>
            </paper-listbox>
          </paper-dropdown-menu>
@@ -2,19 +2,19 @@ import "@polymer/iron-icon/iron-icon";
 import "@material/mwc-button";
 import "@polymer/paper-card/paper-card";
 import "@polymer/paper-tooltip/paper-tooltip";
-import "@polymer/paper-toggle-button/paper-toggle-button";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";

 import "../../../src/components/ha-label-badge";
 import "../../../src/components/ha-markdown";
 import "../../../src/components/buttons/ha-call-api-button";
+import "../../../src/components/ha-switch";
 import "../../../src/resources/ha-style";
+import "../components/hassio-card-content";
+
 import { EventsMixin } from "../../../src/mixins/events-mixin";
 import { navigate } from "../../../src/common/navigate";
-
 import { showHassioMarkdownDialog } from "../dialogs/markdown/show-dialog-hassio-markdown";
-import "../components/hassio-card-content";

 const PERMIS_DESC = {
  rating: {
@@ -122,7 +122,7 @@ class HassioAddonInfo extends EventsMixin(PolymerElement) {
          width: 16px;
          color: var(--secondary-text-color);
        }
-        paper-toggle-button {
+        ha-switch {
          display: inline;
        }
        iron-icon.running {
@@ -348,44 +348,46 @@ class HassioAddonInfo extends EventsMixin(PolymerElement) {
          <template is="dom-if" if="[[addon.version]]">
            <div class="state">
              <div>Start on boot</div>
-              <paper-toggle-button
+              <ha-switch
                on-change="startOnBootToggled"
                checked="[[computeStartOnBoot(addon.boot)]]"
-              ></paper-toggle-button>
+              ></ha-switch>
            </div>
            <div class="state">
              <div>Auto update</div>
-              <paper-toggle-button
+              <ha-switch
                on-change="autoUpdateToggled"
                checked="[[addon.auto_update]]"
-              ></paper-toggle-button>
+              ></ha-switch>
            </div>
            <template is="dom-if" if="[[addon.ingress]]">
              <div class="state">
                <div>Show in sidebar</div>
-                <paper-toggle-button
+                <ha-switch
                  on-change="panelToggled"
                  checked="[[addon.ingress_panel]]"
                  disabled="[[_computeCannotIngressSidebar(hass, addon)]]"
-                ></paper-toggle-button>
+                ></ha-switch>
                <template is="dom-if" if="[[_computeCannotIngressSidebar(hass, addon)]]">
                  <span>This option requires Home Assistant 0.92 or later.</span>
                </template>
              </div>
            </template>
-            <div class="state">
-              <div>
-                Protection mode
-                <span>
-                  <iron-icon icon="hassio:information"></iron-icon>
-                  <paper-tooltip>Grant the add-on elevated system access.</paper-tooltip>
-                </span>
+            <template is="dom-if" if="[[_computeUsesProtectedOptions(addon)]]">
+              <div class="state">
+                <div>
+                  Protection mode
+                  <span>
+                    <iron-icon icon="hassio:information"></iron-icon>
+                    <paper-tooltip>Grant the add-on elevated system access.</paper-tooltip>
+                  </span>
+                </div>
+                <ha-switch
+                  on-change="protectionToggled"
+                  checked="[[addon.protected]]"
+                ></ha-switch>
              </div>
-              <paper-toggle-button
-                on-change="protectionToggled"
-                checked="[[addon.protected]]"
-              ></paper-toggle-button>
-            </div>
+            </template>
          </template>
        </div>
        <div class="card-actions">
@@ -569,7 +571,10 @@ class HassioAddonInfo extends EventsMixin(PolymerElement) {
  openChangelog() {
    this.hass
      .callApi("get", `hassio/addons/${this.addonSlug}/changelog`)
-      .then((resp) => resp, () => "Error getting changelog")
+      .then(
+        (resp) => resp,
+        () => "Error getting changelog"
+      )
      .then((content) => {
        showHassioMarkdownDialog(this, {
          title: "Changelog",
@@ -607,6 +612,10 @@ class HassioAddonInfo extends EventsMixin(PolymerElement) {
    return !addon.ingress || !this._computeHA92plus(hass);
  }

+  _computeUsesProtectedOptions(addon) {
+    return addon.docker_api || addon.full_access || addon.host_pid;
+  }
+
  _computeHA92plus(hass) {
    const [major, minor] = hass.config.version.split(".", 2);
    return Number(major) > 0 || (major === "0" && Number(minor) >= 92);
@@ -102,7 +102,7 @@ export function parseTextToColoredPre(text) {

    if (match[1] === undefined) continue;

-    for (const colorCode of match[1].split(";")) {
+    match[1].split(";").forEach((colorCode) => {
      switch (parseInt(colorCode)) {
        case 0:
          // reset
@@ -195,7 +195,7 @@ export function parseTextToColoredPre(text) {
          state.backgroundColor = null;
          break;
      }
-    }
+    });
  }
  addSpan(text.substring(i));

@@ -8,26 +8,31 @@ import {
  customElement,
 } from "lit-element";
 import "./hassio-addons";
-import "./hassio-hass-update";
+import "./hassio-update";
 import { HomeAssistant } from "../../../src/types";
 import {
  HassioSupervisorInfo,
  HassioHomeAssistantInfo,
+  HassioHassOSInfo,
 } from "../../../src/data/hassio";

@customElement("hassio-dashboard")
 class HassioDashboard extends LitElement {
  @property() public hass!: HomeAssistant;
+
  @property() public supervisorInfo!: HassioSupervisorInfo;
  @property() public hassInfo!: HassioHomeAssistantInfo;
+  @property() public hassOsInfo!: HassioHassOSInfo;

  protected render(): TemplateResult | void {
    return html`
      <div class="content">
-        <hassio-hass-update
+        <hassio-update
          .hass=${this.hass}
          .hassInfo=${this.hassInfo}
-        ></hassio-hass-update>
+          .supervisorInfo=${this.supervisorInfo}
+          .hassOsInfo=${this.hassOsInfo}
+        ></hassio-update>
        <hassio-addons
          .hass=${this.hass}
          .addons=${this.supervisorInfo.addons}
@@ -1,96 +0,0 @@
-import "@material/mwc-button";
-import "@polymer/paper-card/paper-card";
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "../../../src/components/buttons/ha-call-api-button";
-import "../components/hassio-card-content";
-import "../resources/hassio-style";
-
-class HassioHassUpdate extends PolymerElement {
-  static get template() {
-    return html`
-      <style include="ha-style hassio-style">
-        paper-card {
-          display: block;
-          margin-bottom: 32px;
-        }
-        .errors {
-          color: var(--google-red-500);
-          margin-top: 16px;
-        }
-        a {
-          color: var(--primary-color);
-        }
-      </style>
-      <template is="dom-if" if="[[computeUpdateAvailable(hassInfo)]]">
-        <div class="content">
-          <div class="card-group">
-            <paper-card heading="Update available! 🎉">
-              <div class="card-content">
-                Home Assistant [[hassInfo.last_version]] is available and you
-                are currently running Home Assistant [[hassInfo.version]].
-                <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="[[computeReleaseNotesUrl(hassInfo.version)]]"
-                  target="_blank"
-                >
-                  <mwc-button>Release notes</mwc-button>
-                </a>
-              </div>
-            </paper-card>
-          </div>
-        </div>
-      </template>
-    `;
-  }
-
-  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;
-  }
-
-  computeReleaseNotesUrl(version) {
-    return `https://${
-      version.includes("b") ? "rc" : "www"
-    }.home-assistant.io/latest-release-notes/`;
-  }
-}
-
-customElements.define("hassio-hass-update", HassioHassUpdate);
@@ -0,0 +1,186 @@
+import {
+  LitElement,
+  TemplateResult,
+  html,
+  CSSResult,
+  css,
+  property,
+  customElement,
+} from "lit-element";
+import "@polymer/iron-icon/iron-icon";
+
+import { HomeAssistant } from "../../../src/types";
+import {
+  HassioHomeAssistantInfo,
+  HassioHassOSInfo,
+  HassioSupervisorInfo,
+} from "../../../src/data/hassio";
+
+import { hassioStyle } from "../resources/hassio-style";
+
+import "@material/mwc-button";
+import "@polymer/paper-card/paper-card";
+import "../../../src/components/buttons/ha-call-api-button";
+import "../components/hassio-card-content";
+
+@customElement("hassio-update")
+export class HassioUpdate extends LitElement {
+  @property() public hass!: HomeAssistant;
+
+  @property() public hassInfo: HassioHomeAssistantInfo;
+  @property() public hassOsInfo?: HassioHassOSInfo;
+  @property() public supervisorInfo: HassioSupervisorInfo;
+
+  @property() public error?: string;
+
+  protected render(): TemplateResult | void {
+    const updatesAvailable: number = [
+      this.hassInfo,
+      this.supervisorInfo,
+      this.hassOsInfo,
+    ].filter((value) => {
+      return !!value && value.version !== value.last_version;
+    }).length;
+
+    if (!updatesAvailable) {
+      return html``;
+    }
+
+    return html`
+      <div class="content">
+        ${this.error
+          ? html`
+              <div class="error">Error: ${this.error}</div>
+            `
+          : ""}
+        <div class="card-group">
+          <div class="title">
+            ${updatesAvailable > 1
+              ? "Updates Available 🎉"
+              : "Update Available 🎉"}
+          </div>
+          ${this._renderUpdateCard(
+            "Home Assistant",
+            this.hassInfo.version,
+            this.hassInfo.last_version,
+            "hassio/homeassistant/update",
+            `https://${
+              this.hassInfo.last_version.includes("b") ? "rc" : "www"
+            }.home-assistant.io/latest-release-notes/`,
+            "hassio:home-assistant"
+          )}
+          ${this._renderUpdateCard(
+            "Hass.io Supervisor",
+            this.supervisorInfo.version,
+            this.supervisorInfo.last_version,
+            "hassio/supervisor/update",
+            `https://github.com//home-assistant/hassio/releases/tag/${this.supervisorInfo.last_version}`
+          )}
+          ${this.hassOsInfo
+            ? this._renderUpdateCard(
+                "HassOS",
+                this.hassOsInfo.version,
+                this.hassOsInfo.version_latest,
+                "hassio/hassos/update",
+                `https://github.com//home-assistant/hassos/releases/tag/${this.hassOsInfo.version_latest}`
+              )
+            : ""}
+        </div>
+      </div>
+    `;
+  }
+
+  private _renderUpdateCard(
+    name: string,
+    curVersion: string,
+    lastVersion: string,
+    apiPath: string,
+    releaseNotesUrl: string,
+    icon?: string
+  ): TemplateResult {
+    if (lastVersion === curVersion) {
+      return html``;
+    }
+    return html`
+      <paper-card>
+        <div class="card-content">
+          ${icon
+            ? html`
+                <div class="icon">
+                  <iron-icon .icon="${icon}" />
+                </div>
+              `
+            : ""}
+          <div class="update-heading">${name} ${lastVersion}</div>
+          <div class="warning">
+            You are currently running version ${curVersion}
+          </div>
+        </div>
+        <div class="card-actions">
+          <a href="${releaseNotesUrl}" target="_blank">
+            <mwc-button>Release notes</mwc-button>
+          </a>
+          <ha-call-api-button
+            .hass=${this.hass}
+            .path=${apiPath}
+            @hass-api-called=${this._apiCalled}
+          >
+            Update
+          </ha-call-api-button>
+        </div>
+      </paper-card>
+    `;
+  }
+
+  private _apiCalled(ev) {
+    if (ev.detail.success) {
+      this.error = "";
+      return;
+    }
+
+    const response = ev.detail.response;
+
+    typeof response.body === "object"
+      ? (this.error = response.body.message || "Unknown error")
+      : (this.error = response.body);
+  }
+
+  static get styles(): CSSResult[] {
+    return [
+      hassioStyle,
+      css`
+        :host {
+          width: 33%;
+        }
+        paper-card {
+          display: inline-block;
+          margin-bottom: 32px;
+        }
+        .icon {
+          --iron-icon-height: 48px;
+          --iron-icon-width: 48px;
+          float: right;
+          margin: 0 0 2px 10px;
+        }
+        .update-heading {
+          font-size: var(--paper-font-subhead_-_font-size);
+          font-weight: 500;
+          margin-bottom: 0.5em;
+        }
+        .warning {
+          color: var(--secondary-text-color);
+        }
+        .card-actions {
+          text-align: right;
+        }
+        .errors {
+          color: var(--google-red-500);
+          padding: 16px;
+        }
+        a {
+          text-decoration: none;
+        }
+      `,
+    ];
+  }
+}
@@ -12,7 +12,9 @@ export const showHassioMarkdownDialog = (
  fireEvent(element, "show-dialog", {
    dialogTag: "dialog-hassio-markdown",
    dialogImport: () =>
-      import(/* webpackChunkName: "dialog-hassio-markdown" */ "./dialog-hassio-markdown"),
+      import(
+        /* webpackChunkName: "dialog-hassio-markdown" */ "./dialog-hassio-markdown"
+      ),
    dialogParams,
  });
 };
@@ -3,6 +3,7 @@ import "@material/mwc-button";
 import "@polymer/paper-checkbox/paper-checkbox";
 import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable";
 import "@polymer/paper-icon-button/paper-icon-button";
+import "@polymer/iron-icon/iron-icon";
 import "@polymer/paper-input/paper-input";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
@@ -94,13 +95,23 @@ class HassioSnapshotDialog extends PolymerElement {
        .details {
          color: var(--secondary-text-color);
        }
-        .download {
-          color: var(--primary-color);
-        }
        .warning,
        .error {
          color: var(--google-red-500);
        }
+        .buttons {
+          display: flex;
+          flex-direction: column;
+        }
+        .buttons li {
+          list-style-type: none;
+        }
+        .buttons .icon {
+          margin-right: 16px;
+        }
+        .no-margin-top {
+          margin-top: 0;
+        }
      </style>
      <ha-paper-dialog
        id="dialog"
@@ -132,7 +143,7 @@ class HassioSnapshotDialog extends PolymerElement {
        </template>
        <template is="dom-if" if="[[_addons.length]]">
          <div>Add-ons:</div>
-          <paper-dialog-scrollable>
+          <paper-dialog-scrollable class="no-margin-top">
            <template is="dom-repeat" items="[[_addons]]" sort="_sortAddons">
              <paper-checkbox checked="{{item.checked}}">
                [[item.name]] <span class="details">([[item.version]])</span>
@@ -151,28 +162,35 @@ class HassioSnapshotDialog extends PolymerElement {
        <template is="dom-if" if="[[error]]">
          <p class="error">Error: [[error]]</p>
        </template>
-        <div class="buttons">
-          <paper-icon-button
-            icon="hassio:delete"
-            on-click="_deleteClicked"
-            class="warning"
-            title="Delete snapshot"
-          ></paper-icon-button>
-          <paper-icon-button
-            on-click="_downloadClicked"
-            icon="hassio:download"
-            class="download"
-            title="Download snapshot"
-          ></paper-icon-button>
-          <mwc-button on-click="_partialRestoreClicked"
-            >Restore selected</mwc-button
-          >
+        <div>Actions:</div>
+        <ul class="buttons">
+          <li>
+            <mwc-button on-click="_downloadClicked">
+              <iron-icon icon="hassio:download" class="icon"></iron-icon>
+              Download Snapshot
+            </mwc-button>
+          </li>
+          <li>
+            <mwc-button on-click="_partialRestoreClicked">
+              <iron-icon icon="hassio:history" class="icon"> </iron-icon>
+              Restore Selected
+            </mwc-button>
+          </li>
          <template is="dom-if" if="[[_isFullSnapshot(snapshot.type)]]">
-            <mwc-button on-click="_fullRestoreClicked"
-              >Wipe &amp; restore</mwc-button
-            >
+            <li>
+              <mwc-button on-click="_fullRestoreClicked">
+                <iron-icon icon="hassio:history" class="icon"> </iron-icon>
+                Wipe &amp; restore
+              </mwc-button>
+            </li>
          </template>
-        </div>
+          <li>
+            <mwc-button on-click="_deleteClicked">
+              <iron-icon icon="hassio:delete" class="icon warning"> </iron-icon>
+              <span class="warning">Delete Snapshot</span>
+            </mwc-button>
+          </li>
+        </ul>
      </ha-paper-dialog>
    `;
  }
@@ -12,7 +12,9 @@ export const showHassioSnapshotDialog = (
  fireEvent(element, "show-dialog", {
    dialogTag: "dialog-hassio-snapshot",
    dialogImport: () =>
-      import(/* webpackChunkName: "dialog-hassio-snapshot" */ "./dialog-hassio-snapshot"),
+      import(
+        /* webpackChunkName: "dialog-hassio-snapshot" */ "./dialog-hassio-snapshot"
+      ),
    dialogParams,
  });
 };
@@ -1,5 +1,7 @@
 window.loadES5Adapter().then(() => {
+  // eslint-disable-next-line
  import(/* webpackChunkName: "hassio-icons" */ "./resources/hassio-icons");
+  // eslint-disable-next-line
  import(/* webpackChunkName: "hassio-main" */ "./hassio-main");
 });
 const styleEl = document.createElement("style");
@@ -3,7 +3,7 @@ import { PolymerElement } from "@polymer/polymer";
 import "@polymer/paper-icon-button";

 import "../../src/resources/ha-style";
-import applyThemesOnElement from "../../src/common/dom/apply_themes_on_element";
+import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
 import { fireEvent } from "../../src/common/dom/fire_event";
 import {
  HassRouterPage,
@@ -13,9 +13,11 @@ import { HomeAssistant } from "../../src/types";
 import {
  fetchHassioSupervisorInfo,
  fetchHassioHostInfo,
+  fetchHassioHassOsInfo,
  fetchHassioHomeAssistantInfo,
  HassioSupervisorInfo,
  HassioHostInfo,
+  HassioHassOSInfo,
  HassioHomeAssistantInfo,
  fetchHassioAddonInfo,
  createHassioSession,
@@ -25,6 +27,7 @@ import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
 import { ProvideHassLitMixin } from "../../src/mixins/provide-hass-lit-mixin";
 // Don't codesplit it, that way the dashboard always loads fast.
 import "./hassio-pages-with-tabs";
+import { navigate } from "../../src/common/navigate";

 // The register callback of the IronA11yKeysBehavior inside paper-icon-button
 // is not called, causing _keyBindings to be uninitiliazed for paper-icon-button,
@@ -54,18 +57,23 @@ class HassioMain extends ProvideHassLitMixin(HassRouterPage) {
      addon: {
        tag: "hassio-addon-view",
        load: () =>
-          import(/* webpackChunkName: "hassio-addon-view" */ "./addon-view/hassio-addon-view"),
+          import(
+            /* webpackChunkName: "hassio-addon-view" */ "./addon-view/hassio-addon-view"
+          ),
      },
      ingress: {
        tag: "hassio-ingress-view",
        load: () =>
-          import(/* webpackChunkName: "hassio-ingress-view" */ "./ingress-view/hassio-ingress-view"),
+          import(
+            /* webpackChunkName: "hassio-ingress-view" */ "./ingress-view/hassio-ingress-view"
+          ),
      },
    },
  };

  @property() private _supervisorInfo: HassioSupervisorInfo;
  @property() private _hostInfo: HassioHostInfo;
+  @property() private _hassOsInfo?: HassioHassOSInfo;
  @property() private _hassInfo: HassioHomeAssistantInfo;

  protected firstUpdated(changedProps: PropertyValues) {
@@ -113,6 +121,7 @@ class HassioMain extends ProvideHassLitMixin(HassRouterPage) {
        supervisorInfo: this._supervisorInfo,
        hostInfo: this._hostInfo,
        hassInfo: this._hassInfo,
+        hassOsInfo: this._hassOsInfo,
        route,
      });
    } else {
@@ -121,6 +130,7 @@ class HassioMain extends ProvideHassLitMixin(HassRouterPage) {
      el.supervisorInfo = this._supervisorInfo;
      el.hostInfo = this._hostInfo;
      el.hassInfo = this._hassInfo;
+      el.hassOsInfo = this._hassOsInfo;
      el.route = route;
    }
  }
@@ -139,6 +149,10 @@ class HassioMain extends ProvideHassLitMixin(HassRouterPage) {
    this._supervisorInfo = supervisorInfo;
    this._hostInfo = hostInfo;
    this._hassInfo = hassInfo;
+
+    if (this._hostInfo.features && this._hostInfo.features.includes("hassos")) {
+      this._hassOsInfo = await fetchHassioHassOsInfo(this.hass);
+    }
  }

  private async _redirectIngress(addonSlug: string) {
@@ -152,14 +166,20 @@ class HassioMain extends ProvideHassLitMixin(HassRouterPage) {
        }),
      ]);
      if (!addon.ingress_url) {
-        throw new Error("Add-on does not support Ingress");
+        alert("Add-on does not support Ingress");
+        return;
+      }
+      if (addon.state !== "started") {
+        alert("Add-on is not running. Please start it first");
+        navigate(this, `/hassio/addon/${addon.slug}`, true);
+        return;
      }
      location.assign(addon.ingress_url);
      // await a promise that doesn't resolve, so we show the loading screen
      // while we load the next page.
      await new Promise(() => undefined);
    } catch (err) {
-      alert(`Unable to open ingress connection `);
+      alert("Unable to open ingress connection");
    }
  }

@@ -27,6 +27,7 @@ import {
  HassioSupervisorInfo,
  HassioHostInfo,
  HassioHomeAssistantInfo,
+  HassioHassOSInfo,
 } from "../../src/data/hassio";

 const HAS_REFRESH_BUTTON = ["store", "snapshots"];
@@ -39,6 +40,7 @@ class HassioPagesWithTabs extends LitElement {
  @property() public supervisorInfo!: HassioSupervisorInfo;
  @property() public hostInfo!: HassioHostInfo;
  @property() public hassInfo!: HassioHomeAssistantInfo;
+  @property() public hassOsInfo!: HassioHassOSInfo;

  protected render(): TemplateResult | void {
    const page = this._page;
@@ -79,6 +81,7 @@ class HassioPagesWithTabs extends LitElement {
          .supervisorInfo=${this.supervisorInfo}
          .hostInfo=${this.hostInfo}
          .hassInfo=${this.hassInfo}
+          .hassOsInfo=${this.hassOsInfo}
        ></hassio-tabs-router>
      </app-header-layout>
    `;
@@ -15,6 +15,7 @@ import {
  HassioSupervisorInfo,
  HassioHostInfo,
  HassioHomeAssistantInfo,
+  HassioHassOSInfo,
 } from "../../src/data/hassio";

@customElement("hassio-tabs-router")
@@ -23,6 +24,7 @@ class HassioTabsRouter extends HassRouterPage {
  @property() public supervisorInfo: HassioSupervisorInfo;
  @property() public hostInfo: HassioHostInfo;
  @property() public hassInfo: HassioHomeAssistantInfo;
+  @property() public hassOsInfo!: HassioHassOSInfo;

  protected routerOptions: RouterOptions = {
    routes: {
@@ -49,12 +51,14 @@ class HassioTabsRouter extends HassRouterPage {
        supervisorInfo: this.supervisorInfo,
        hostInfo: this.hostInfo,
        hassInfo: this.hassInfo,
+        hassOsInfo: this.hassOsInfo,
      });
    } else {
      el.hass = this.hass;
      el.supervisorInfo = this.supervisorInfo;
      el.hostInfo = this.hostInfo;
      el.hassInfo = this.hassInfo;
+      el.hassOsInfo = this.hassOsInfo;
    }
  }
 }
@@ -107,7 +107,7 @@ class HassioHostInfo extends EventsMixin(PolymerElement) {
              >Import from USB</ha-call-api-button
            >
          </template>
-          <template is="dom-if" if="[[_computeUpdateAvailable(_hassOs)]]">
+          <template is="dom-if" if="[[_computeUpdateAvailable(hassOsInfo)]]">
            <ha-call-api-button hass="[[hass]]" path="hassio/hassos/update"
              >Update</ha-call-api-button
            >
@@ -120,12 +120,9 @@ class HassioHostInfo extends EventsMixin(PolymerElement) {
  static get properties() {
    return {
      hass: Object,
-      data: {
-        type: Object,
-        observer: "_dataChanged",
-      },
+      data: Object,
+      hassOsInfo: Object,
      errors: String,
-      _hassOs: Object,
    };
  }

@@ -149,16 +146,6 @@ class HassioHostInfo extends EventsMixin(PolymerElement) {
    }
  }

-  _dataChanged(data) {
-    if (data.features && data.features.includes("hassos")) {
-      this.hass.callApi("get", "hassio/hassos/info").then((resp) => {
-        this._hassOs = resp.data;
-      });
-    } else {
-      this._hassOs = {};
-    }
-  }
-
  _computeUpdateAvailable(data) {
    return data && data.version !== data.version_latest;
  }
@@ -30,6 +30,7 @@ class HassioSystem extends PolymerElement {
        <hassio-host-info
          hass="[[hass]]"
          data="[[hostInfo]]"
+          hass-os-info="[[hassOsInfo]]"
        ></hassio-host-info>
        <div class="title">System log</div>
        <hassio-supervisor-log hass="[[hass]]"></hassio-supervisor-log>
@@ -42,6 +43,7 @@ class HassioSystem extends PolymerElement {
      hass: Object,
      supervisorInfo: Object,
      hostInfo: Object,
+      hassOsInfo: Object,
    };
  }
 }
@@ -1,63 +1,11 @@
-const webpack = require("webpack");
-const CompressionPlugin = require("compression-webpack-plugin");
-const zopfli = require("@gfx/zopfli");
+const { createHassioConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild } = require("../build-scripts/env.js");

-const config = require("./config.js");
-const { babelLoaderConfig } = require("../build-scripts/babel.js");
-const webpackBase = require("../build-scripts/webpack.js");
+// File just used for stats builds

-const isProdBuild = process.env.NODE_ENV === "production";
-const isCI = process.env.CI === "true";
-const chunkFilename = isProdBuild ? "chunk.[chunkhash].js" : "[name].chunk.js";
 const latestBuild = false;

-module.exports = {
-  mode: isProdBuild ? "production" : "development",
-  devtool: isProdBuild ? "source-map" : "inline-source-map",
-  entry: {
-    entrypoint: "./src/entrypoint.js",
-  },
-  module: {
-    rules: [
-      babelLoaderConfig({ latestBuild }),
-      {
-        test: /\.(html)$/,
-        use: {
-          loader: "html-loader",
-          options: {
-            exportAsEs6Default: true,
-          },
-        },
-      },
-    ],
-  },
-  optimization: webpackBase.optimization(latestBuild),
-  plugins: [
-    new webpack.DefinePlugin({
-      __DEV__: JSON.stringify(!isProdBuild),
-      __DEMO__: false,
-      __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
-      "process.env.NODE_ENV": JSON.stringify(
-        isProdBuild ? "production" : "development"
-      ),
-    }),
-    isProdBuild &&
-      !isCI &&
-      new CompressionPlugin({
-        cache: true,
-        exclude: [/\.js\.map$/, /\.LICENSE$/, /\.py$/, /\.txt$/],
-        algorithm(input, compressionOptions, callback) {
-          return zopfli.gzip(input, compressionOptions, callback);
-        },
-      }),
-  ].filter(Boolean),
-  resolve: {
-    extensions: [".ts", ".js", ".json"],
-  },
-  output: {
-    filename: "[name].js",
-    chunkFilename,
-    path: config.buildDir,
-    publicPath: `${config.publicPath}/`,
-  },
-};
+module.exports = createHassioConfig({
+  isProdBuild,
+  latestBuild,
+});
@@ -8,7 +8,7 @@
  "version": "1.0.0",
  "scripts": {
    "build": "script/build_frontend",
-    "lint": "eslint src hassio/src gallery/src && tslint 'src/**/*.ts' 'hassio/src/**/*.ts' 'gallery/src/**/*.ts' 'cast/src/**/*.ts' 'test-mocha/**/*.ts' && polymer lint && tsc",
+    "lint": "eslint src hassio/src gallery/src && tslint 'src/**/*.ts' 'hassio/src/**/*.ts' 'gallery/src/**/*.ts' 'cast/src/**/*.ts' 'test-mocha/**/*.ts' && tsc",
    "mocha": "node_modules/.bin/ts-mocha -p test-mocha/tsconfig.test.json --opts test-mocha/mocha.opts",
    "test": "npm run lint && npm run mocha",
    "docker_build": "sh ./script/docker_run.sh build $npm_package_version",
@@ -17,10 +17,16 @@
  "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
  "license": "Apache-2.0",
  "dependencies": {
-    "@material/mwc-base": "^0.6.0",
-    "@material/mwc-button": "^0.6.0",
-    "@material/mwc-ripple": "^0.6.0",
-    "@mdi/svg": "3.7.95",
+    "@material/chips": "^3.2.0",
+    "@material/data-table": "^3.2.0",
+    "@material/mwc-base": "^0.10.0",
+    "@material/mwc-button": "^0.10.0",
+    "@material/mwc-checkbox": "^0.10.0",
+    "@material/mwc-dialog": "^0.10.0",
+    "@material/mwc-fab": "^0.10.0",
+    "@material/mwc-ripple": "^0.10.0",
+    "@material/mwc-switch": "^0.10.0",
+    "@mdi/svg": "4.7.95",
    "@polymer/app-layout": "^3.0.2",
    "@polymer/app-localize-behavior": "^3.0.1",
    "@polymer/app-route": "^3.0.2",
@@ -45,7 +51,6 @@
    "@polymer/paper-dialog-scrollable": "^3.0.1",
    "@polymer/paper-drawer-panel": "^3.0.1",
    "@polymer/paper-dropdown-menu": "^3.0.1",
-    "@polymer/paper-fab": "^3.0.1",
    "@polymer/paper-icon-button": "^3.0.2",
    "@polymer/paper-input": "^3.0.1",
    "@polymer/paper-item": "^3.0.1",
@@ -61,16 +66,16 @@
    "@polymer/paper-styles": "^3.0.1",
    "@polymer/paper-tabs": "^3.0.1",
    "@polymer/paper-toast": "^3.0.1",
-    "@polymer/paper-toggle-button": "^3.0.1",
    "@polymer/paper-tooltip": "^3.0.1",
    "@polymer/polymer": "3.1.0",
-    "@vaadin/vaadin-combo-box": "^4.2.8",
-    "@vaadin/vaadin-date-picker": "^3.3.3",
+    "@thomasloven/round-slider": "0.3.7",
+    "@vaadin/vaadin-combo-box": "^5.0.6",
+    "@vaadin/vaadin-date-picker": "^4.0.3",
    "@webcomponents/shadycss": "^1.9.0",
    "@webcomponents/webcomponentsjs": "^2.2.7",
    "chart.js": "~2.8.0",
    "chartjs-chart-timeline": "^0.3.0",
-    "codemirror": "^5.45.0",
+    "codemirror": "^5.49.0",
    "cpx": "^1.5.0",
    "deep-clone-simple": "^1.1.1",
    "es6-object-assign": "^1.1.0",
@@ -78,13 +83,13 @@
    "fuse.js": "^3.4.4",
    "google-timezones-json": "^1.0.2",
    "hls.js": "^0.12.4",
-    "home-assistant-js-websocket": "4.3.1",
+    "home-assistant-js-websocket": "^4.4.0",
    "intl-messageformat": "^2.2.0",
-    "jquery": "^3.3.1",
-    "js-yaml": "^3.13.0",
+    "js-yaml": "^3.13.1",
    "leaflet": "^1.4.0",
-    "lit-element": "^2.2.0",
+    "lit-element": "^2.2.1",
    "lit-html": "^1.1.0",
+    "lit-virtualizer": "^0.4.2",
    "marked": "^0.6.1",
    "mdn-polyfills": "^5.16.0",
    "memoize-one": "^5.0.2",
@@ -94,43 +99,44 @@
    "react-big-calendar": "^0.20.4",
    "regenerator-runtime": "^0.13.2",
    "roboto-fontface": "^0.10.0",
-    "round-slider": "^1.3.3",
    "superstruct": "^0.6.1",
+    "tslib": "^1.10.0",
    "unfetch": "^4.1.0",
    "web-animations-js": "^2.3.1",
    "xss": "^1.0.6"
  },
  "devDependencies": {
-    "@babel/core": "^7.4.0",
-    "@babel/plugin-external-helpers": "^7.2.0",
-    "@babel/plugin-proposal-class-properties": "^7.4.0",
-    "@babel/plugin-proposal-decorators": "^7.4.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.4.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-react-jsx": "^7.3.0",
-    "@babel/preset-env": "^7.4.2",
-    "@babel/preset-typescript": "^7.3.3",
-    "@gfx/zopfli": "^1.0.11",
+    "@babel/core": "^7.7.4",
+    "@babel/plugin-external-helpers": "^7.7.4",
+    "@babel/plugin-proposal-class-properties": "^7.7.4",
+    "@babel/plugin-proposal-decorators": "^7.7.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.7.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+    "@babel/plugin-transform-react-jsx": "^7.7.4",
+    "@babel/preset-env": "^7.7.4",
+    "@babel/preset-typescript": "^7.7.4",
    "@types/chai": "^4.1.7",
    "@types/chromecast-caf-receiver": "^3.0.12",
    "@types/chromecast-caf-sender": "^1.0.1",
+    "@types/codemirror": "^0.0.78",
    "@types/hls.js": "^0.12.3",
+    "@types/js-yaml": "^3.12.1",
    "@types/leaflet": "^1.4.3",
    "@types/memoize-one": "4.1.0",
    "@types/mocha": "^5.2.6",
-    "babel-eslint": "^10",
+    "@types/webspeechapi": "^0.0.29",
    "babel-loader": "^8.0.5",
    "chai": "^4.2.0",
-    "compression-webpack-plugin": "^2.0.0",
    "copy-webpack-plugin": "^5.0.2",
    "del": "^4.0.0",
-    "eslint": "^5.15.3",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-config-prettier": "^4.1.0",
-    "eslint-import-resolver-webpack": "^0.11.0",
-    "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-prettier": "^3.0.1",
-    "eslint-plugin-react": "^7.12.4",
+    "eslint": "^6.3.0",
+    "eslint-config-airbnb-base": "^14.0.0",
+    "eslint-config-prettier": "^6.2.0",
+    "eslint-import-resolver-webpack": "^0.11.1",
+    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-prettier": "^3.1.0",
+    "eslint-plugin-react": "^7.14.3",
    "fs-extra": "^7.0.1",
    "gulp": "^4.0.0",
    "gulp-foreach": "^0.1.0",
@@ -146,37 +152,37 @@
    "html-webpack-plugin": "^3.2.0",
    "husky": "^1.3.1",
    "lint-staged": "^8.1.5",
-    "lodash.template": "^4.4.0",
+    "lodash.template": "^4.5.0",
+    "map-stream": "^0.0.7",
    "merge-stream": "^1.0.1",
    "mocha": "^6.0.2",
    "parse5": "^5.1.0",
-    "polymer-cli": "^1.9.7",
-    "prettier": "^1.16.4",
+    "prettier": "^1.19.1",
    "raw-loader": "^2.0.0",
    "reify": "^0.18.1",
    "require-dir": "^1.2.0",
    "sinon": "^7.3.1",
    "terser-webpack-plugin": "^1.2.3",
    "ts-mocha": "^6.0.0",
-    "tslint": "^5.14.0",
+    "tslint": "^5.20.1",
    "tslint-config-prettier": "^1.18.0",
    "tslint-eslint-rules": "^5.4.0",
    "tslint-plugin-prettier": "^2.0.1",
-    "typescript": "^3.4.1",
-    "uglifyjs-webpack-plugin": "^2.1.2",
-    "wct-browser-legacy": "^1.0.2",
+    "typescript": "^3.7.2",
    "web-component-tester": "^6.9.2",
-    "webpack": "^4.29.6",
-    "webpack-cli": "^3.3.0",
-    "webpack-dev-server": "^3.2.1",
+    "webpack": "^4.40.2",
+    "webpack-cli": "^3.3.9",
+    "webpack-dev-server": "^3.8.1",
    "webpack-manifest-plugin": "^2.0.4",
-    "workbox-webpack-plugin": "^4.1.1"
+    "workbox-webpack-plugin": "^4.1.1",
+    "workerize-loader": "^1.1.0"
  },
  "_comment": "Polymer fixed to 3.1 because 3.2 throws on logbook page",
+  "_comment_2": "Fix in https://github.com/Polymer/polymer/pull/5569",
  "resolutions": {
    "@webcomponents/webcomponentsjs": "^2.2.10",
-    "@vaadin/vaadin-lumo-styles": "^1.4.2",
-    "@polymer/polymer": "3.1.0"
+    "@polymer/polymer": "3.1.0",
+    "lit-html": "^1.1.2"
  },
  "main": "src/home-assistant.js",
  "husky": {
@@ -13,4 +13,4 @@ script/build_frontend

 rm -rf dist
 python3 setup.py sdist
-python3 -m twine upload dist/*
+python3 -m twine upload dist/* --skip-existing
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Resolve all frontend dependencies that the application requires to develop.
+
+# Stop on errors
+set -e
+
+cd "$(dirname "$0")/.."
+
+script/bootstrap
+
@@ -21,7 +21,7 @@ fi
 [ -z "${LOKALISE_TOKEN-}" ] && LOKALISE_TOKEN="$(<.lokalise_token)"

 PROJECT_ID="3420425759f6d6d241f598.13594006"
-LOCAL_DIR="$(pwd)/translations"
+LOCAL_DIR="$(pwd)/translations/downloads"
 FILE_FORMAT=json

 mkdir -p ${LOCAL_DIR}
@@ -29,9 +29,15 @@ mkdir -p ${LOCAL_DIR}
 docker run \
     -v ${LOCAL_DIR}:/opt/dest/locale \
     --rm \
-     lokalise/lokalise-cli@sha256:b8329d20280263cad04f65b843e54b9e8e6909a348a678eac959550b5ef5c75f lokalise \
+     lokalise/lokalise-cli-2@sha256:f1860b26be22fa73b8c93bc5f8690f2afc867610a42de6fc27adc790e5d4425d lokalise2 \
     --token ${LOKALISE_TOKEN} \
-     export ${PROJECT_ID} \
-     --export_empty skip \
-     --type json \
-     --unzip_to /opt/dest
+     --project-id ${PROJECT_ID} \
+     file download \
+     --export-empty-as skip \
+     --format json \
+     --json-unescaped-slashes=true \
+     --replace-breaks=false \
+     --original-filenames=false \
+     --unzip-to /opt/dest
+
+./node_modules/.bin/gulp check-downloaded-translations
@@ -26,17 +26,18 @@ LANG_ISO=en

 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

-if [ "${CURRENT_BRANCH-}" != "master" ] && [ "${TRAVIS_BRANCH-}" != "master" ] ; then
-  echo "Please only run the translations upload script from a clean checkout of master."
+if [ "${CURRENT_BRANCH-}" != "dev" ] && [ "${AZURE_BRANCH-}" != "dev" ] ; then
+  echo "Please only run the translations upload script from a clean checkout of dev."
  exit 1
 fi

 docker run \
    -v ${LOCAL_FILE}:/opt/src/${LOCAL_FILE} \
-    lokalise/lokalise-cli@sha256:2198814ebddfda56ee041a4b427521757dd57f75415ea9693696a64c550cef21 lokalise \
+     lokalise/lokalise-cli-2@sha256:f1860b26be22fa73b8c93bc5f8690f2afc867610a42de6fc27adc790e5d4425d lokalise2 \
    --token ${LOKALISE_TOKEN} \
-    import ${PROJECT_ID} \
+    --project-id ${PROJECT_ID} \
+    file upload \
    --file /opt/src/${LOCAL_FILE} \
-    --lang_iso ${LANG_ISO} \
-    --convert_placeholders 0 \
-    --replace 1
+    --lang-iso ${LANG_ISO} \
+    --convert-placeholders=false \
+    --replace-modified=true
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Safe bash settings
-# -e            Exit on command fail
-# -u            Exit on unset variable
-# -o pipefail   Exit if piped command has error code
-set -eu -o pipefail
-
-cd "$(dirname "$0")/.."
-
-script/translations_upload_base
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages

 setup(
    name="home-assistant-frontend",
-    version="20190804.0",
+    version="20200108.0",
    description="The Home Assistant frontend",
    url="https://github.com/home-assistant/home-assistant-polymer",
    author="The Home Assistant Authors",
@@ -7,11 +7,14 @@ import {
  css,
 } from "lit-element";
 import "@material/mwc-button";
-import "../components/ha-form";
+import "../components/ha-form/ha-form";
 import "../components/ha-markdown";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 import { AuthProvider } from "../data/auth";
-import { ConfigFlowStep, ConfigFlowStepForm } from "../data/config_entries";
+import {
+  DataEntryFlowStep,
+  DataEntryFlowStepForm,
+} from "../data/data_entry_flow";

 type State = "loading" | "error" | "step";

@@ -22,7 +25,7 @@ class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
  @property() public oauth2State?: string;
  @property() private _state: State = "loading";
  @property() private _stepData: any = {};
-  @property() private _step?: ConfigFlowStep;
+  @property() private _step?: DataEntryFlowStep;
  @property() private _errorMessage?: string;

  protected render() {
@@ -87,16 +90,15 @@ class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
    }
  }

-  private _renderStep(step: ConfigFlowStep) {
+  private _renderStep(step: DataEntryFlowStep) {
    switch (step.type) {
      case "abort":
        return html`
          ${this.localize("ui.panel.page-authorize.abort_intro")}:
          <ha-markdown
+            allowsvg
            .content=${this.localize(
-              `ui.panel.page-authorize.form.providers.${
-                step.handler[0]
-              }.abort.${step.reason}`
+              `ui.panel.page-authorize.form.providers.${step.handler[0]}.abort.${step.reason}`
            )}
          ></ha-markdown>
        `;
@@ -106,7 +108,6 @@ class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
            ? html`
                <ha-markdown
                  .content=${this._computeStepDescription(step)}
-                  allow-svg
                ></ha-markdown>
              `
            : html``}
@@ -116,6 +117,7 @@ class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
            .error=${step.errors}
            .computeLabel=${this._computeLabelCallback(step)}
            .computeError=${this._computeErrorCallback(step)}
+            @value-changed=${this._stepDataChanged}
          ></ha-form>
        `;
      default:
@@ -193,7 +195,7 @@ class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
    document.location.assign(url);
  }

-  private async _updateStep(step: ConfigFlowStep) {
+  private async _updateStep(step: DataEntryFlowStep) {
    let stepData: any = null;
    if (
      this._step &&
@@ -220,10 +222,12 @@ class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
    }, 100);
  }

-  private _computeStepDescription(step: ConfigFlowStepForm) {
-    const resourceKey = `ui.panel.page-authorize.form.providers.${
-      step.handler[0]
-    }.step.${step.step_id}.description`;
+  private _stepDataChanged(ev: CustomEvent) {
+    this._stepData = ev.detail.value;
+  }
+
+  private _computeStepDescription(step: DataEntryFlowStepForm) {
+    const resourceKey = `ui.panel.page-authorize.form.providers.${step.handler[0]}.step.${step.step_id}.description`;
    const args: string[] = [];
    const placeholders = step.description_placeholders || {};
    Object.keys(placeholders).forEach((key) => {
@@ -233,23 +237,19 @@ class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
    return this.localize(resourceKey, ...args);
  }

-  private _computeLabelCallback(step: ConfigFlowStepForm) {
+  private _computeLabelCallback(step: DataEntryFlowStepForm) {
    // Returns a callback for ha-form to calculate labels per schema object
    return (schema) =>
      this.localize(
-        `ui.panel.page-authorize.form.providers.${step.handler[0]}.step.${
-          step.step_id
-        }.data.${schema.name}`
+        `ui.panel.page-authorize.form.providers.${step.handler[0]}.step.${step.step_id}.data.${schema.name}`
      );
  }

-  private _computeErrorCallback(step: ConfigFlowStepForm) {
+  private _computeErrorCallback(step: DataEntryFlowStepForm) {
    // Returns a callback for ha-form to calculate error messages
    return (error) =>
      this.localize(
-        `ui.panel.page-authorize.form.providers.${
-          step.handler[0]
-        }.error.${error}`
+        `ui.panel.page-authorize.form.providers.${step.handler[0]}.error.${error}`
      );
  }

@@ -2,16 +2,18 @@ import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 import {
  LitElement,
  html,
-  PropertyDeclarations,
  PropertyValues,
  CSSResult,
  css,
+  property,
 } from "lit-element";
 import "./ha-auth-flow";
 import { AuthProvider, fetchAuthProviders } from "../data/auth";
 import { registerServiceWorker } from "../util/register-service-worker";

-import(/* webpackChunkName: "pick-auth-provider" */ "../auth/ha-pick-auth-provider");
+import(
+  /* webpackChunkName: "pick-auth-provider" */ "../auth/ha-pick-auth-provider"
+);

 interface QueryParams {
  client_id?: string;
@@ -20,11 +22,11 @@ interface QueryParams {
 }

 class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
-  public clientId?: string;
-  public redirectUri?: string;
-  public oauth2State?: string;
-  private _authProvider?: AuthProvider;
-  private _authProviders?: AuthProvider[];
+  @property() public clientId?: string;
+  @property() public redirectUri?: string;
+  @property() public oauth2State?: string;
+  @property() private _authProvider?: AuthProvider;
+  @property() private _authProviders?: AuthProvider[];

  constructor() {
    super();
@@ -48,16 +50,6 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
    }
  }

-  static get properties(): PropertyDeclarations {
-    return {
-      _authProvider: {},
-      _authProviders: {},
-      clientId: {},
-      redirectUri: {},
-      oauth2State: {},
-    };
-  }
-
  protected render() {
    if (!this._authProviders) {
      return html`
@@ -1,31 +0,0 @@
-import { html } from "@polymer/polymer/lib/utils/html-tag";
-import { PolymerElement } from "@polymer/polymer/polymer-element";
-
-import "../components/entity/ha-state-label-badge";
-
-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 properties() {
-    return {
-      hass: Object,
-      states: Array,
-    };
-  }
-}
-customElements.define("ha-badges-card", HaBadgesCard);
@@ -0,0 +1,45 @@
+import { TemplateResult, html } from "lit-html";
+import { customElement, LitElement, property } from "lit-element";
+import { HassEntity } from "home-assistant-js-websocket";
+
+import "../components/entity/ha-state-label-badge";
+
+import { HomeAssistant } from "../types";
+import { fireEvent } from "../common/dom/fire_event";
+
+@customElement("ha-badges-card")
+class HaBadgesCard extends LitElement {
+  @property() public hass?: HomeAssistant;
+  @property() public states?: HassEntity[];
+
+  protected render(): TemplateResult | void {
+    if (!this.hass || !this.states) {
+      return html``;
+    }
+
+    return html`
+      ${this.states.map(
+        (state) => html`
+          <ha-state-label-badge
+            .hass=${this.hass}
+            .state=${state}
+            @click=${this._handleClick}
+          ></ha-state-label-badge>
+        `
+      )}
+    `;
+  }
+
+  private _handleClick(ev: Event) {
+    const entityId = ((ev.target as any).state as HassEntity).entity_id;
+    fireEvent(this, "hass-more-info", {
+      entityId,
+    });
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-badges-card": HaBadgesCard;
+  }
+}
@@ -2,7 +2,7 @@ import "@polymer/paper-styles/element-styles/paper-material-styles";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";

-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { EventsMixin } from "../mixins/events-mixin";
 import LocalizeMixin from "../mixins/localize-mixin";
 import { fetchThumbnailUrlWithCache } from "../data/camera";
@@ -6,10 +6,10 @@ import "../components/entity/ha-entity-toggle";
 import "../components/ha-card";
 import "../state-summary/state-card-content";

-import computeStateDomain from "../common/entity/compute_state_domain";
-import computeStateName from "../common/entity/compute_state_name";
-import stateMoreInfoType from "../common/entity/state_more_info_type";
-import canToggleState from "../common/entity/can_toggle_state";
+import { computeStateDomain } from "../common/entity/compute_state_domain";
+import { computeStateName } from "../common/entity/compute_state_name";
+import { stateMoreInfoType } from "../common/entity/state_more_info_type";
+import { canToggleState } from "../common/entity/can_toggle_state";
 import { EventsMixin } from "../mixins/events-mixin";
 import LocalizeMixin from "../mixins/localize-mixin";

@@ -5,7 +5,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../components/state-history-charts";
 import "../data/ha-state-history-data";

-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { EventsMixin } from "../mixins/events-mixin";

 /*
@@ -97,14 +97,11 @@ class HaHistoryGraphCard extends EventsMixin(PolymerElement) {
      this.cacheConfig.refresh !== (stateObj.attributes.refresh || 0) ||
      this.cacheConfig.hoursToShow !== (stateObj.attributes.hours_to_show || 24)
    ) {
-      this.cacheConfig = Object.assign(
-        {},
-        {
-          refresh: stateObj.attributes.refresh || 0,
-          cacheKey: stateObj.entity_id,
-          hoursToShow: stateObj.attributes.hours_to_show || 24,
-        }
-      );
+      this.cacheConfig = {
+        refresh: stateObj.attributes.refresh || 0,
+        cacheKey: stateObj.entity_id,
+        hoursToShow: stateObj.attributes.hours_to_show || 24,
+      };
    }
  }

@@ -8,7 +8,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import HassMediaPlayerEntity from "../util/hass-media-player-model";
 import { fetchMediaPlayerThumbnailWithCache } from "../data/media-player";

-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { EventsMixin } from "../mixins/events-mixin";
 import LocalizeMixin from "../mixins/localize-mixin";

@@ -5,9 +5,9 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../components/ha-card";
 import "../components/ha-markdown";

-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import LocalizeMixin from "../mixins/localize-mixin";
-import computeObjectId from "../common/entity/compute_object_id";
+import { computeObjectId } from "../common/entity/compute_object_id";

 /*
 * @appliesMixin LocalizeMixin
@@ -4,7 +4,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import "../components/ha-card";
 import "../components/ha-icon";

-import computeStateName from "../common/entity/compute_state_name";
+import { computeStateName } from "../common/entity/compute_state_name";
 import { EventsMixin } from "../mixins/events-mixin";

 class HaPlantCard extends EventsMixin(PolymerElement) {
--- a/Show More
+++ b/Show More