Combine energy and water api calls to reduce overhead

Fix stats data being fetched for all entities when there are no energy/water stat ids (#15428 )
* Fix stats data being fetched for all entities when there are no energy/water stat ids I noticed the following query was being sent to the stats api since there were no water stat ids. Since it sent an empty list it enumerated everything ``` { type: "recorder/statistics_during_period", start_time: "2023-02-05T05:00:00.000Z", end_time: "2023-02-12T05:59:59.999Z" .... statistic_ids: [], type: "recorder/statistics_during_period" types: ["sum"] units: {volume: "gal"} } ``` * not python
2026-06-06 00:12:13 +00:00 · 2023-02-11 18:19:58 -06:00 · 2023-02-11 17:43:20 -05:00 · 2023-02-10 16:21:49 -05:00 · 2023-02-10 18:38:48 +00:00 · 2023-02-10 11:15:49 -05:00
286 changed files with 9988 additions and 6990 deletions
@@ -1,5 +1,5 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/python-3/.devcontainer/base.Dockerfile
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.9
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.10

 ENV \
  DEBIAN_FRONTEND=noninteractive \
@@ -5,6 +5,7 @@
    "plugin:@typescript-eslint/recommended",
    "plugin:wc/recommended",
    "plugin:lit/all",
+    "plugin:lit-a11y/recommended",
    "prettier"
  ],
  "parser": "@typescript-eslint/parser",
@@ -65,7 +66,10 @@
    "import/extensions": [
      "error",
      "ignorePackages",
-      { "ts": "never", "js": "never" }
+      {
+        "ts": "never",
+        "js": "never"
+      }
    ],
    "no-restricted-syntax": ["error", "LabeledStatement", "WithStatement"],
    "object-curly-newline": "off",
@@ -112,7 +116,15 @@
    ],
    "unused-imports/no-unused-imports": "error",
    "lit/attribute-value-entities": "off",
-    "lit/no-template-map": "off"
+    "lit/no-template-map": "off",
+    "lit/no-native-attributes": "warn",
+    "lit/no-this-assign-in-render": "warn",
+    "lit/prefer-nothing": "warn",
+    "lit-a11y/click-events-have-key-events": ["off"],
+    "lit-a11y/no-autofocus": "off",
+    "lit-a11y/alt-text": "warn",
+    "lit-a11y/anchor-is-valid": "warn",
+    "lit-a11y/role-has-required-aria-attrs": "warn"
  },
  "plugins": ["disable", "unused-imports"],
  "processor": "disable/disable"
@@ -10,5 +10,12 @@ updates:
    directory: "/"
    schedule:
      interval: "daily"
-      time: "06:00"
-    open-pull-requests-limit: 5
+      time: "03:00"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+    ignore:
+      # Ignore rollup and plugins until everything else is updated
+      - dependency-name: "*rollup*"
+      - dependency-name: "@rollup/*"
+      - dependency-name: "serve"
@@ -22,12 +22,12 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
        with:
          ref: dev

      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -60,12 +60,12 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
        with:
          ref: master

      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -20,9 +20,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -44,9 +44,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -63,9 +63,9 @@ jobs:
    needs: [lint, test]
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -82,9 +82,9 @@ jobs:
    needs: [lint, test]
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -23,7 +23,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v3.2.0
+      uses: actions/checkout@v3.3.0
      with:
        # We must fetch at least the immediate parents so that if this is
        # a pull request then we can checkout the head.
@@ -23,12 +23,12 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
        with:
          ref: dev

      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -61,12 +61,12 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0
        with:
          ref: master

      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -17,10 +17,10 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0

      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -22,10 +22,10 @@ jobs:
    if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0

      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -21,7 +21,7 @@ jobs:
      contents: write
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0

      - name: Set up Python ${{ env.PYTHON_VERSION }}
        uses: actions/setup-python@v4
@@ -29,7 +29,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}

      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -24,7 +24,7 @@ jobs:
      contents: write # Required to upload release assets
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0

      - name: Verify version
        uses: home-assistant/actions/helpers/verify-version@master
@@ -35,7 +35,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}

      - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
        with:
          node-version: ${{ env.NODE_VERSION }}
          cache: yarn
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v3.3.0

      - name: Upload Translations
        run: |
@@ -8,7 +8,7 @@ dist/
 /translations/

 # yarn
-.yarn/**
+.yarn/*
 !.yarn/patches
 !.yarn/releases
 !.yarn/plugins
@@ -31,7 +31,7 @@ pip-selfcheck.json
 .venv

 # vscode
-.vscode/**
+.vscode/*
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/tasks.json
@@ -1,29 +0,0 @@
-diff --git a/polyfillLoaders/EventTarget.js b/polyfillLoaders/EventTarget.js
-index 4e18ade7ba485849f17f28c94c42f0e0e01ac387..8f34f4f646c7f7becc208fb5a546c96034fc74dc 100644
--- a/polyfillLoaders/EventTarget.js
-+++ b/polyfillLoaders/EventTarget.js
-@@ -6,16 +6,15 @@
- let _ET;
- let ET;
- export default async function EventTarget() {
-    return ET || init();
-+  return ET || init();
- }
- async function init() {
-    _ET = window.EventTarget;
-    try {
-        new _ET();
-    }
-    catch (_a) {
-        _ET = (await import('event-target-shim')).EventTarget;
-    }
-    return (ET = _ET);
-+  _ET = window.EventTarget;
-+  try {
-+    new _ET();
-+  } catch (_a) {
-+    _ET = (await import("event-target-shim")).default.EventTarget;
-+  }
-+  return (ET = _ET);
- }
- //# sourceMappingURL=EventTarget.js.map
@@ -1,12 +0,0 @@
-diff --git a/mwc-icon-button-base.js b/mwc-icon-button-base.js
-index 45cdaab93ccc0a6daaaaabc01266dcdc32e46bfd..b3ea5b541597308d85f86ce6c23fd00785fda835 100644
--- a/mwc-icon-button-base.js
-+++ b/mwc-icon-button-base.js
-@@ -63,7 +63,6 @@ export class IconButtonBase extends LitElement {
-         @touchend="${this.handleRippleDeactivate}"
-         @touchcancel="${this.handleRippleDeactivate}"
-     >${this.renderRipple()}
-    <i class="material-icons">${this.icon}</i>
-     <span
-       ><slot></slot
-     ></span>
@@ -6,4 +6,4 @@ plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
    spec: "@yarnpkg/plugin-interactive-tools"

-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+yarnPath: .yarn/releases/yarn-3.3.1.cjs
@@ -67,7 +67,7 @@ module.exports.babelOptions = ({ latestBuild }) => ({
      "@babel/preset-env",
      {
        useBuiltIns: "entry",
-        corejs: "3.15",
+        corejs: { version: "3.27", proposals: true },
        bugfixes: true,
      },
    ],
@@ -1,36 +1,40 @@
-const del = require("del");
+const del = import("del");
 const gulp = require("gulp");
 const paths = require("../paths");
 require("./translations");

 gulp.task(
  "clean",
-  gulp.parallel("clean-translations", () =>
-    del([paths.app_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", async () =>
+    (await del).deleteSync([paths.app_output_root, paths.build_dir])
  )
 );

 gulp.task(
  "clean-demo",
-  gulp.parallel("clean-translations", () =>
-    del([paths.demo_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", async () =>
+    (await del).deleteSync([paths.demo_output_root, paths.build_dir])
  )
 );

 gulp.task(
  "clean-cast",
-  gulp.parallel("clean-translations", () =>
-    del([paths.cast_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", async () =>
+    (await del).deleteSync([paths.cast_output_root, paths.build_dir])
  )
 );

-gulp.task("clean-hassio", () =>
-  del([paths.hassio_output_root, paths.build_dir])
+gulp.task("clean-hassio", async () =>
+  (await del).deleteSync([paths.hassio_output_root, paths.build_dir])
 );

 gulp.task(
  "clean-gallery",
-  gulp.parallel("clean-translations", () =>
-    del([paths.gallery_output_root, paths.gallery_build, paths.build_dir])
+  gulp.parallel("clean-translations", async () =>
+    (await del).deleteSync([
+      paths.gallery_output_root,
+      paths.gallery_build,
+      paths.build_dir,
+    ])
  )
 );
@@ -1,9 +1,9 @@
 // Task to download the latest Lokalise translations from the nightly workflow artifacts

+const del = import("del");
 const fs = require("fs/promises");
 const path = require("path");
 const process = require("process");
-const del = require("del");
 const gulp = require("gulp");
 const jszip = require("jszip");
 const tar = require("tar");
@@ -17,8 +17,8 @@ const WORKFLOW_NAME = "nightly.yaml";
 const ARTIFACT_NAME = "translations";
 const CLIENT_ID = "Iv1.3914e28cb27834d1";
 const EXTRACT_DIR = "translations";
-const TOKEN_FILE = path.join(EXTRACT_DIR, "token.json");
-const ARTIFACT_FILE = path.join(EXTRACT_DIR, "artifact.json");
+const TOKEN_FILE = path.posix.join(EXTRACT_DIR, "token.json");
+const ARTIFACT_FILE = path.posix.join(EXTRACT_DIR, "artifact.json");

 let allowTokenSetup = false;
 gulp.task("allow-setup-fetch-nightly-translations", (done) => {
@@ -137,7 +137,11 @@ gulp.task("fetch-nightly-translations", async function () {

  // Remove the current translations
  const deleteCurrent = Promise.all(writings).then(
-    del([`${EXTRACT_DIR}/*`, `!${ARTIFACT_FILE}`, `!${TOKEN_FILE}`])
+    (await del).deleteAsync([
+      `${EXTRACT_DIR}/*`,
+      `!${ARTIFACT_FILE}`,
+      `!${TOKEN_FILE}`,
+    ])
  );

  // Get the download URL and follow the redirect to download (stored as ArrayBuffer)
@@ -1,4 +1,4 @@
-const del = require("del");
+const del = import("del");
 const path = require("path");
 const gulp = require("gulp");
 const fs = require("fs");
@@ -6,7 +6,7 @@ const paths = require("../paths");

 const outDir = "build/locale-data";

-gulp.task("clean-locale-data", () => del([outDir]));
+gulp.task("clean-locale-data", async () => (await del).deleteSync([outDir]));

 gulp.task("ensure-locale-data-build-dir", (done) => {
  if (!fs.existsSync(outDir)) {
@@ -1,5 +1,5 @@
+const del = import("del");
 const crypto = require("crypto");
-const del = require("del");
 const path = require("path");
 const source = require("vinyl-source-stream");
 const vinylBuffer = require("vinyl-buffer");
@@ -13,7 +13,7 @@ const { mapFiles } = require("../util");
 const env = require("../env");
 const paths = require("../paths");

-require("./fetch-nightly_translations");
+require("./fetch-nightly-translations");

 const inFrontendDir = "translations/frontend";
 const inBackendDir = "translations/backend";
@@ -120,7 +120,7 @@ function lokaliseTransform(data, original, file) {
  return output;
 }

-gulp.task("clean-translations", () => del([workDir]));
+gulp.task("clean-translations", async () => (await del).deleteSync([workDir]));

 gulp.task("ensure-translations-build-dir", (done) => {
  if (!fs.existsSync(workDir)) {
@@ -22,7 +22,11 @@ class HcLayout extends LitElement {
    return html`
      <ha-card>
        <div class="layout">
-          <img class="hero" src="/images/google-nest-hub.png" />
+          <img
+            class="hero"
+            alt="A Google Nest Hub with a Home Assistant dashboard on its screen"
+            src="/images/google-nest-hub.png"
+          />
          <h1 class="card-header">
            Home Assistant Cast${this.subtitle ? ` – ${this.subtitle}` : ""}
            ${this.auth
@@ -12,6 +12,7 @@ class HcLaunchScreen extends LitElement {
    return html`
      <div class="container">
        <img
+          alt="Home Assistant logo on left, Nabu Casa logo on right, and red heart in center"
          src="https://www.home-assistant.io/images/blog/2018-09-thinking-big/social.png"
        />
        <div class="status">
@@ -1,4 +1,5 @@
 // Compat needs to be first import
+import "../../src/resources/compatibility";
 import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
 import { navigate } from "../../src/common/navigate";
 import {
@@ -6,7 +7,6 @@ import {
  provideHass,
 } from "../../src/fake_data/provide_hass";
 import { HomeAssistantAppEl } from "../../src/layouts/home-assistant";
-import "../../src/resources/compatibility";
 import { HomeAssistant } from "../../src/types";
 import { selectedDemoConfig } from "./configs/demo-configs";
 import { mockAuth } from "./stubs/auth";
@@ -71,6 +71,7 @@ class HaDemo extends HomeAssistantAppEl {
        entity_category: null,
        has_entity_name: false,
        unique_id: "co2_intensity",
+        options: null,
      },
      {
        config_entry_id: "co2signal",
@@ -86,6 +87,7 @@ class HaDemo extends HomeAssistantAppEl {
        entity_category: null,
        has_entity_name: false,
        unique_id: "grid_fossil_fuel_percentage",
+        options: null,
      },
    ]);

@@ -15,6 +15,7 @@ import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 const generateMeanStatistics = (
  start: Date,
  end: Date,
+  // eslint-disable-next-line @typescript-eslint/default-param-last
  period: "5minute" | "hour" | "day" | "month" = "hour",
  initValue: number,
  maxDiff: number
@@ -51,6 +52,7 @@ const generateMeanStatistics = (
 const generateSumStatistics = (
  start: Date,
  end: Date,
+  // eslint-disable-next-line @typescript-eslint/default-param-last
  period: "5minute" | "hour" | "day" | "month" = "hour",
  initValue: number,
  maxDiff: number
@@ -86,6 +88,7 @@ const generateSumStatistics = (
 const generateCurvedStatistics = (
  start: Date,
  end: Date,
+  // eslint-disable-next-line @typescript-eslint/default-param-last
  _period: "5minute" | "hour" | "day" | "month" = "hour",
  initValue: number,
  maxDiff: number,
@@ -115,8 +115,8 @@ export class DemoHaBarSwitch extends LitElement {
        font-weight: 600;
      }
      .custom {
-        --switch-bar-on-color: rgb(var(--rgb-green-color));
-        --switch-bar-off-color: rgb(var(--rgb-red-color));
+        --switch-bar-on-color: var(--green-color);
+        --switch-bar-off-color: var(--red-color);
        --switch-bar-thickness: 100px;
        --switch-bar-border-radius: 24px;
        --switch-bar-padding: 6px;
@@ -99,16 +99,19 @@ const AREAS = [
    area_id: "backyard",
    name: "Backyard",
    picture: null,
+    aliases: [],
  },
  {
    area_id: "bedroom",
    name: "Bedroom",
    picture: null,
+    aliases: [],
  },
  {
    area_id: "livingroom",
    name: "Livingroom",
    picture: null,
+    aliases: [],
  },
 ];

@@ -95,16 +95,19 @@ const AREAS = [
    area_id: "backyard",
    name: "Backyard",
    picture: null,
+    aliases: [],
  },
  {
    area_id: "bedroom",
    name: "Bedroom",
    picture: null,
+    aliases: [],
  },
  {
    area_id: "livingroom",
    name: "Livingroom",
    picture: null,
+    aliases: [],
  },
 ];

@@ -0,0 +1,3 @@
+---
+title: Tile Card
+---
@@ -0,0 +1,173 @@
+import { html, LitElement, PropertyValues, TemplateResult } from "lit";
+import { customElement, query } from "lit/decorators";
+import { CoverEntityFeature } from "../../../../src/data/cover";
+import { LightColorMode } from "../../../../src/data/light";
+import { VacuumEntityFeature } from "../../../../src/data/vacuum";
+import { getEntity } from "../../../../src/fake_data/entity";
+import { provideHass } from "../../../../src/fake_data/provide_hass";
+import "../../components/demo-cards";
+
+const ENTITIES = [
+  getEntity("switch", "tv_outlet", "on", {
+    friendly_name: "TV outlet",
+    device_class: "outlet",
+  }),
+  getEntity("light", "bed_light", "on", {
+    friendly_name: "Bed Light",
+    supported_color_modes: [LightColorMode.HS],
+  }),
+  getEntity("light", "unavailable", "unavailable", {
+    friendly_name: "Unavailable entity",
+  }),
+  getEntity("climate", "thermostat", "heat", {
+    current_temperature: 73,
+    min_temp: 45,
+    max_temp: 95,
+    temperature: 80,
+    hvac_modes: ["heat", "cool", "auto", "off"],
+    friendly_name: "Thermostat",
+    hvac_action: "heating",
+  }),
+  getEntity("person", "paulus", "home", {
+    friendly_name: "Paulus",
+  }),
+  getEntity("vacuum", "first_floor_vacuum", "docked", {
+    friendly_name: "First floor vacuum",
+    supported_features:
+      VacuumEntityFeature.START +
+      VacuumEntityFeature.STOP +
+      VacuumEntityFeature.RETURN_HOME,
+  }),
+  getEntity("cover", "kitchen_shutter", "open", {
+    friendly_name: "Kitchen shutter",
+    device_class: "shutter",
+    supported_features:
+      CoverEntityFeature.CLOSE +
+      CoverEntityFeature.OPEN +
+      CoverEntityFeature.STOP,
+  }),
+  getEntity("cover", "pergola_roof", "open", {
+    friendly_name: "Pergola Roof",
+    supported_features:
+      CoverEntityFeature.CLOSE_TILT +
+      CoverEntityFeature.OPEN_TILT +
+      CoverEntityFeature.STOP_TILT,
+  }),
+];
+
+const CONFIGS = [
+  {
+    heading: "Basic example",
+    config: `
+- type: tile
+  entity: switch.tv_outlet
+    `,
+  },
+  {
+    heading: "Vertical example",
+    config: `
+- type: tile
+  entity: switch.tv_outlet
+  vertical: true
+    `,
+  },
+  {
+    heading: "Custom color",
+    config: `
+- type: tile
+  entity: switch.tv_outlet
+  color: pink
+    `,
+  },
+  {
+    heading: "Unknown entity",
+    config: `
+- type: tile
+  entity: light.unknown
+    `,
+  },
+  {
+    heading: "Unavailable entity",
+    config: `
+- type: tile
+  entity: light.unavailable
+    `,
+  },
+  {
+    heading: "Climate",
+    config: `
+- type: tile
+  entity: climate.thermostat
+    `,
+  },
+  {
+    heading: "Person",
+    config: `
+- type: tile
+  entity: person.paulus
+    `,
+  },
+  {
+    heading: "Light brightness feature",
+    config: `
+- type: tile
+  entity: light.bed_light
+  features:
+    - type: "light-brightness"
+    `,
+  },
+  {
+    heading: "Vacuum commands feature",
+    config: `
+- type: tile
+  entity: vacuum.first_floor_vacuum
+  features:
+    - type: "vacuum-commands"
+      commands:
+        - start_pause
+        - stop
+        - return_home
+    `,
+  },
+  {
+    heading: "Cover open close feature",
+    config: `
+- type: tile
+  entity: cover.kitchen_shutter
+  features:
+    - type: "cover-open-close"
+    `,
+  },
+  {
+    heading: "Cover tilt feature",
+    config: `
+- type: tile
+  entity: cover.pergola_roof
+  features:
+  - type: "cover-tilt"
+    `,
+  },
+];
+
+@customElement("demo-lovelace-tile-card")
+class DemoTile extends LitElement {
+  @query("#demos") private _demoRoot!: HTMLElement;
+
+  protected render(): TemplateResult {
+    return html`<demo-cards id="demos" .configs=${CONFIGS}></demo-cards>`;
+  }
+
+  protected firstUpdated(changedProperties: PropertyValues) {
+    super.firstUpdated(changedProperties);
+    const hass = provideHass(this._demoRoot);
+    hass.updateTranslations(null, "en");
+    hass.updateTranslations("lovelace", "en");
+    hass.addEntities(ENTITIES);
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-lovelace-tile-card": DemoTile;
+  }
+}
@@ -104,16 +104,17 @@ const ENTITIES: HassEntity[] = [
  createEntity("alarm_control_panel.disarming", "disarming"),
  createEntity("alarm_control_panel.triggered", "triggered"),
  // Alert
+  createEntity("alert.idle", "idle"),
  createEntity("alert.off", "off"),
  createEntity("alert.on", "on"),
-  createEntity("alert.idle", "idle"),
  // Automation
  createEntity("automation.off", "off"),
  createEntity("automation.on", "on"),
  // Binary Sensor
-  ...BINARY_SENSOR_DEVICE_CLASSES.map((dc) =>
-    createEntity(`binary_sensor.${dc}`, "on", dc)
-  ),
+  ...BINARY_SENSOR_DEVICE_CLASSES.map((dc) => [
+    createEntity(`binary_sensor.${dc}`, "off", dc),
+    createEntity(`binary_sensor.${dc}`, "on", dc),
+  ]).reduce((arr, item) => [...arr, ...item], []),
  // Button
  createEntity("button.restart", "unknown", "restart"),
  createEntity("button.update", "unknown", "update"),
@@ -142,6 +143,9 @@ const ENTITIES: HassEntity[] = [
  createEntity("climate.auto_dry", "auto", undefined, {
    hvac_action: "drying",
  }),
+  createEntity("climate.auto_fan", "auto", undefined, {
+    hvac_action: "fan",
+  }),
  // Cover
  createEntity("cover.closing", "closing"),
  createEntity("cover.closed", "closed"),
@@ -180,8 +184,8 @@ const ENTITIES: HassEntity[] = [
  createEntity("light.off", "off"),
  createEntity("light.on", "on"),
  // Locks
-  createEntity("lock.unlocked", "unlocked"),
  createEntity("lock.locked", "locked"),
+  createEntity("lock.unlocked", "unlocked"),
  createEntity("lock.locking", "locking"),
  createEntity("lock.unlocking", "unlocking"),
  createEntity("lock.jammed", "jammed"),
@@ -205,17 +209,24 @@ const ENTITIES: HassEntity[] = [
  createEntity("media_player.speaker_playing", "playing", "speaker"),
  createEntity("media_player.speaker_paused", "paused", "speaker"),
  createEntity("media_player.speaker_standby", "standby", "speaker"),
+  // Plant
+  createEntity("plant.ok", "ok"),
+  createEntity("plant.problem", "problem"),
  // Remote
  createEntity("remote.off", "off"),
  createEntity("remote.on", "on"),
+  // Schedule
+  createEntity("schedule.off", "off"),
+  createEntity("schedule.on", "on"),
  // Script
  createEntity("script.off", "off"),
  createEntity("script.on", "on"),
  // Sensor
  ...SENSOR_DEVICE_CLASSES.map((dc) => createEntity(`sensor.${dc}`, "10", dc)),
  // Battery sensor
-  ...[0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100].map((value) =>
-    createEntity(`sensor.battery_${value}`, value.toString(), "battery")
+  ...[0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, "unknown", "not_valid"].map(
+    (value) =>
+      createEntity(`sensor.battery_${value}`, value.toString(), "battery")
  ),
  // Siren
  createEntity("siren.off", "off"),
@@ -197,6 +197,7 @@ const createEntityRegistryEntries = (
    platform: "updater",
    has_entity_name: false,
    unique_id: "updater",
+    options: null,
  },
 ];

@@ -15,7 +15,7 @@ class SupervisorFormfieldLabel extends LitElement {
  protected render(): TemplateResult {
    return html`
      ${this.imageUrl
-        ? html`<img loading="lazy" .src=${this.imageUrl} class="icon" />`
+        ? html`<img loading="lazy" alt="" src=${this.imageUrl} class="icon" />`
        : this.iconPath
        ? html`<ha-svg-icon .path=${this.iconPath} class="icon"></ha-svg-icon>`
        : ""}
@@ -138,7 +138,10 @@ export class DialogHassioNetwork
        )}
        ${this._interface?.type === "wireless"
          ? html`
-              <ha-expansion-panel header="Wi-Fi" outlined>
+              <ha-expansion-panel
+                .header=${this.supervisor.localize("dialog.network.wifi")}
+                outlined
+              >
                ${this._interface?.wifi?.ssid
                  ? html`<p>
                      ${this.supervisor.localize(
@@ -177,7 +180,11 @@ export class DialogHassioNetwork
                                >
                                  <span>${ap.ssid}</span>
                                  <span slot="secondary">
-                                    ${ap.mac} - Strength: ${ap.signal}
+                                    ${ap.mac} -
+                                    ${this.supervisor.localize(
+                                      "dialog.network.signal_strength"
+                                    )}:
+                                    ${ap.signal}
                                  </span>
                                </mwc-list-item>
                              `
@@ -241,7 +248,9 @@ export class DialogHassioNetwork
                              class="flex-auto"
                              type="password"
                              id="psk"
-                              label="Password"
+                              .label=${this.supervisor.localize(
+                                "dialog.network.wifi_password"
+                              )}
                              version="wifi"
                              @value-changed=${this
                                ._handleInputValueChangedWifi}
@@ -60,8 +60,8 @@ class HassioIngressView extends LitElement {
    }

    const iframe = html`<iframe
-      .title=${this._addon.name}
-      .src=${this._addon.ingress_url!}
+      title=${this._addon.name}
+      src=${this._addon.ingress_url!}
    >
    </iframe>`;

@@ -24,59 +24,54 @@
  "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
  "license": "Apache-2.0",
  "dependencies": {
-    "@braintree/sanitize-url": "^6.0.0",
-    "@codemirror/autocomplete": "^0.19.12",
-    "@codemirror/commands": "^0.19.8",
-    "@codemirror/gutter": "^0.19.9",
-    "@codemirror/highlight": "^0.19.7",
-    "@codemirror/history": "^0.19.2",
-    "@codemirror/legacy-modes": "^0.19.0",
-    "@codemirror/rectangular-selection": "^0.19.1",
-    "@codemirror/search": "^0.19.6",
-    "@codemirror/state": "^0.19.6",
-    "@codemirror/stream-parser": "^0.19.5",
-    "@codemirror/text": "^0.19.6",
-    "@codemirror/view": "^0.19.40",
-    "@formatjs/intl-datetimeformat": "^4.2.5",
-    "@formatjs/intl-getcanonicallocales": "^1.8.0",
-    "@formatjs/intl-locale": "^2.4.40",
-    "@formatjs/intl-numberformat": "^7.2.5",
-    "@formatjs/intl-pluralrules": "^4.1.5",
-    "@formatjs/intl-relativetimeformat": "^9.3.2",
-    "@fullcalendar/common": "5.9.0",
-    "@fullcalendar/core": "5.9.0",
-    "@fullcalendar/daygrid": "5.9.0",
-    "@fullcalendar/interaction": "5.9.0",
-    "@fullcalendar/list": "5.9.0",
-    "@fullcalendar/timegrid": "5.9.0",
-    "@lit-labs/motion": "^1.0.2",
-    "@lit-labs/virtualizer": "patch:@lit-labs/virtualizer@0.7.0-pre.2#./.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch",
-    "@material/chips": "14.0.0-canary.261f2db59.0",
-    "@material/data-table": "14.0.0-canary.261f2db59.0",
-    "@material/mwc-button": "0.25.3",
-    "@material/mwc-checkbox": "0.25.3",
-    "@material/mwc-circular-progress": "0.25.3",
-    "@material/mwc-dialog": "0.25.3",
-    "@material/mwc-drawer": "^0.25.3",
-    "@material/mwc-fab": "0.25.3",
-    "@material/mwc-formfield": "0.25.3",
-    "@material/mwc-icon-button": "patch:@material/mwc-icon-button@0.25.3#./.yarn/patches/@material/mwc-icon-button/remove-icon.patch",
-    "@material/mwc-linear-progress": "0.25.3",
-    "@material/mwc-list": "^0.25.3",
-    "@material/mwc-menu": "0.25.3",
-    "@material/mwc-radio": "0.25.3",
-    "@material/mwc-ripple": "0.25.3",
-    "@material/mwc-select": "0.25.3",
-    "@material/mwc-slider": "0.25.3",
-    "@material/mwc-switch": "0.25.3",
-    "@material/mwc-tab": "0.25.3",
-    "@material/mwc-tab-bar": "0.25.3",
-    "@material/mwc-textarea": "^0.25.3",
-    "@material/mwc-textfield": "0.25.3",
-    "@material/mwc-top-app-bar-fixed": "^0.25.3",
-    "@material/top-app-bar": "14.0.0-canary.261f2db59.0",
-    "@mdi/js": "7.0.96",
-    "@mdi/svg": "7.0.96",
+    "@braintree/sanitize-url": "^6.0.2",
+    "@codemirror/autocomplete": "^6.4.0",
+    "@codemirror/commands": "^6.2.0",
+    "@codemirror/language": "^6.4.0",
+    "@codemirror/legacy-modes": "^6.3.1",
+    "@codemirror/search": "^6.2.3",
+    "@codemirror/state": "^6.2.0",
+    "@codemirror/view": "^6.8.1",
+    "@formatjs/intl-datetimeformat": "^6.4.3",
+    "@formatjs/intl-getcanonicallocales": "^2.0.5",
+    "@formatjs/intl-locale": "^3.0.11",
+    "@formatjs/intl-numberformat": "^8.3.3",
+    "@formatjs/intl-pluralrules": "^5.1.8",
+    "@formatjs/intl-relativetimeformat": "^11.1.8",
+    "@fullcalendar/core": "^6.1.4",
+    "@fullcalendar/daygrid": "^6.1.4",
+    "@fullcalendar/interaction": "^6.1.4",
+    "@fullcalendar/list": "^6.1.4",
+    "@fullcalendar/timegrid": "^6.1.4",
+    "@lezer/highlight": "^1.1.3",
+    "@lit-labs/motion": "^1.0.3",
+    "@lit-labs/virtualizer": "^1.0.1",
+    "@material/chips": "=14.0.0-canary.53b3cad2f.0",
+    "@material/data-table": "=14.0.0-canary.53b3cad2f.0",
+    "@material/mwc-button": "^0.27.0",
+    "@material/mwc-checkbox": "^0.27.0",
+    "@material/mwc-circular-progress": "^0.27.0",
+    "@material/mwc-dialog": "^0.27.0",
+    "@material/mwc-drawer": "^0.27.0",
+    "@material/mwc-fab": "^0.27.0",
+    "@material/mwc-formfield": "^0.27.0",
+    "@material/mwc-icon-button": "^0.27.0",
+    "@material/mwc-linear-progress": "^0.27.0",
+    "@material/mwc-list": "^0.27.0",
+    "@material/mwc-menu": "^0.27.0",
+    "@material/mwc-radio": "^0.27.0",
+    "@material/mwc-ripple": "^0.27.0",
+    "@material/mwc-select": "^0.27.0",
+    "@material/mwc-slider": "^0.27.0",
+    "@material/mwc-switch": "^0.27.0",
+    "@material/mwc-tab": "^0.27.0",
+    "@material/mwc-tab-bar": "^0.27.0",
+    "@material/mwc-textarea": "^0.27.0",
+    "@material/mwc-textfield": "^0.27.0",
+    "@material/mwc-top-app-bar-fixed": "^0.27.0",
+    "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
+    "@mdi/js": "7.1.96",
+    "@mdi/svg": "7.1.96",
    "@polymer/app-layout": "^3.1.0",
    "@polymer/iron-flex-layout": "^3.0.1",
    "@polymer/iron-icon": "^3.0.1",
@@ -91,175 +86,172 @@
    "@polymer/paper-toast": "^3.0.1",
    "@polymer/paper-tooltip": "^3.0.1",
    "@polymer/polymer": "3.4.1",
-    "@thomasloven/round-slider": "0.5.4",
-    "@vaadin/combo-box": "^23.2.9",
-    "@vaadin/vaadin-themable-mixin": "^23.2.9",
+    "@thomasloven/round-slider": "0.6.0",
+    "@vaadin/combo-box": "^23.3.6",
+    "@vaadin/vaadin-themable-mixin": "^23.3.6",
    "@vibrant/color": "^3.2.1-alpha.1",
    "@vibrant/core": "^3.2.1-alpha.1",
    "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
-    "@vue/web-component-wrapper": "^1.2.0",
-    "@webcomponents/scoped-custom-element-registry": "^0.0.5",
-    "@webcomponents/webcomponentsjs": "^2.2.10",
+    "@vue/web-component-wrapper": "^1.3.0",
+    "@webcomponents/scoped-custom-element-registry": "^0.0.8",
+    "@webcomponents/webcomponentsjs": "^2.7.0",
    "app-datepicker": "^5.1.0",
    "chart.js": "^3.3.2",
-    "comlink": "^4.3.1",
-    "core-js": "^3.15.2",
-    "cropperjs": "^1.5.12",
-    "date-fns": "^2.23.0",
-    "date-fns-tz": "^1.3.7",
+    "comlink": "^4.4.1",
+    "core-js": "^3.27.2",
+    "cropperjs": "^1.5.13",
+    "date-fns": "^2.29.3",
+    "date-fns-tz": "^2.0.0",
    "deep-clone-simple": "^1.1.1",
    "deep-freeze": "^0.0.1",
-    "fuse.js": "^6.0.0",
+    "fuse.js": "^6.6.2",
    "google-timezones-json": "^1.0.2",
    "hammerjs": "^2.0.8",
-    "hls.js": "^1.2.5",
+    "hls.js": "^1.3.3",
    "home-assistant-js-websocket": "^8.0.1",
-    "idb-keyval": "^5.1.3",
-    "intl-messageformat": "^9.9.1",
+    "idb-keyval": "^6.2.0",
+    "intl-messageformat": "^10.3.0",
    "js-yaml": "^4.1.0",
-    "leaflet": "^1.7.1",
+    "leaflet": "^1.9.3",
    "leaflet-draw": "^1.0.4",
-    "lit": "^2.1.2",
-    "marked": "^4.0.12",
-    "memoize-one": "^5.2.1",
+    "lit": "^2.6.1",
+    "marked": "^4.2.12",
+    "memoize-one": "^6.0.0",
    "node-vibrant": "3.2.1-alpha.1",
    "proxy-polyfill": "^0.3.2",
-    "punycode": "^2.1.1",
-    "qr-scanner": "^1.3.0",
-    "qrcode": "^1.4.4",
-    "regenerator-runtime": "^0.13.8",
+    "punycode": "^2.3.0",
+    "qr-scanner": "^1.4.2",
+    "qrcode": "^1.5.1",
+    "regenerator-runtime": "^0.13.11",
    "resize-observer-polyfill": "^1.5.1",
    "roboto-fontface": "^0.10.0",
    "rrule": "^2.7.1",
-    "sortablejs": "^1.14.0",
-    "superstruct": "^0.15.2",
-    "tinykeys": "^1.1.3",
-    "tsparticles": "^1.34.0",
-    "unfetch": "^4.1.0",
-    "vis-data": "^7.1.2",
+    "sortablejs": "^1.15.0",
+    "superstruct": "^1.0.3",
+    "tinykeys": "^1.4.0",
+    "tsparticles-engine": "^2.8.0",
+    "tsparticles-preset-links": "^2.8.0",
+    "unfetch": "^5.0.0",
+    "vis-data": "^7.1.4",
    "vis-network": "^8.5.4",
    "vue": "^2.6.12",
    "vue2-daterange-picker": "^0.5.1",
    "weekstart": "^1.1.0",
-    "workbox-cacheable-response": "^6.4.2",
-    "workbox-core": "^6.4.2",
-    "workbox-expiration": "^6.4.2",
-    "workbox-precaching": "^6.4.2",
-    "workbox-routing": "^6.4.2",
-    "workbox-strategies": "^6.4.2",
-    "xss": "^1.0.9"
+    "workbox-cacheable-response": "^6.5.4",
+    "workbox-core": "^6.5.4",
+    "workbox-expiration": "^6.5.4",
+    "workbox-precaching": "^6.5.4",
+    "workbox-routing": "^6.5.4",
+    "workbox-strategies": "^6.5.4",
+    "xss": "^1.0.14"
  },
  "devDependencies": {
-    "@babel/core": "^7.20.2",
+    "@babel/core": "^7.20.12",
    "@babel/plugin-external-helpers": "^7.18.6",
    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.2",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.20.7",
    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
    "@babel/plugin-syntax-import-meta": "^7.10.4",
    "@babel/plugin-syntax-top-level-await": "^7.14.5",
    "@babel/preset-env": "^7.20.2",
    "@babel/preset-typescript": "^7.18.6",
-    "@koa/cors": "^3.1.0",
-    "@octokit/auth-oauth-device": "^4.0.2",
-    "@octokit/rest": "^19.0.4",
-    "@open-wc/dev-server-hmr": "^0.0.2",
+    "@koa/cors": "^4.0.0",
+    "@octokit/auth-oauth-device": "^4.0.4",
+    "@octokit/rest": "^19.0.7",
+    "@open-wc/dev-server-hmr": "^0.1.3",
    "@rollup/plugin-babel": "^5.2.1",
    "@rollup/plugin-commonjs": "^11.1.0",
    "@rollup/plugin-json": "^4.0.3",
    "@rollup/plugin-node-resolve": "^7.1.3",
    "@rollup/plugin-replace": "^2.3.2",
    "@types/chromecast-caf-receiver": "5.0.12",
-    "@types/chromecast-caf-sender": "^1.0.3",
-    "@types/glob": "^7",
+    "@types/chromecast-caf-sender": "^1.0.5",
+    "@types/glob": "^8",
    "@types/hammerjs": "^2.0.41",
    "@types/js-yaml": "^4",
    "@types/leaflet": "^1",
    "@types/leaflet-draw": "^1",
    "@types/marked": "^4",
    "@types/mocha": "^8",
-    "@types/qrcode": "^1.4.2",
+    "@types/qrcode": "^1.5.0",
    "@types/sortablejs": "^1",
    "@types/tar": "^6",
    "@types/webspeechapi": "^0.0.29",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.44.0",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.49.0",
    "@web/dev-server": "^0.0.24",
    "@web/dev-server-rollup": "^0.2.11",
-    "babel-loader": "^9.1.0",
-    "chai": "^4.3.4",
-    "del": "^4.0.0",
+    "babel-loader": "^9.1.2",
+    "chai": "^4.3.7",
+    "del": "^7.0.0",
    "eslint": "^7.32.0",
    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-airbnb-typescript": "^14.0.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-webpack": "^0.13.1",
-    "eslint-plugin-disable": "^2.0.1",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-lit": "^1.6.1",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-import-resolver-webpack": "^0.13.2",
+    "eslint-plugin-disable": "^2.0.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-lit": "^1.8.2",
+    "eslint-plugin-lit-a11y": "^2.3.0",
    "eslint-plugin-unused-imports": "^1.1.5",
-    "eslint-plugin-wc": "^1.3.2",
+    "eslint-plugin-wc": "^1.4.0",
    "fancy-log": "^2.0.0",
-    "fs-extra": "^7.0.1",
-    "glob": "^7.2.0",
+    "fs-extra": "^11.1.0",
+    "glob": "^8.1.0",
    "gulp": "^4.0.2",
    "gulp-flatmap": "^1.0.2",
-    "gulp-json-transform": "^0.4.6",
-    "gulp-merge-json": "^1.3.1",
+    "gulp-json-transform": "^0.4.8",
+    "gulp-merge-json": "^2.1.2",
    "gulp-rename": "^2.0.0",
-    "gulp-zopfli-green": "^3.0.1",
+    "gulp-zopfli-green": "^6.0.1",
    "html-minifier": "^4.0.0",
-    "husky": "^8.0.1",
-    "instant-mocha": "^1.3.1",
+    "husky": "^8.0.3",
+    "instant-mocha": "^1.5.0",
    "jszip": "^3.10.1",
-    "lint-staged": "^13.0.3",
+    "lint-staged": "^13.1.1",
    "lit-analyzer": "^1.2.1",
    "lodash.template": "^4.5.0",
    "magic-string": "^0.25.7",
    "map-stream": "^0.0.7",
-    "merge-stream": "^1.0.1",
+    "merge-stream": "^2.0.0",
    "mocha": "^8.4.0",
-    "object-hash": "^2.0.3",
-    "open": "^7.0.4",
+    "object-hash": "^3.0.0",
+    "open": "^8.4.0",
    "pinst": "^3.0.0",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.3",
    "require-dir": "^1.2.0",
    "rollup": "^2.8.2",
    "rollup-plugin-string": "^3.0.0",
    "rollup-plugin-terser": "^5.3.0",
-    "rollup-plugin-visualizer": "^4.0.4",
+    "rollup-plugin-visualizer": "^5.9.0",
    "serve": "^11.3.2",
-    "sinon": "^11.0.0",
-    "source-map-url": "^0.4.0",
-    "systemjs": "^6.3.2",
-    "tar": "^6.1.11",
+    "sinon": "^15.0.1",
+    "source-map-url": "^0.4.1",
+    "systemjs": "^6.13.0",
+    "tar": "^6.1.13",
    "terser-webpack-plugin": "^5.2.4",
    "ts-lit-plugin": "^1.2.1",
-    "typescript": "^4.9.3",
+    "typescript": "^4.9.5",
    "vinyl-buffer": "^1.0.1",
    "vinyl-source-stream": "^2.0.0",
    "webpack": "^5.55.1",
-    "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.3.0",
-    "webpack-manifest-plugin": "^4.0.2",
-    "webpackbar": "^5.0.0-3",
-    "workbox-build": "^6.4.2"
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.11.1",
+    "webpack-manifest-plugin": "^5.0.0",
+    "webpackbar": "^5.0.2",
+    "workbox-build": "^6.5.4"
  },
  "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
  "resolutions": {
-    "@polymer/polymer": "patch:@polymer/polymer@3.4.1#./.yarn/patches/@polymer/polymer/pr-5569.patch",
-    "@webcomponents/webcomponentsjs": "^2.2.10",
-    "lit": "^2.1.2",
-    "lit-html": "2.1.2",
-    "lit-element": "3.1.2",
-    "@lit/reactive-element": "1.2.1"
+    "@polymer/polymer": "patch:@polymer/polymer@3.4.1#./.yarn/patches/@polymer/polymer/pr-5569.patch"
  },
  "main": "src/home-assistant.js",
  "prettier": {
    "trailingComma": "es5",
    "arrowParens": "always"
  },
-  "packageManager": "yarn@3.2.3"
+  "packageManager": "yarn@3.3.1"
 }
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name         = "home-assistant-frontend"
-version      = "20230102.0"
+version      = "20230202.0"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"
@@ -19,7 +19,9 @@ export const THEME_COLORS = new Set([
  "orange",
  "deep-orange",
  "brown",
+  "light-grey",
  "grey",
+  "dark-grey",
  "blue-grey",
  "black",
  "white",
@@ -27,7 +29,7 @@ export const THEME_COLORS = new Set([

 export function computeCssColor(color: string): string {
  if (THEME_COLORS.has(color)) {
-    return `rgb(var(--rgb-${color}-color))`;
+    return `var(--${color}-color)`;
  }
  return color;
 }
@@ -22,3 +22,11 @@ export const atLeastVersion = (
      Number(haPatch) >= patch)
  );
 };
+
+export const isDevVersion = (version: string): boolean => {
+  if (__DEMO__) {
+    return false;
+  }
+
+  return version.includes("dev");
+};
@@ -201,6 +201,7 @@ export const DOMAINS_WITH_CARD = [
 export const SENSOR_ENTITIES = [
  "sensor",
  "binary_sensor",
+  "calendar",
  "camera",
  "device_tracker",
  "weather",
@@ -1,6 +1,12 @@
 import { getWeekStartByLocale } from "weekstart";
 import { FrontendLocaleData, FirstWeekday } from "../../data/translation";

+import { polyfillsLoaded } from "../translations/localize";
+
+if (__BUILD__ === "latest" && polyfillsLoaded) {
+  await polyfillsLoaded;
+}
+
 export const weekdays = [
  "sunday",
  "monday",
@@ -18,7 +18,7 @@ export const relativeTime = (
  to?: Date,
  includeTense = true
 ): string => {
-  const diff = selectUnit(from, to);
+  const diff = selectUnit(from, to, locale);
  if (includeTense) {
    return formatRelTimeMem(locale).format(diff.value, diff.unit);
  }
@@ -39,5 +39,5 @@ export default function scrollToTarget(element, target) {
      );
      requestAnimationFrame(updateFrame.bind(element));
    }
-  }.call(element));
+  }).call(element);
 }
@@ -11,8 +11,7 @@ export const setupLeafletMap = async (
    throw new Error("Cannot setup Leaflet map on disconnected element");
  }
  // eslint-disable-next-line
-  const Leaflet = ((await import("leaflet")) as any)
-    .default as LeafletModuleType;
+  const Leaflet = (await import("leaflet")).default as LeafletModuleType;
  Leaflet.Icon.Default.imagePath = "/static/images/leaflet/images/";

  const map = Leaflet.map(mapElement);
@@ -1,21 +0,0 @@
-export const alarmControlPanelColor = (state?: string): string | undefined => {
-  switch (state) {
-    case "armed_away":
-    case "armed_vacation":
-    case "armed_home":
-    case "armed_night":
-    case "armed_custom_bypass":
-      return "alarm-armed";
-    case "pending":
-      return "alarm-pending";
-    case "arming":
-    case "disarming":
-      return "alarm-arming";
-    case "triggered":
-      return "alarm-triggered";
-    case "disarmed":
-      return "alarm-disarmed";
-    default:
-      return undefined;
-  }
-};
@@ -1,10 +0,0 @@
-export const alertColor = (state?: string): string | undefined => {
-  switch (state) {
-    case "on":
-      return "alert";
-    case "off":
-      return "alert-off";
-    default:
-      return undefined;
-  }
-};
@@ -1,13 +1,15 @@
-export const batteryStateColor = (state: string) => {
+export const batteryStateColorProperty = (
+  state: string
+): string | undefined => {
  const value = Number(state);
  if (isNaN(value)) {
    return undefined;
  }
  if (value >= 70) {
-    return "sensor-battery-high";
+    return "--state-sensor-battery-high-color";
  }
  if (value >= 30) {
-    return "sensor-battery-medium";
+    return "--state-sensor-battery-medium-color";
  }
-  return "sensor-battery-low";
+  return "--state-sensor-battery-low-color";
 };
@@ -1,29 +0,0 @@
-import { HassEntity } from "home-assistant-js-websocket";
-import { stateActive } from "../state_active";
-
-const ALERTING_DEVICE_CLASSES = new Set([
-  "battery",
-  "carbon_monoxide",
-  "gas",
-  "heat",
-  "lock",
-  "moisture",
-  "problem",
-  "safety",
-  "smoke",
-  "tamper",
-]);
-
-export const binarySensorColor = (
-  stateObj: HassEntity,
-  state: string
-): string | undefined => {
-  const deviceClass = stateObj?.attributes.device_class;
-
-  if (!stateActive(stateObj, state)) {
-    return undefined;
-  }
-  return deviceClass && ALERTING_DEVICE_CLASSES.has(deviceClass)
-    ? "binary-sensor-alerting"
-    : "binary-sensor";
-};
@@ -1,29 +0,0 @@
-import { HvacAction } from "../../../data/climate";
-
-export const CLIMATE_HVAC_ACTION_COLORS: Record<HvacAction, string> = {
-  cooling: "var(--rgb-state-climate-cool-color)",
-  drying: "var(--rgb-state-climate-dry-color)",
-  fan: "var(--rgb-state-climate-fan-only-color)",
-  heating: "var(--rgb-state-climate-heat-color)",
-  idle: "var(--rgb-state-climate-idle-color)",
-  off: "var(--rgb-state-climate-off-color)",
-};
-
-export const climateColor = (state: string): string | undefined => {
-  switch (state) {
-    case "auto":
-      return "climate-auto";
-    case "cool":
-      return "climate-cool";
-    case "dry":
-      return "climate-dry";
-    case "fan_only":
-      return "climate-fan-only";
-    case "heat":
-      return "climate-heat";
-    case "heat_cool":
-      return "climate-heat-cool";
-    default:
-      return undefined;
-  }
-};
@@ -1,15 +0,0 @@
-export const lockColor = (state?: string): string | undefined => {
-  switch (state) {
-    case "unlocked":
-      return "lock-unlocked";
-    case "locked":
-      return "lock-locked";
-    case "jammed":
-      return "lock-jammed";
-    case "locking":
-    case "unlocking":
-      return "lock-pending";
-    default:
-      return undefined;
-  }
-};
@@ -1,10 +0,0 @@
-export const personColor = (state: string): string | undefined => {
-  switch (state) {
-    case "home":
-      return "person-home";
-    case "not_home":
-      return "person-not-home";
-    default:
-      return "person-zone";
-  }
-};
@@ -1,15 +0,0 @@
-import { HassEntity } from "home-assistant-js-websocket";
-import { batteryStateColor } from "./battery_color";
-
-export const sensorColor = (
-  stateObj: HassEntity,
-  state: string
-): string | undefined => {
-  const deviceClass = stateObj?.attributes.device_class;
-
-  if (deviceClass === "battery") {
-    return batteryStateColor(state);
-  }
-
-  return undefined;
-};
@@ -1,15 +0,0 @@
-import { HassEntity } from "home-assistant-js-websocket";
-import { UpdateEntity, updateIsInstalling } from "../../../data/update";
-import { stateActive } from "../state_active";
-
-export const updateColor = (
-  stateObj: HassEntity,
-  state: string
-): string | undefined => {
-  if (!stateActive(stateObj, state)) {
-    return undefined;
-  }
-  return updateIsInstalling(stateObj as UpdateEntity)
-    ? "update-installing"
-    : "update";
-};
@@ -49,6 +49,8 @@ export const computeStateDisplayFromEntityAttributes = (
    return localize(`state.default.${state}`);
  }

+  const entity = entities[entityId] as EntityRegistryEntry | undefined;
+
  // Entities with a `unit_of_measurement` or `state_class` are numeric values and should use `formatNumber`
  if (isNumericFromAttributes(attributes)) {
    // state is duration
@@ -82,7 +84,7 @@ export const computeStateDisplayFromEntityAttributes = (
    return `${formatNumber(
      state,
      locale,
-      getNumberFormatOptions({ state, attributes } as HassEntity)
+      getNumberFormatOptions({ state, attributes } as HassEntity, entity)
    )}${unit}`;
  }

@@ -160,7 +162,7 @@ export const computeStateDisplayFromEntityAttributes = (
    return formatNumber(
      state,
      locale,
-      getNumberFormatOptions({ state, attributes } as HassEntity)
+      getNumberFormatOptions({ state, attributes } as HassEntity, entity)
    );
  }

@@ -199,8 +201,6 @@ export const computeStateDisplayFromEntityAttributes = (
      : localize("ui.card.update.up_to_date");
  }

-  const entity = entities[entityId] as EntityRegistryEntry | undefined;
-
  return (
    (entity?.translation_key &&
      localize(
@@ -3,6 +3,8 @@ import {
  mdiAccountArrowRight,
  mdiAirHumidifier,
  mdiAirHumidifierOff,
+  mdiAudioVideo,
+  mdiAudioVideoOff,
  mdiBluetooth,
  mdiBluetoothConnect,
  mdiCalendar,
@@ -25,8 +27,6 @@ import {
  mdiPackageUp,
  mdiPowerPlug,
  mdiPowerPlugOff,
-  mdiAudioVideo,
-  mdiAudioVideoOff,
  mdiRestart,
  mdiSpeaker,
  mdiSpeakerOff,
@@ -53,6 +53,7 @@ import { DEFAULT_DOMAIN_ICON, FIXED_DOMAIN_ICONS } from "../const";
 import { alarmPanelIcon } from "./alarm_panel_icon";
 import { binarySensorIcon } from "./binary_sensor_icon";
 import { coverIcon } from "./cover_icon";
+import { numberIcon } from "./number_icon";
 import { sensorIcon } from "./sensor_icon";

 export const domainIcon = (
@@ -108,7 +109,7 @@ export const domainIconWithoutDefault = (
      return compareState === "not_home" ? mdiAccountArrowRight : mdiAccount;

    case "humidifier":
-      return state && state === "off" ? mdiAirHumidifierOff : mdiAirHumidifier;
+      return compareState === "off" ? mdiAirHumidifierOff : mdiAirHumidifier;

    case "input_boolean":
      return compareState === "on"
@@ -180,6 +181,15 @@ export const domainIconWithoutDefault = (
          }
      }

+    case "number": {
+      const icon = numberIcon(stateObj);
+      if (icon) {
+        return icon;
+      }
+
+      break;
+    }
+
    case "person":
      return compareState === "not_home" ? mdiAccountArrowRight : mdiAccount;

@@ -0,0 +1,13 @@
+/** Return an icon representing a number state. */
+import { HassEntity } from "home-assistant-js-websocket";
+import { FIXED_DEVICE_CLASS_ICONS } from "../const";
+
+export const numberIcon = (stateObj?: HassEntity): string | undefined => {
+  const dclass = stateObj?.attributes.device_class;
+
+  if (dclass && dclass in FIXED_DEVICE_CLASS_ICONS) {
+    return FIXED_DEVICE_CLASS_ICONS[dclass];
+  }
+
+  return undefined;
+};
@@ -1,94 +1,102 @@
 /** Return an color representing a state. */
 import { HassEntity } from "home-assistant-js-websocket";
 import { UNAVAILABLE } from "../../data/entity";
-import { alarmControlPanelColor } from "./color/alarm_control_panel_color";
-import { alertColor } from "./color/alert_color";
-import { binarySensorColor } from "./color/binary_sensor_color";
-import { climateColor } from "./color/climate_color";
-import { lockColor } from "./color/lock_color";
-import { personColor } from "./color/person_color";
-import { sensorColor } from "./color/sensor_color";
-import { updateColor } from "./color/update_color";
+import { computeCssVariable } from "../../resources/css-variables";
+import { slugify } from "../string/slugify";
+import { batteryStateColorProperty } from "./color/battery_color";
 import { computeDomain } from "./compute_domain";
 import { stateActive } from "./state_active";

-const STATIC_ACTIVE_COLORED_DOMAIN = new Set([
+const STATE_COLORED_DOMAIN = new Set([
+  "alarm_control_panel",
+  "alert",
  "automation",
+  "binary_sensor",
  "calendar",
  "camera",
+  "climate",
  "cover",
+  "device_tracker",
  "fan",
  "group",
  "humidifier",
  "input_boolean",
  "light",
+  "lock",
  "media_player",
+  "person",
+  "plant",
  "remote",
+  "schedule",
  "script",
  "siren",
+  "sun",
  "switch",
  "timer",
+  "update",
  "vacuum",
 ]);

 export const stateColorCss = (stateObj: HassEntity, state?: string) => {
  const compareState = state !== undefined ? state : stateObj?.state;
  if (compareState === UNAVAILABLE) {
-    return `var(--rgb-state-unavailable-color)`;
+    return `var(--state-unavailable-color)`;
  }

-  const domainColor = stateColor(stateObj, state);
-
-  if (domainColor) {
-    return `var(--rgb-state-${domainColor}-color)`;
-  }
-
-  if (!stateActive(stateObj, state)) {
-    return `var(--rgb-state-inactive-color)`;
+  const properties = stateColorProperties(stateObj, state);
+  if (properties) {
+    return computeCssVariable(properties);
  }

  return undefined;
 };

-export const stateColor = (stateObj: HassEntity, state?: string) => {
+export const domainStateColorProperties = (
+  stateObj: HassEntity,
+  state?: string
+): string[] => {
+  const compareState = state !== undefined ? state : stateObj.state;
+  const domain = computeDomain(stateObj.entity_id);
+  const active = stateActive(stateObj, state);
+
+  const properties: string[] = [];
+
+  const stateKey = slugify(compareState, "_");
+  const activeKey = active ? "active" : "inactive";
+
+  const dc = stateObj.attributes.device_class;
+
+  if (dc) {
+    properties.push(`--state-${domain}-${dc}-${stateKey}-color`);
+  }
+
+  properties.push(
+    `--state-${domain}-${stateKey}-color`,
+    `--state-${domain}-${activeKey}-color`,
+    `--state-${activeKey}-color`
+  );
+
+  return properties;
+};
+
+export const stateColorProperties = (
+  stateObj: HassEntity,
+  state?: string
+): string[] | undefined => {
  const compareState = state !== undefined ? state : stateObj?.state;
  const domain = computeDomain(stateObj.entity_id);
+  const dc = stateObj.attributes.device_class;

-  if (
-    STATIC_ACTIVE_COLORED_DOMAIN.has(domain) &&
-    stateActive(stateObj, state)
-  ) {
-    return domain.replace("_", "-");
+  // Special rules for battery coloring
+  if (domain === "sensor" && dc === "battery") {
+    const property = batteryStateColorProperty(compareState);
+    if (property) {
+      return [property];
+    }
  }

-  switch (domain) {
-    case "alarm_control_panel":
-      return alarmControlPanelColor(compareState);
-
-    case "alert":
-      return alertColor(compareState);
-
-    case "binary_sensor":
-      return binarySensorColor(stateObj, compareState);
-
-    case "climate":
-      return climateColor(compareState);
-
-    case "lock":
-      return lockColor(compareState);
-
-    case "person":
-    case "device_tracker":
-      return personColor(compareState);
-
-    case "sensor":
-      return sensorColor(stateObj, compareState);
-
-    case "sun":
-      return compareState === "above_horizon" ? "sun-day" : "sun-night";
-
-    case "update":
-      return updateColor(stateObj, compareState);
+  if (STATE_COLORED_DOMAIN.has(domain)) {
+    return domainStateColorProperties(stateObj, state);
  }

  return undefined;
@@ -4,12 +4,15 @@ import { domainToName } from "../../data/integration";
 import { getIntegrationDescriptions } from "../../data/integrations";
 import { showConfigFlowDialog } from "../../dialogs/config-flow/show-dialog-config-flow";
 import { showConfirmationDialog } from "../../dialogs/generic/show-dialog-box";
+import { showMatterAddDeviceDialog } from "../../panels/config/integrations/integration-panels/matter/show-dialog-add-matter-device";
 import { showZWaveJSAddNodeDialog } from "../../panels/config/integrations/integration-panels/zwave_js/show-dialog-zwave_js-add-node";
 import type { HomeAssistant } from "../../types";
 import { documentationUrl } from "../../util/documentation-url";
 import { isComponentLoaded } from "../config/is_component_loaded";
 import { navigate } from "../navigate";

+export const PROTOCOL_INTEGRATIONS = ["zha", "zwave_js", "matter"] as const;
+
 export const protocolIntegrationPicked = async (
  element: HTMLElement,
  hass: HomeAssistant,
@@ -113,5 +116,43 @@ export const protocolIntegrationPicked = async (
    }

    navigate("/config/zha/add");
+  } else if (domain === "matter") {
+    const entries = await getConfigEntries(hass, {
+      domain,
+    });
+    if (!isComponentLoaded(hass, domain) || !entries.length) {
+      // If the component isn't loaded, ask them to load the integration first
+      showConfirmationDialog(element, {
+        title: hass.localize(
+          "ui.panel.config.integrations.config_flow.missing_zwave_zigbee_title",
+          { integration: "Matter" }
+        ),
+        text: hass.localize(
+          "ui.panel.config.integrations.config_flow.missing_matter",
+          {
+            integration: "Matter",
+            brand: options?.brand || options?.domain || "Matter",
+            supported_hardware_link: html`<a
+              href=${documentationUrl(hass, "/integrations/matter")}
+              target="_blank"
+              rel="noreferrer"
+              >${hass.localize(
+                "ui.panel.config.integrations.config_flow.supported_hardware"
+              )}</a
+            >`,
+          }
+        ),
+        confirmText: hass.localize(
+          "ui.panel.config.integrations.config_flow.proceed"
+        ),
+        confirm: () => {
+          showConfigFlowDialog(element, {
+            startFlowHandler: "matter",
+          });
+        },
+      });
+      return;
+    }
+    showMatterAddDeviceDialog(element);
  }
 };
@@ -2,6 +2,7 @@ import {
  HassEntity,
  HassEntityAttributeBase,
 } from "home-assistant-js-websocket";
+import { EntityRegistryEntry } from "../../data/entity_registry";
 import { FrontendLocaleData, NumberFormat } from "../../data/translation";
 import { round } from "./round";

@@ -90,8 +91,18 @@ export const formatNumber = (
 * @returns An `Intl.NumberFormatOptions` object with `maximumFractionDigits` set to 0, or `undefined`
 */
 export const getNumberFormatOptions = (
-  entityState: HassEntity
+  entityState: HassEntity,
+  entity?: EntityRegistryEntry
 ): Intl.NumberFormatOptions | undefined => {
+  const precision =
+    entity?.options?.sensor?.display_precision ??
+    entity?.options?.sensor?.suggested_display_precision;
+  if (precision != null) {
+    return {
+      maximumFractionDigits: precision,
+      minimumFractionDigits: precision,
+    };
+  }
  if (
    Number.isInteger(Number(entityState.attributes?.step)) &&
    Number.isInteger(Number(entityState.state))
@@ -22,6 +22,6 @@ export const iconColorCSS = css`

  /* Color the icon if unavailable */
  ha-state-icon[data-state="unavailable"] {
-    color: rgb(var(--rgb-state-unavailable-color));
+    color: var(--state-unavailable-color);
  }
 `;
@@ -29,11 +29,9 @@ export type LocalizeKeys =
  | `ui.panel.config.devices.${string}`
  | `ui.panel.config.energy.${string}`
  | `ui.panel.config.info.${string}`
-  | `ui.panel.config.logs.${string}`
  | `ui.panel.config.lovelace.${string}`
  | `ui.panel.config.network.${string}`
  | `ui.panel.config.scene.${string}`
-  | `ui.panel.config.url.${string}`
  | `ui.panel.config.zha.${string}`
  | `ui.panel.config.zwave_js.${string}`
  | `ui.panel.lovelace.card.${string}`
@@ -67,19 +65,21 @@ export interface FormatsType {

 const loadedPolyfillLocale = new Set();

+const locale = getLocalLanguage();
+
 const polyfills: Promise<any>[] = [];
 if (__BUILD__ === "latest") {
  if (shouldPolyfillLocale()) {
-    polyfills.push(import("@formatjs/intl-locale/polyfill"));
+    await import("@formatjs/intl-locale/polyfill");
  }
-  if (shouldPolyfillPluralRules()) {
+  if (shouldPolyfillPluralRules(locale)) {
    polyfills.push(import("@formatjs/intl-pluralrules/polyfill"));
    polyfills.push(import("@formatjs/intl-pluralrules/locale-data/en"));
  }
-  if (shouldPolyfillRelativeTime()) {
+  if (shouldPolyfillRelativeTime(locale)) {
    polyfills.push(import("@formatjs/intl-relativetimeformat/polyfill"));
  }
-  if (shouldPolyfillDateTime()) {
+  if (shouldPolyfillDateTime(locale)) {
    polyfills.push(import("@formatjs/intl-datetimeformat/polyfill"));
    polyfills.push(import("@formatjs/intl-datetimeformat/add-all-tz"));
  }
@@ -90,7 +90,7 @@ export const polyfillsLoaded =
    ? undefined
    : Promise.all(polyfills).then(() =>
        // Load the default language
-        loadPolyfillLocales(getLocalLanguage())
+        loadPolyfillLocales(locale)
      );

 /**
@@ -216,7 +216,7 @@ export const loadPolyfillLocales = async (language: string) => {
      // @ts-ignore
      Intl.DateTimeFormat.__addLocaleData(await result.json());
    }
-  } catch (_e) {
+  } catch (e) {
    // Ignore
  }
 };
@@ -1,3 +1,7 @@
+import { differenceInDays, differenceInWeeks, startOfWeek } from "date-fns/esm";
+import { FrontendLocaleData } from "../../data/translation";
+import { firstWeekdayIndex } from "../datetime/first_weekday";
+
 export type Unit =
  | "second"
  | "minute"
@@ -11,13 +15,13 @@ export type Unit =
 const MS_PER_SECOND = 1e3;
 const SECS_PER_MIN = 60;
 const SECS_PER_HOUR = SECS_PER_MIN * 60;
-const SECS_PER_DAY = SECS_PER_HOUR * 24;
-const SECS_PER_WEEK = SECS_PER_DAY * 7;

 // Adapted from https://github.com/formatjs/formatjs/blob/186cef62f980ec66252ee232f438a42d0b51b9f9/packages/intl-utils/src/diff.ts
 export function selectUnit(
  from: Date | number,
+  // eslint-disable-next-line @typescript-eslint/default-param-last
  to: Date | number = Date.now(),
+  locale: FrontendLocaleData,
  thresholds: Partial<Thresholds> = {}
 ): { value: number; unit: Unit } {
  const resolvedThresholds: Thresholds = {
@@ -49,29 +53,56 @@ export function selectUnit(
    };
  }

-  const days = secs / SECS_PER_DAY;
+  const fromDate = new Date(from);
+  const toDate = new Date(to);
+
+  // Set time component to zero, which allows us to compare only the days
+  fromDate.setHours(0, 0, 0, 0);
+  toDate.setHours(0, 0, 0, 0);
+
+  const days = differenceInDays(fromDate, toDate);
+  if (days === 0) {
+    return {
+      value: Math.round(hours),
+      unit: "hour",
+    };
+  }
  if (Math.abs(days) < resolvedThresholds.day) {
    return {
-      value: Math.round(days),
+      value: days,
      unit: "day",
    };
  }

-  const weeks = secs / SECS_PER_WEEK;
+  const firstWeekday = firstWeekdayIndex(locale);
+  const fromWeek = startOfWeek(fromDate, { weekStartsOn: firstWeekday });
+  const toWeek = startOfWeek(toDate, { weekStartsOn: firstWeekday });
+
+  const weeks = differenceInWeeks(fromWeek, toWeek);
+  if (weeks === 0) {
+    return {
+      value: days,
+      unit: "day",
+    };
+  }
  if (Math.abs(weeks) < resolvedThresholds.week) {
    return {
-      value: Math.round(weeks),
+      value: weeks,
      unit: "week",
    };
  }

-  const fromDate = new Date(from);
-  const toDate = new Date(to);
  const years = fromDate.getFullYear() - toDate.getFullYear();
  const months = years * 12 + fromDate.getMonth() - toDate.getMonth();
-  if (Math.round(Math.abs(months)) < resolvedThresholds.month) {
+  if (months === 0) {
    return {
-      value: Math.round(months),
+      value: weeks,
+      unit: "week",
+    };
+  }
+  if (Math.abs(months) < resolvedThresholds.month || years === 0) {
+    return {
+      value: months,
      unit: "month",
    };
  }
@@ -10,6 +10,8 @@ import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { clamp } from "../../common/number/clamp";
+import { computeRTL } from "../../common/util/compute_rtl";
+import { HomeAssistant } from "../../types";

 export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;

@@ -22,6 +24,8 @@ interface Tooltip extends TooltipModel<any> {
 export default class HaChartBase extends LitElement {
  public chart?: Chart;

+  @property({ attribute: false }) public hass!: HomeAssistant;
+
  @property({ attribute: "chart-type", reflect: true })
  public chartType: ChartType = "line";

@@ -33,6 +37,8 @@ export default class HaChartBase extends LitElement {

  @property({ type: Number }) public height?: number;

+  @property({ type: Number }) public paddingYAxis = 0;
+
  @state() private _chartHeight?: number;

  @state() private _tooltip?: Tooltip;
@@ -128,6 +134,8 @@ export default class HaChartBase extends LitElement {
        style=${styleMap({
          height: `${this.height ?? this._chartHeight}px`,
          overflow: this._chartHeight ? "initial" : "hidden",
+          "padding-left": `${computeRTL(this.hass) ? 0 : this.paddingYAxis}px`,
+          "padding-right": `${computeRTL(this.hass) ? this.paddingYAxis : 0}px`,
        })}
      >
        <canvas></canvas>
@@ -2,6 +2,8 @@ import type { ChartData, ChartDataset, ChartOptions } from "chart.js";
 import { html, LitElement, PropertyValues } from "lit";
 import { property, state } from "lit/decorators";
 import { getGraphColorByIndex } from "../../common/color/colors";
+import { fireEvent } from "../../common/dom/fire_event";
+import { computeRTL } from "../../common/util/compute_rtl";
 import {
  formatNumber,
  numberFormatToLocale,
@@ -20,7 +22,7 @@ class StateHistoryChartLine extends LitElement {

  @property({ attribute: false }) public data: LineChartEntity[] = [];

-  @property() public names: boolean | Record<string, string> = false;
+  @property() public names?: Record<string, string>;

  @property() public unit?: string;

@@ -30,17 +32,25 @@ class StateHistoryChartLine extends LitElement {

  @property({ attribute: false }) public endTime!: Date;

+  @property({ type: Number }) public paddingYAxis = 0;
+
+  @property({ type: Number }) public chartIndex?;
+
  @state() private _chartData?: ChartData<"line">;

  @state() private _chartOptions?: ChartOptions;

+  @state() private _yWidth = 0;
+
  private _chartTime: Date = new Date();

  protected render() {
    return html`
      <ha-chart-base
+        .hass=${this.hass}
        .data=${this._chartData}
        .options=${this._chartOptions}
+        .paddingYAxis=${this.paddingYAxis - this._yWidth}
        chart-type="line"
      ></ha-chart-base>
    `;
@@ -84,6 +94,16 @@ class StateHistoryChartLine extends LitElement {
              display: true,
              text: this.unit,
            },
+            afterUpdate: (y) => {
+              if (this._yWidth !== Math.floor(y.width)) {
+                this._yWidth = Math.floor(y.width);
+                fireEvent(this, "y-width-changed", {
+                  value: this._yWidth,
+                  chartIndex: this.chartIndex,
+                });
+              }
+            },
+            position: computeRTL(this.hass) ? "right" : "left",
          },
        },
        plugins: {
@@ -2,6 +2,7 @@ import type { ChartData, ChartDataset, ChartOptions } from "chart.js";
 import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
+import { fireEvent } from "../../common/dom/fire_event";
 import { numberFormatToLocale } from "../../common/number/format_number";
 import { computeRTL } from "../../common/util/compute_rtl";
 import { TimelineEntity } from "../../data/history";
@@ -18,7 +19,7 @@ export class StateHistoryChartTimeline extends LitElement {

  @property() public narrow!: boolean;

-  @property() public names: boolean | Record<string, string> = false;
+  @property() public names?: Record<string, string>;

  @property() public unit?: string;

@@ -32,18 +33,26 @@ export class StateHistoryChartTimeline extends LitElement {

  @property({ attribute: false }) public endTime!: Date;

+  @property({ type: Number }) public paddingYAxis = 0;
+
+  @property({ type: Number }) public chartIndex?;
+
  @state() private _chartData?: ChartData<"timeline">;

  @state() private _chartOptions?: ChartOptions<"timeline">;

+  @state() private _yWidth = 0;
+
  private _chartTime: Date = new Date();

  protected render() {
    return html`
      <ha-chart-base
+        .hass=${this.hass}
        .data=${this._chartData}
        .options=${this._chartOptions}
        .height=${this.data.length * 30 + 30}
+        .paddingYAxis=${this.paddingYAxis - this._yWidth}
        chart-type="timeline"
      ></ha-chart-base>
    `;
@@ -55,6 +64,8 @@ export class StateHistoryChartTimeline extends LitElement {
    }

    if (
+      changedProps.has("startTime") ||
+      changedProps.has("endTime") ||
      changedProps.has("data") ||
      this._chartTime <
        new Date(this.endTime.getTime() - MIN_TIME_BETWEEN_UPDATES)
@@ -131,6 +142,15 @@ export class StateHistoryChartTimeline extends LitElement {
              scaleInstance.width = narrow ? 105 : 185;
            }
          },
+          afterUpdate: (y) => {
+            if (this._yWidth !== Math.floor(y.width)) {
+              this._yWidth = Math.floor(y.width);
+              fireEvent(this, "y-width-changed", {
+                value: this._yWidth,
+                chartIndex: this.chartIndex,
+              });
+            }
+          },
          position: computeRTL(this.hass) ? "right" : "left",
        },
      },
@@ -31,15 +31,21 @@ const chunkData = (inputArray: any[], chunks: number) =>
    return results;
  }, []);

+declare global {
+  interface HASSDomEvents {
+    "y-width-changed": { value: number; chartIndex: number };
+  }
+}
+
@customElement("state-history-charts")
-class StateHistoryCharts extends LitElement {
+export class StateHistoryCharts extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ attribute: false }) public historyData!: HistoryResult;

  @property() public narrow!: boolean;

-  @property({ type: Boolean }) public names = false;
+  @property() public names?: Record<string, string>;

  @property({ type: Boolean, attribute: "virtualize", reflect: true })
  public virtualize = false;
@@ -56,10 +62,15 @@ class StateHistoryCharts extends LitElement {

  @state() private _computedEndTime!: Date;

+  @state() private _maxYWidth = 0;
+
+  @state() private _childYWidths: number[] = [];
+
+  @state() private _chartCount = 0;
+
  // @ts-ignore
  @restoreScroll(".container") private _savedScrollPos?: number;

-  @eventOptions({ passive: true })
  protected render(): TemplateResult {
    if (!isComponentLoaded(this.hass, "history")) {
      return html`<div class="info">
@@ -99,6 +110,8 @@ class StateHistoryCharts extends LitElement {
        ).concat(this.historyData.line)
      : this.historyData.line;

+    this._chartCount = combinedItems.length;
+
    return this.virtualize
      ? html`<div class="container ha-scrollbar" @scroll=${this._saveScrollPos}>
          <lit-virtualizer
@@ -130,7 +143,10 @@ class StateHistoryCharts extends LitElement {
          .identifier=${item.identifier}
          .showNames=${this.showNames}
          .endTime=${this._computedEndTime}
+          .paddingYAxis=${this._maxYWidth}
          .names=${this.names}
+          .chartIndex=${index}
+          @y-width-changed=${this._yWidthChanged}
        ></state-history-chart-line>
      </div> `;
    }
@@ -144,6 +160,9 @@ class StateHistoryCharts extends LitElement {
        .names=${this.names}
        .narrow=${this.narrow}
        .chunked=${this.virtualize}
+        .paddingYAxis=${this._maxYWidth}
+        .chartIndex=${index}
+        @y-width-changed=${this._yWidthChanged}
      ></state-history-chart-timeline>
    </div> `;
  };
@@ -152,6 +171,21 @@ class StateHistoryCharts extends LitElement {
    return !(changedProps.size === 1 && changedProps.has("hass"));
  }

+  protected updated(changedProps: PropertyValues) {
+    if (changedProps.has("_chartCount")) {
+      if (this._chartCount < this._childYWidths.length) {
+        this._childYWidths.length = this._chartCount;
+        this._maxYWidth =
+          this._childYWidths.length === 0 ? 0 : Math.max(...this._childYWidths);
+      }
+    }
+  }
+
+  private _yWidthChanged(e: CustomEvent<HASSDomEvents["y-width-changed"]>) {
+    this._childYWidths[e.detail.chartIndex] = e.detail.value;
+    this._maxYWidth = Math.max(...this._childYWidths);
+  }
+
  private _isHistoryEmpty(): boolean {
    const historyDataEmpty =
      !this.historyData ||
@@ -66,7 +66,7 @@ class StatisticsChart extends LitElement {
    StatisticsMetaData
  >;

-  @property() public names: boolean | Record<string, string> = false;
+  @property() public names?: Record<string, string>;

  @property() public unit?: string;

@@ -133,6 +133,7 @@ class StatisticsChart extends LitElement {

    return html`
      <ha-chart-base
+        .hass=${this.hass}
        .data=${this._chartData}
        .options=${this._chartOptions}
        .chartType=${this.chartType}
@@ -1,11 +1,11 @@
 import { HassEntity } from "home-assistant-js-websocket";
 import { getGraphColorByIndex } from "../../../common/color/colors";
-import { lab2hex, rgb2hex, rgb2lab } from "../../../common/color/convert-color";
+import { hex2rgb, lab2hex, rgb2lab } from "../../../common/color/convert-color";
 import { labBrighten } from "../../../common/color/lab";
 import { computeDomain } from "../../../common/entity/compute_domain";
-import { stateActive } from "../../../common/entity/state_active";
-import { stateColor } from "../../../common/entity/state_color";
-import { UNAVAILABLE } from "../../../data/entity";
+import { stateColorProperties } from "../../../common/entity/state_color";
+import { UNAVAILABLE, UNKNOWN } from "../../../data/entity";
+import { computeCssValue } from "../../../resources/css-variables";

 const DOMAIN_STATE_SHADES: Record<string, Record<string, number>> = {
  media_player: {
@@ -17,61 +17,35 @@ const DOMAIN_STATE_SHADES: Record<string, Record<string, number>> = {
  },
 };

-const cssColorMap: Map<string, [number, number, number]> = new Map();
-
-function cssToRgb(
-  cssVariable: string,
-  computedStyles: CSSStyleDeclaration
-): [number, number, number] | undefined {
-  if (!cssVariable.startsWith("--rgb")) {
-    return undefined;
-  }
-
-  if (cssColorMap.has(cssVariable)) {
-    return cssColorMap.get(cssVariable)!;
-  }
-
-  const value = computedStyles.getPropertyValue(cssVariable);
-
-  if (!value) return undefined;
-
-  const rgb = value.split(",").map((v) => Number(v)) as [
-    number,
-    number,
-    number
-  ];
-  cssColorMap.set(cssVariable, rgb);
-
-  return rgb;
-}
-
 function computeTimelineStateColor(
  state: string,
  computedStyles: CSSStyleDeclaration,
  stateObj?: HassEntity
 ): string | undefined {
  if (!stateObj || state === UNAVAILABLE) {
-    return "transparent";
+    return computeCssValue("--history-unavailable-color", computedStyles);
  }

-  const color = stateColor(stateObj, state);
-
-  if (!color && !stateActive(stateObj, state)) {
-    const rgb = cssToRgb("--rgb-state-inactive-color", computedStyles);
-    if (!rgb) return undefined;
-    return rgb2hex(rgb);
+  if (state === UNKNOWN) {
+    return computeCssValue("--history-unknown-color", computedStyles);
  }

-  const rgb = cssToRgb(`--rgb-state-${color}-color`, computedStyles);
+  const properties = stateColorProperties(stateObj, state);
+
+  if (!properties) {
+    return undefined;
+  }
+
+  const rgb = computeCssValue(properties, computedStyles);

  if (!rgb) return undefined;

  const domain = computeDomain(stateObj.entity_id);
  const shade = DOMAIN_STATE_SHADES[domain]?.[state] as number | number;
  if (!shade) {
-    return rgb2hex(rgb);
+    return rgb;
  }
-  return lab2hex(labBrighten(rgb2lab(rgb), shade));
+  return lab2hex(labBrighten(rgb2lab(hex2rgb(rgb)), shade));
 }

 let colorIndex = 0;
@@ -157,7 +157,7 @@ export const CURRENCIES = [
  "XPF",
  "YER",
  "ZAR",
-  "ZMK",
+  "ZMW",
  "ZWL",
 ];

@@ -200,7 +200,6 @@ export class HaDataTable extends LitElement {
      Object.values(clonedColumns).forEach(
        (column: ClonedDataTableColumnData) => {
          delete column.title;
-          delete column.type;
          delete column.template;
        }
      );
@@ -55,11 +55,16 @@ const sortData = (
      ? b[column.valueColumn || sortColumn][column.filterKey]
      : b[column.valueColumn || sortColumn];

-    if (typeof valA === "string") {
-      valA = valA.toUpperCase();
-    }
-    if (typeof valB === "string") {
-      valB = valB.toUpperCase();
+    if (column.type === "numeric") {
+      valA = isNaN(valA) ? undefined : Number(valA);
+      valB = isNaN(valB) ? undefined : Number(valB);
+    } else {
+      if (typeof valA === "string") {
+        valA = valA.toUpperCase();
+      }
+      if (typeof valB === "string") {
+        valB = valB.toUpperCase();
+      }
    }

    // Ensure "undefined" is always sorted to the bottom
@@ -5,7 +5,6 @@ import DateRangePicker from "vue2-daterange-picker";
 // @ts-ignore
 import dateRangePickerStyles from "vue2-daterange-picker/dist/vue2-daterange-picker.css";
 import { fireEvent } from "../common/dom/fire_event";
-import { Constructor } from "../types";

 const Component = Vue.extend({
  props: {
@@ -47,35 +46,26 @@ const Component = Vue.extend({
    },
  },
  render(createElement) {
-    // @ts-ignore
+    // @ts-expect-error
    return createElement(DateRangePicker, {
      props: {
-        // @ts-ignore
        "time-picker": this.timePicker,
-        // @ts-ignore
        "auto-apply": this.autoApply,
        opens: "right",
        "show-dropdowns": false,
-        // @ts-ignore
        "time-picker24-hour": this.twentyfourHours,
-        // @ts-ignore
        disabled: this.disabled,
-        // @ts-ignore
        ranges: this.ranges ? {} : false,
        "locale-data": {
-          // @ts-ignore
          firstDay: this.firstDay,
        },
      },
      model: {
        value: {
-          // @ts-ignore
          startDate: this.startDate,
-          // @ts-ignore
          endDate: this.endDate,
        },
        callback: (value) => {
-          // @ts-ignore
          fireEvent(this.$el as HTMLElement, "change", value);
        },
        expression: "dateRange",
@@ -106,7 +96,11 @@ const Component = Vue.extend({
  },
 });

-const WrappedElement: Constructor<HTMLElement> = wrap(Vue, Component);
+// Assertion corrects HTMLElement type from package
+const WrappedElement = wrap(
+  Vue,
+  Component
+) as unknown as CustomElementConstructor;

@customElement("date-range-picker")
 class DateRangePickerElement extends WrappedElement {
@@ -1,15 +1,26 @@
 import "@material/mwc-button/mwc-button";
-import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
+import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { stringCompare } from "../../common/string/compare";
+import {
+  AreaRegistryEntry,
+  subscribeAreaRegistry,
+} from "../../data/area_registry";
 import {
  DeviceEntityLookup,
  DeviceRegistryEntry,
+  subscribeDeviceRegistry,
 } from "../../data/device_registry";
+import {
+  EntityRegistryEntry,
+  subscribeEntityRegistry,
+} from "../../data/entity_registry";
+import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "../ha-icon-button";
@@ -34,7 +45,7 @@ const rowRenderer: ComboBoxLitRenderer<AreaDevices> = (
 </mwc-list-item>`;

@customElement("ha-area-devices-picker")
-export class HaAreaDevicesPicker extends LitElement {
+export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public label?: string;
@@ -71,22 +82,25 @@ export class HaAreaDevicesPicker extends LitElement {

  @state() private _areaPicker = true;

+  @state() private _devices?: DeviceRegistryEntry[];
+
+  @state() private _areas?: AreaRegistryEntry[];
+
+  @state() private _entities?: EntityRegistryEntry[];
+
  private _selectedDevices: string[] = [];

  private _filteredDevices: DeviceRegistryEntry[] = [];

  private _getAreasWithDevices = memoizeOne(
    (
-      deviceReg: HomeAssistant["devices"],
-      areas: HomeAssistant["areas"],
-      entityReg: HomeAssistant["entities"],
+      devices: DeviceRegistryEntry[],
+      areas: AreaRegistryEntry[],
+      entities: EntityRegistryEntry[],
      includeDomains: this["includeDomains"],
      excludeDomains: this["excludeDomains"],
      includeDeviceClasses: this["includeDeviceClasses"]
    ): AreaDevices[] => {
-      const devices = Object.values(deviceReg);
-      const entities = Object.values(entityReg);
-
      if (!devices.length) {
        return [];
      }
@@ -150,6 +164,11 @@ export class HaAreaDevicesPicker extends LitElement {

      this._filteredDevices = inputDevices;

+      const areaLookup: { [areaId: string]: AreaRegistryEntry } = {};
+      for (const area of areas) {
+        areaLookup[area.area_id] = area;
+      }
+
      const devicesByArea: DevicesByArea = {};

      for (const device of inputDevices) {
@@ -158,7 +177,7 @@ export class HaAreaDevicesPicker extends LitElement {
          if (!(areaId in devicesByArea)) {
            devicesByArea[areaId] = {
              id: areaId,
-              name: areas[areaId].name,
+              name: areaLookup[areaId].name,
              devices: [],
            };
          }
@@ -180,6 +199,20 @@ export class HaAreaDevicesPicker extends LitElement {
    }
  );

+  public hassSubscribe(): UnsubscribeFunc[] {
+    return [
+      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
+        this._devices = devices;
+      }),
+      subscribeAreaRegistry(this.hass.connection!, (areas) => {
+        this._areas = areas;
+      }),
+      subscribeEntityRegistry(this.hass.connection!, (entities) => {
+        this._entities = entities;
+      }),
+    ];
+  }
+
  protected updated(changedProps: PropertyValues) {
    super.updated(changedProps);
    if (changedProps.has("area") && this.area) {
@@ -198,10 +231,13 @@ export class HaAreaDevicesPicker extends LitElement {
  }

  protected render(): TemplateResult {
+    if (!this._devices || !this._areas || !this._entities) {
+      return html``;
+    }
    const areas = this._getAreasWithDevices(
-      this.hass.devices,
-      this.hass.areas,
-      this.hass.entities,
+      this._devices,
+      this._areas,
+      this._entities,
      this.includeDomains,
      this.excludeDomains,
      this.includeDeviceClasses
@@ -1,4 +1,5 @@
 import "@material/mwc-list/mwc-list-item";
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { customElement, property, query, state } from "lit/decorators";
@@ -6,15 +7,21 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { stringCompare } from "../../common/string/compare";
-
-
+import {
+  AreaRegistryEntry,
+  subscribeAreaRegistry,
+} from "../../data/area_registry";
 import {
  computeDeviceName,
  DeviceEntityLookup,
  DeviceRegistryEntry,
+  subscribeDeviceRegistry,
 } from "../../data/device_registry";
-
-
+import {
+  EntityRegistryEntry,
+  subscribeEntityRegistry,
+} from "../../data/entity_registry";
+import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "../ha-combo-box";
@@ -38,7 +45,7 @@ const rowRenderer: ComboBoxLitRenderer<Device> = (item) => html`<mwc-list-item
 </mwc-list-item>`;

@customElement("ha-device-picker")
-export class HaDevicePicker extends LitElement {
+export class HaDevicePicker extends SubscribeMixin(LitElement) {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public label?: string;
@@ -47,6 +54,12 @@ export class HaDevicePicker extends LitElement {

  @property() public helper?: string;

+  @property() public devices?: DeviceRegistryEntry[];
+
+  @property() public areas?: AreaRegistryEntry[];
+
+  @property() public entities?: EntityRegistryEntry[];
+
  /**
   * Show only devices with entities from specific domains.
   * @type {Array}
@@ -93,18 +106,15 @@ export class HaDevicePicker extends LitElement {

  private _getDevices = memoizeOne(
    (
-      deviceReg: HomeAssistant["devices"],
-      areas: HomeAssistant["areas"],
-      entityReg: HomeAssistant["entities"],
+      devices: DeviceRegistryEntry[],
+      areas: AreaRegistryEntry[],
+      entities: EntityRegistryEntry[],
      includeDomains: this["includeDomains"],
      excludeDomains: this["excludeDomains"],
      includeDeviceClasses: this["includeDeviceClasses"],
      deviceFilter: this["deviceFilter"],
      excludeDevices: this["excludeDevices"]
    ): Device[] => {
-      const devices = Object.values(deviceReg);
-      const entities = Object.values(entityReg);
-
      if (!devices.length) {
        return [
          {
@@ -128,6 +138,12 @@ export class HaDevicePicker extends LitElement {
          deviceEntityLookup[entity.device_id].push(entity);
        }
      }
+
+      const areaLookup: { [areaId: string]: AreaRegistryEntry } = {};
+      for (const area of areas) {
+        areaLookup[area.area_id] = area;
+      }
+
      let inputDevices = devices.filter(
        (device) => device.id === this.value || !device.disabled_by
      );
@@ -198,8 +214,8 @@ export class HaDevicePicker extends LitElement {
          deviceEntityLookup[device.id]
        ),
        area:
-          device.area_id && device.area_id in areas
-            ? areas[device.area_id].name
+          device.area_id && areaLookup[device.area_id]
+            ? areaLookup[device.area_id].name
            : this.hass.localize("ui.components.device-picker.no_area"),
      }));
      if (!outputDevices.length) {
@@ -230,16 +246,30 @@ export class HaDevicePicker extends LitElement {
    await this.comboBox?.focus();
  }

+  public hassSubscribe(): UnsubscribeFunc[] {
+    return [
+      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
+        this.devices = devices;
+      }),
+      subscribeAreaRegistry(this.hass.connection!, (areas) => {
+        this.areas = areas;
+      }),
+      subscribeEntityRegistry(this.hass.connection!, (entities) => {
+        this.entities = entities;
+      }),
+    ];
+  }
+
  protected updated(changedProps: PropertyValues) {
    if (
-      !this._init ||
+      (!this._init && this.devices && this.areas && this.entities) ||
      (this._init && changedProps.has("_opened") && this._opened)
    ) {
      this._init = true;
      (this.comboBox as any).items = this._getDevices(
-        this.hass.devices,
-        this.hass.areas,
-        this.hass.entities,
+        this.devices!,
+        this.areas!,
+        this.entities!,
        this.includeDomains,
        this.excludeDomains,
        this.includeDeviceClasses,
@@ -1,6 +1,7 @@
 import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
+import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
 import type { PolymerChangedEvent } from "../../polymer-types";
@@ -95,7 +96,10 @@ class HaEntitiesPickerLight extends LitElement {
              .excludeEntities=${this.excludeEntities}
              .includeDeviceClasses=${this.includeDeviceClasses}
              .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
-              .entityFilter=${this._entityFilter}
+              .entityFilter=${this._getEntityFilter(
+                this.value,
+                this.entityFilter
+              )}
              .value=${entityId}
              .label=${this.pickedEntityLabel}
              .disabled=${this.disabled}
@@ -114,7 +118,7 @@ class HaEntitiesPickerLight extends LitElement {
          .excludeEntities=${this.excludeEntities}
          .includeDeviceClasses=${this.includeDeviceClasses}
          .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
-          .entityFilter=${this._entityFilter}
+          .entityFilter=${this._getEntityFilter(this.value, this.entityFilter)}
          .label=${this.pickEntityLabel}
          .helper=${this.helper}
          .disabled=${this.disabled}
@@ -125,11 +129,15 @@ class HaEntitiesPickerLight extends LitElement {
    `;
  }

-  private _entityFilter: HaEntityPickerEntityFilterFunc = (
-    stateObj: HassEntity
-  ) =>
-    (!this.value || !this.value.includes(stateObj.entity_id)) &&
-    (!this.entityFilter || this.entityFilter(stateObj));
+  private _getEntityFilter = memoizeOne(
+    (
+        value: string[] | undefined,
+        entityFilter: HaEntityPickerEntityFilterFunc | undefined
+      ): HaEntityPickerEntityFilterFunc =>
+      (stateObj: HassEntity) =>
+        (!value || !value.includes(stateObj.entity_id)) &&
+        (!entityFilter || entityFilter(stateObj))
+  );

  private get _currentEntities() {
    return this.value || [];
@@ -1,4 +1,4 @@
-import "@material/mwc-list/mwc-list-item";
+import "../ha-list-item";
 import { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
@@ -24,13 +24,13 @@ export type HaEntityPickerEntityFilterFunc = (entity: HassEntity) => boolean;

 // eslint-disable-next-line lit/prefer-static-styles
 const rowRenderer: ComboBoxLitRenderer<HassEntityWithCachedName> = (item) =>
-  html`<mwc-list-item graphic="avatar" .twoline=${!!item.entity_id}>
+  html`<ha-list-item graphic="avatar" .twoline=${!!item.entity_id}>
    ${item.state
      ? html`<state-badge slot="graphic" .stateObj=${item}></state-badge>`
      : ""}
    <span>${item.friendly_name}</span>
    <span slot="secondary">${item.entity_id}</span>
-  </mwc-list-item>`;
+  </ha-list-item>`;

@customElement("ha-entity-picker")
 export class HaEntityPicker extends LitElement {
@@ -22,6 +22,7 @@ import {
  isNumericState,
 } from "../../common/number/format_number";
 import { isUnavailableState, UNAVAILABLE, UNKNOWN } from "../../data/entity";
+import { EntityRegistryEntry } from "../../data/entity_registry";
 import { timerTimeRemaining } from "../../data/timer";
 import { HomeAssistant } from "../../types";
 import "../ha-label-badge";
@@ -34,9 +35,9 @@ const TRUNCATED_DOMAINS = [
  "person",
 ] as const satisfies ReadonlyArray<keyof typeof FIXED_DOMAIN_STATES>;

-type TruncatedDomain = typeof TRUNCATED_DOMAINS[number];
+type TruncatedDomain = (typeof TRUNCATED_DOMAINS)[number];
 type TruncatedKey = {
-  [T in TruncatedDomain]: `${T}.${typeof FIXED_DOMAIN_STATES[T][number]}`;
+  [T in TruncatedDomain]: `${T}.${(typeof FIXED_DOMAIN_STATES)[T][number]}`;
 }[TruncatedDomain];

 const getTruncatedKey = (domainKey: string, stateKey: string) => {
@@ -103,8 +104,10 @@ export class HaStateLabelBadge extends LitElement {
    // 4. Icon determined via entity state
    // 5. Value string as fallback
    const domain = computeStateDomain(entityState);
+    const entry = this.hass?.entities[entityState.entity_id];

-    const showIcon = this.icon || this._computeShowIcon(domain, entityState);
+    const showIcon =
+      this.icon || this._computeShowIcon(domain, entityState, entry);
    const image = this.icon
      ? ""
      : this.image
@@ -112,7 +115,9 @@ export class HaStateLabelBadge extends LitElement {
      : entityState.attributes.entity_picture_local ||
        entityState.attributes.entity_picture;
    const value =
-      !image && !showIcon ? this._computeValue(domain, entityState) : undefined;
+      !image && !showIcon
+        ? this._computeValue(domain, entityState, entry)
+        : undefined;

    return html`
      <ha-label-badge
@@ -152,7 +157,11 @@ export class HaStateLabelBadge extends LitElement {
    }
  }

-  private _computeValue(domain: string, entityState: HassEntity) {
+  private _computeValue(
+    domain: string,
+    entityState: HassEntity,
+    entry?: EntityRegistryEntry
+  ) {
    switch (domain) {
      case "alarm_control_panel":
      case "binary_sensor":
@@ -165,7 +174,7 @@ export class HaStateLabelBadge extends LitElement {
        return null;
      // @ts-expect-error we don't break and go to default
      case "sensor":
-        if (entityState.attributes.device_class === "moon__phase") {
+        if (entry?.platform === "moon") {
          return null;
        }
      // eslint-disable-next-line: disable=no-fallthrough
@@ -177,7 +186,7 @@ export class HaStateLabelBadge extends LitElement {
          ? formatNumber(
              entityState.state,
              this.hass!.locale,
-              getNumberFormatOptions(entityState)
+              getNumberFormatOptions(entityState, entry)
            )
          : computeStateDisplay(
              this.hass!.localize,
@@ -188,7 +197,11 @@ export class HaStateLabelBadge extends LitElement {
    }
  }

-  private _computeShowIcon(domain: string, entityState: HassEntity): boolean {
+  private _computeShowIcon(
+    domain: string,
+    entityState: HassEntity,
+    entry?: EntityRegistryEntry
+  ): boolean {
    if (entityState.state === UNAVAILABLE) {
      return false;
    }
@@ -204,7 +217,7 @@ export class HaStateLabelBadge extends LitElement {
      case "timer":
        return true;
      case "sensor":
-        return entityState.attributes.device_class === "moon__phase";
+        return entry?.platform === "moon";
      default:
        return false;
    }
@@ -223,6 +236,10 @@ export class HaStateLabelBadge extends LitElement {
    if (domainStateKey) {
      return this.hass!.localize(`state_badge.${domainStateKey}`);
    }
+    // Person and device tracker state can be zone name
+    if (domain === "person" || domain === "device_tracker") {
+      return entityState.state;
+    }
    if (domain === "timer") {
      return secondsToDuration(_timerTimeRemaining);
    }
@@ -11,13 +11,12 @@ import {
 import { property, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { styleMap } from "lit/directives/style-map";
-import { CLIMATE_HVAC_ACTION_COLORS } from "../../common/entity/color/climate_color";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
-import { stateActive } from "../../common/entity/state_active";
 import { stateColorCss } from "../../common/entity/state_color";
 import { iconColorCSS } from "../../common/style/icon_color_css";
 import { cameraUrlWithWidthHeight } from "../../data/camera";
+import { HVAC_ACTION_TO_MODE } from "../../data/climate";
 import type { HomeAssistant } from "../../types";
 import "../ha-state-icon";

@@ -112,10 +111,10 @@ export class StateBadge extends LitElement {
      } else if (this.color) {
        // Externally provided overriding color wins over state color
        iconStyle.color = this.color;
-      } else if (this._stateColor && stateActive(stateObj)) {
+      } else if (this._stateColor) {
        const color = stateColorCss(stateObj);
        if (color) {
-          iconStyle.color = `rgb(${color})`;
+          iconStyle.color = color;
        }
        if (stateObj.attributes.rgb_color) {
          iconStyle.color = `rgb(${stateObj.attributes.rgb_color.join(",")})`;
@@ -134,8 +133,11 @@ export class StateBadge extends LitElement {
        }
        if (stateObj.attributes.hvac_action) {
          const hvacAction = stateObj.attributes.hvac_action;
-          if (["heating", "cooling", "drying"].includes(hvacAction)) {
-            iconStyle.color = `rgb(${CLIMATE_HVAC_ACTION_COLORS[hvacAction]})`;
+          if (hvacAction in HVAC_ACTION_TO_MODE) {
+            iconStyle.color = stateColorCss(
+              stateObj,
+              HVAC_ACTION_TO_MODE[hvacAction]
+            )!;
          } else {
            delete iconStyle.color;
          }
@@ -170,6 +172,7 @@ export class StateBadge extends LitElement {
          line-height: 40px;
          vertical-align: middle;
          box-sizing: border-box;
+          --state-inactive-color: initial;
        }
        :host(:focus) {
          outline: none;
@@ -126,6 +126,7 @@ export class HaAreaPicker extends LitElement {
            area_id: "no_areas",
            name: this.hass.localize("ui.components.area-picker.no_areas"),
            picture: null,
+            aliases: [],
          },
        ];
      }
@@ -256,6 +257,7 @@ export class HaAreaPicker extends LitElement {
            area_id: "no_areas",
            name: this.hass.localize("ui.components.area-picker.no_match"),
            picture: null,
+            aliases: [],
          },
        ];
      }
@@ -268,6 +270,7 @@ export class HaAreaPicker extends LitElement {
              area_id: "add_new",
              name: this.hass.localize("ui.components.area-picker.add_new"),
              picture: null,
+              aliases: [],
            },
          ];
    }
@@ -2,12 +2,13 @@ import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import type { EntityRegistryEntry } from "../data/entity_registry";
+import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../types";
 import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
 import "./ha-area-picker";

@customElement("ha-areas-picker")
-export class HaAreasPicker extends LitElement {
+export class HaAreasPicker extends SubscribeMixin(LitElement) {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public label?: string;
@@ -271,13 +271,18 @@ export class HaBarSlider extends LitElement {
    return css`
      :host {
        display: block;
-        --slider-bar-color: rgb(var(--rgb-primary-color));
-        --slider-bar-background: rgb(var(--rgb-disabled-color));
+        --slider-bar-color: var(--primary-color);
+        --slider-bar-background: var(--disabled-color);
        --slider-bar-background-opacity: 0.2;
        --slider-bar-thickness: 40px;
        --slider-bar-border-radius: 10px;
        height: var(--slider-bar-thickness);
        width: 100%;
+        border-radius: var(--slider-bar-border-radius);
+        outline: none;
+      }
+      :host(:focus-visible) {
+        box-shadow: 0 0 0 2px var(--slider-bar-color);
      }
      :host([vertical]) {
        width: var(--slider-bar-thickness);
@@ -396,7 +401,7 @@ export class HaBarSlider extends LitElement {
      .slider .slider-track-cursor:after {
        display: block;
        content: "";
-        background-color: rgb(var(--rgb-secondary-text-color));
+        background-color: var(--secondary-text-color);
        position: absolute;
        top: 0;
        left: 0;
@@ -92,8 +92,8 @@ export class HaBarSwitch extends LitElement {
    return css`
      :host {
        display: block;
-        --switch-bar-on-color: rgb(var(--rgb-primary-color));
-        --switch-bar-off-color: rgb(var(--rgb-disabled-color));
+        --switch-bar-on-color: var(--primary-color);
+        --switch-bar-off-color: var(--disabled-color);
        --switch-bar-background-opacity: 0.2;
        --switch-bar-thickness: 40px;
        --switch-bar-border-radius: 12px;
@@ -104,6 +104,14 @@ export class HaBarSwitch extends LitElement {
        box-sizing: border-box;
        user-select: none;
        cursor: pointer;
+        border-radius: var(--switch-bar-border-radius);
+        outline: none;
+      }
+      :host(:focus-visible) {
+        box-shadow: 0 0 0 2px var(--switch-bar-off-color);
+      }
+      :host([checked]:focus-visible) {
+        box-shadow: 0 0 0 2px var(--switch-bar-on-color);
      }
      .switch {
        box-sizing: border-box;
@@ -41,9 +41,9 @@ class HaBluePrintPicker extends LitElement {
      return [];
    }
    const result = Object.entries(blueprints)
-      .filter(([_path, blueprint]) => !("error" in blueprint))
+      .filter((entry): entry is [string, Blueprint] => !("error" in entry[1]))
      .map(([path, blueprint]) => ({
-        ...(blueprint as Blueprint).metadata,
+        ...blueprint.metadata,
        path,
      }));
    return result.sort((a, b) =>
@@ -0,0 +1,24 @@
+import { Button } from "@material/mwc-button";
+import { css } from "lit";
+import { customElement } from "lit/decorators";
+import { styles } from "@material/mwc-button/styles.css";
+
+@customElement("ha-button")
+export class HaButton extends Button {
+  static override styles = [
+    styles,
+    css`
+      ::slotted([slot="icon"]) {
+        margin-inline-start: 0px;
+        margin-inline-end: 8px;
+        direction: var(--direction);
+      }
+    `,
+  ];
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-button": HaButton;
+  }
+}
@@ -13,6 +13,15 @@ export class HaCheckListItem extends CheckListItemBase {
      :host {
        --mdc-theme-secondary: var(--primary-color);
      }
+
+      :host([graphic="avatar"]) .mdc-deprecated-list-item__graphic,
+      :host([graphic="medium"]) .mdc-deprecated-list-item__graphic,
+      :host([graphic="large"]) .mdc-deprecated-list-item__graphic,
+      :host([graphic="control"]) .mdc-deprecated-list-item__graphic {
+        margin-inline-end: var(--mdc-list-item-graphic-margin, 16px);
+        margin-inline-start: 0px;
+        direction: var(--direction);
+      }
    `,
  ];
 }
@@ -17,11 +17,8 @@ export class HaClickableListItem extends HaListItem {
    const href = this.href || "";

    return html`${this.disableHref
-      ? html`<a aria-role="option">${r}</a>`
-      : html`<a
-          aria-role="option"
-          target=${this.openNewTab ? "_blank" : ""}
-          href=${href}
+      ? html`<a>${r}</a>`
+      : html`<a target=${this.openNewTab ? "_blank" : ""} href=${href}
          >${r}</a
        >`}`;
  }
@@ -3,6 +3,7 @@ import { customElement, property } from "lit/decorators";
 import { computeAttributeValueDisplay } from "../common/entity/compute_attribute_display";
 import { computeStateDisplay } from "../common/entity/compute_state_display";
 import { formatNumber } from "../common/number/format_number";
+import { blankBeforePercent } from "../common/translations/blank_before_percent";
 import { ClimateEntity, CLIMATE_PRESET_NONE } from "../data/climate";
 import { isUnavailableState } from "../data/entity";
 import type { HomeAssistant } from "../types";
@@ -47,6 +48,19 @@ class HaClimateState extends LitElement {
    if (!this.hass || !this.stateObj) {
      return undefined;
    }
+    if (
+      this.stateObj.attributes.current_temperature != null &&
+      this.stateObj.attributes.current_humidity != null
+    ) {
+      return `${formatNumber(
+        this.stateObj.attributes.current_temperature,
+        this.hass.locale
+      )} ${this.hass.config.unit_system.temperature}/
+      ${formatNumber(
+        this.stateObj.attributes.current_humidity,
+        this.hass.locale
+      )}${blankBeforePercent(this.hass.locale)}%`;
+    }

    if (this.stateObj.attributes.current_temperature != null) {
      return `${formatNumber(
@@ -59,7 +73,7 @@ class HaClimateState extends LitElement {
      return `${formatNumber(
        this.stateObj.attributes.current_humidity,
        this.hass.locale
-      )} %`;
+      )}${blankBeforePercent(this.hass.locale)}%`;
    }

    return undefined;
@@ -4,6 +4,7 @@ import type {
  CompletionResult,
  CompletionSource,
 } from "@codemirror/autocomplete";
+import type { Extension } from "@codemirror/state";
 import type { EditorView, KeyBinding, ViewUpdate } from "@codemirror/view";
 import { HassEntities } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, PropertyValues, ReactiveElement } from "lit";
@@ -72,9 +73,9 @@ export class HaCodeEditor extends ReactiveElement {
    if (!this.codemirror || !this._loadedCodeMirror) {
      return false;
    }
-    const className = this._loadedCodeMirror.HighlightStyle.get(
+    const className = this._loadedCodeMirror.highlightingFor(
      this.codemirror.state,
-      this._loadedCodeMirror.tags.comment
+      [this._loadedCodeMirror.tags.comment]
    );
    return !!this.shadowRoot!.querySelector(`span.${className}`);
  }
@@ -136,7 +137,7 @@ export class HaCodeEditor extends ReactiveElement {

  private async _load(): Promise<void> {
    this._loadedCodeMirror = await loadCodeMirror();
-    const extensions = [
+    const extensions: Extension[] = [
      this._loadedCodeMirror.lineNumbers(),
      this._loadedCodeMirror.EditorState.allowMultipleSelections.of(true),
      this._loadedCodeMirror.history(),
@@ -152,10 +153,8 @@ export class HaCodeEditor extends ReactiveElement {
        saveKeyBinding,
      ] as KeyBinding[]),
      this._loadedCodeMirror.langCompartment.of(this._mode),
-      this._loadedCodeMirror.theme,
-      this._loadedCodeMirror.Prec.fallback(
-        this._loadedCodeMirror.highlightStyle
-      ),
+      this._loadedCodeMirror.haTheme,
+      this._loadedCodeMirror.haSyntaxHighlighting,
      this._loadedCodeMirror.readonlyCompartment.of(
        this._loadedCodeMirror.EditorView.editable.of(!this.readOnly)
      ),
@@ -227,7 +226,7 @@ export class HaCodeEditor extends ReactiveElement {
    return {
      from: Number(entityWord.from),
      options: states,
-      span: /^[a-z_]{3,}\.\w*$/,
+      validFor: /^[a-z_]{3,}\.\w*$/,
    };
  }

@@ -268,7 +267,7 @@ export class HaCodeEditor extends ReactiveElement {
    return {
      from: Number(match.from),
      options: iconItems,
-      span: /^mdi:\S*$/,
+      validFor: /^mdi:\S*$/,
    };
  }

@@ -1,4 +1,3 @@
-import "@material/mwc-list/mwc-list-item";
 import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js";
 import { ComboBoxLitRenderer, comboBoxRenderer } from "@vaadin/combo-box/lit";
 import "@vaadin/combo-box/theme/material/vaadin-combo-box-light";
@@ -15,15 +14,15 @@ import { customElement, property, query } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { fireEvent } from "../common/dom/fire_event";
 import { HomeAssistant } from "../types";
+import "./ha-list-item";
 import "./ha-icon-button";
-import "./ha-textfield";
 import type { HaTextField } from "./ha-textfield";

 registerStyles(
  "vaadin-combo-box-item",
  css`
    :host {
-      padding: 0;
+      padding: 0 !important;
    }
    :host([focused]:not([disabled])) {
      background-color: rgba(var(--rgb-primary-text-color, 0, 0, 0), 0.12);
@@ -211,9 +210,9 @@ export class HaComboBox extends LitElement {
  private _defaultRowRenderer: ComboBoxLitRenderer<
    string | Record<string, any>
  > = (item) =>
-    html`<mwc-list-item>
+    html`<ha-list-item>
      ${this.itemLabelPath ? item[this.itemLabelPath] : item}
-    </mwc-list-item>`;
+    </ha-list-item>`;

  private _clearValue(ev: Event) {
    ev.stopPropagation();
@@ -24,7 +24,7 @@ export class HaDialogDatePicker extends LitElement {
  @state() private _value?: string;

  public async showDialog(params: datePickerDialogParams): Promise<void> {
-    // app-datpicker has a bug, that it removes its handlers when disconnected, but doesnt add them back when reconnected.
+    // app-datepicker has a bug, that it removes its handlers when disconnected, but doesn't add them back when reconnected.
    // So we need to wait for the next render to make sure the element is removed and re-created so the handlers are added.
    await nextRender();
    this._params = params;
@@ -46,7 +46,10 @@ export class HaDialog extends DialogBase {
    styles,
    css`
      .mdc-dialog {
-        --mdc-dialog-scroll-divider-color: var(--divider-color);
+        --mdc-dialog-scroll-divider-color: var(
+          --dialog-scroll-divider-color,
+          var(--divider-color)
+        );
        z-index: var(--dialog-z-index, 7);
        -webkit-backdrop-filter: var(--dialog-backdrop-filter, none);
        backdrop-filter: var(--dialog-backdrop-filter, none);
@@ -75,7 +75,6 @@ export class HaFileUpload extends LitElement {
              ${this.icon
                ? html`<span
                    class="mdc-text-field__icon mdc-text-field__icon--leading"
-                    tabindex="-1"
                  >
                    <ha-icon-button
                      @click=${this._openFilePicker}
@@ -95,7 +94,6 @@ export class HaFileUpload extends LitElement {
              ${this.value
                ? html`<span
                    class="mdc-text-field__icon mdc-text-field__icon--trailing"
-                    tabindex="1"
                  >
                    <ha-icon-button
                      slot="suffix"
@@ -1,22 +1,33 @@
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  TemplateResult,
+} from "lit";
 import { customElement, property } from "lit/decorators";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../common/dom/fire_event";
 import { HomeAssistant } from "../../types";
 import "../ha-alert";
 import "../ha-selector/ha-selector";
-import "./ha-form-boolean";
-import "./ha-form-constant";
-import "./ha-form-float";
-import "./ha-form-grid";
-import "./ha-form-expandable";
-import "./ha-form-integer";
-import "./ha-form-multi_select";
-import "./ha-form-positive_time_period_dict";
-import "./ha-form-select";
-import "./ha-form-string";
 import { HaFormDataContainer, HaFormElement, HaFormSchema } from "./types";

+const LOAD_ELEMENTS = {
+  boolean: () => import("./ha-form-boolean"),
+  constant: () => import("./ha-form-constant"),
+  float: () => import("./ha-form-float"),
+  grid: () => import("./ha-form-grid"),
+  expandable: () => import("./ha-form-expandable"),
+  integer: () => import("./ha-form-integer"),
+  multi_select: () => import("./ha-form-multi_select"),
+  positive_time_period_dict: () =>
+    import("./ha-form-positive_time_period_dict"),
+  select: () => import("./ha-form-select"),
+  string: () => import("./ha-form-string"),
+};
+
 const getValue = (obj, item) =>
  obj ? (!item.name ? obj : obj[item.name]) : null;

@@ -43,6 +54,8 @@ export class HaForm extends LitElement implements HaFormElement {

  @property() public computeHelper?: (schema: any) => string | undefined;

+  @property() public localizeValue?: (key: string) => string;
+
  public focus() {
    const root = this.shadowRoot?.querySelector(".root");
    if (!root) {
@@ -56,6 +69,17 @@ export class HaForm extends LitElement implements HaFormElement {
    }
  }

+  protected willUpdate(changedProps: PropertyValues) {
+    if (changedProps.has("schema") && this.schema) {
+      this.schema.forEach((item) => {
+        if ("selector" in item) {
+          return;
+        }
+        LOAD_ELEMENTS[item.type]?.();
+      });
+    }
+  }
+
  protected render(): TemplateResult {
    return html`
      <div class="root" part="root">
@@ -86,7 +110,9 @@ export class HaForm extends LitElement implements HaFormElement {
                  .value=${getValue(this.data, item)}
                  .label=${this._computeLabel(item, this.data)}
                  .disabled=${item.disabled || this.disabled || false}
+                  .placeholder=${item.required ? "" : item.default}
                  .helper=${this._computeHelper(item)}
+                  .localizeValue=${this.localizeValue}
                  .required=${item.required || false}
                  .context=${this._generateContext(item)}
                ></ha-selector>`
@@ -1,4 +1,4 @@
-import { HassEntity } from "home-assistant-js-websocket";
+import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
  css,
  CSSResultGroup,
@@ -9,16 +9,23 @@ import {
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { AreaRegistryEntry } from "../data/area_registry";
+import {
+  AreaRegistryEntry,
+  subscribeAreaRegistry,
+} from "../data/area_registry";
 import { ConfigEntry, getConfigEntries } from "../data/config_entries";
-import { DeviceRegistryEntry } from "../data/device_registry";
+import {
+  DeviceRegistryEntry,
+  subscribeDeviceRegistry,
+} from "../data/device_registry";
 import { SceneEntity } from "../data/scene";
 import { findRelated, ItemType, RelatedResult } from "../data/search";
+import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { HomeAssistant } from "../types";
 import "./ha-switch";

@customElement("ha-related-items")
-export class HaRelatedItems extends LitElement {
+export class HaRelatedItems extends SubscribeMixin(LitElement) {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public itemType!: ItemType;
@@ -27,8 +34,23 @@ export class HaRelatedItems extends LitElement {

  @state() private _entries?: ConfigEntry[];

+  @state() private _devices?: DeviceRegistryEntry[];
+
+  @state() private _areas?: AreaRegistryEntry[];
+
  @state() private _related?: RelatedResult;

+  public hassSubscribe(): UnsubscribeFunc[] {
+    return [
+      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
+        this._devices = devices;
+      }),
+      subscribeAreaRegistry(this.hass.connection!, (areas) => {
+        this._areas = areas;
+      }),
+    ];
+  }
+
  protected firstUpdated(changedProps: PropertyValues) {
    super.firstUpdated(changedProps);
    getConfigEntries(this.hass).then((configEntries) => {
@@ -82,10 +104,11 @@ export class HaRelatedItems extends LitElement {
            `;
          })
        : ""}
-      ${this._related.device
+      ${this._related.device && this._devices
        ? this._related.device.map((relatedDeviceId) => {
-            const device: DeviceRegistryEntry | undefined =
-              this.hass.devices[relatedDeviceId];
+            const device: DeviceRegistryEntry | undefined = this._devices!.find(
+              (dev) => dev.id === relatedDeviceId
+            );
            if (!device) {
              return "";
            }
@@ -102,10 +125,11 @@ export class HaRelatedItems extends LitElement {
            `;
          })
        : ""}
-      ${this._related.area
+      ${this._related.area && this._areas
        ? this._related.area.map((relatedAreaId) => {
-            const area: AreaRegistryEntry | undefined =
-              this.hass.areas[relatedAreaId];
+            const area: AreaRegistryEntry | undefined = this._areas!.find(
+              (ar) => ar.area_id === relatedAreaId
+            );
            if (!area) {
              return "";
            }
@@ -1,10 +1,13 @@
-import { HassEntity } from "home-assistant-js-websocket";
+import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import type { DeviceRegistryEntry } from "../../data/device_registry";
 import { getDeviceIntegrationLookup } from "../../data/device_registry";
-import { EntityRegistryEntry } from "../../data/entity_registry";
+import {
+  EntityRegistryEntry,
+  subscribeEntityRegistry,
+} from "../../data/entity_registry";
 import {
  EntitySources,
  fetchEntitySourcesWithCache,
@@ -14,12 +17,13 @@ import {
  filterSelectorDevices,
  filterSelectorEntities,
 } from "../../data/selector";
+import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../types";
 import "../ha-area-picker";
 import "../ha-areas-picker";

@customElement("ha-selector-area")
-export class HaAreaSelector extends LitElement {
+export class HaAreaSelector extends SubscribeMixin(LitElement) {
  @property() public hass!: HomeAssistant;

  @property() public selector!: AreaSelector;
@@ -40,16 +44,12 @@ export class HaAreaSelector extends LitElement {

  private _deviceIntegrationLookup = memoizeOne(getDeviceIntegrationLookup);

-  protected willUpdate(changedProperties: PropertyValues): void {
-    if (
-      changedProperties.has("hass") &&
-      (changedProperties.get("hass") as HomeAssistant | undefined)?.entities !==
-        this.hass.entities
-    ) {
-      this._entities = Object.values(this.hass.entities).filter(
-        (entity) => entity.device_id !== null
-      );
-    }
+  public hassSubscribe(): UnsubscribeFunc[] {
+    return [
+      subscribeEntityRegistry(this.hass.connection!, (entities) => {
+        this._entities = entities.filter((entity) => entity.device_id !== null);
+      }),
+    ];
  }

  protected updated(changedProperties: PropertyValues): void {
@@ -1,6 +1,8 @@
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
+import { computeDomain } from "../../common/entity/compute_domain";
+import { domainIcon } from "../../common/entity/domain_icon";
 import { IconSelector } from "../../data/selector";
 import { HomeAssistant } from "../../types";
 import "../ha-icon-picker";
@@ -21,7 +23,22 @@ export class HaIconSelector extends LitElement {

  @property({ type: Boolean }) public required = true;

+  @property() public context?: {
+    icon_entity?: string;
+  };
+
  protected render() {
+    const iconEntity = this.context?.icon_entity;
+
+    const stateObj = iconEntity ? this.hass.states[iconEntity] : undefined;
+
+    const placeholder =
+      this.selector.icon?.placeholder || stateObj?.attributes.icon;
+    const fallbackPath =
+      !placeholder && stateObj
+        ? domainIcon(computeDomain(iconEntity!), stateObj)
+        : undefined;
+
    return html`
      <ha-icon-picker
        .hass=${this.hass}
@@ -30,8 +47,8 @@ export class HaIconSelector extends LitElement {
        .required=${this.required}
        .disabled=${this.disabled}
        .helper=${this.helper}
-        .fallbackPath=${this.selector.icon?.fallbackPath}
-        .placeholder=${this.selector.icon?.placeholder}
+        .fallbackPath=${this.selector.icon?.fallbackPath ?? fallbackPath}
+        .placeholder=${this.selector.icon?.placeholder ?? placeholder}
        @value-changed=${this._valueChanged}
      ></ha-icon-picker>
    `;
--- a/Show More
+++ b/Show More