Add pointer cursor to ha-formfield in update card

2025-08-30 03:29:27 +00:00 · 2021-11-29 06:01:17 +00:00
132 changed files with 2448 additions and 3722 deletions
--- a/build-scripts/gulp/gather-static.js
+++ b/build-scripts/gulp/gather-static.js
@@ -79,11 +79,6 @@ function copyFonts(staticDir) {
  );
 }

-function copyQrScannerWorker(staticDir) {
-  const staticPath = genStaticPath(staticDir);
-  copyFileDir(npmPath("qr-scanner/qr-scanner-worker.min.js"), staticPath("js"));
-}
-
 function copyMapPanel(staticDir) {
  const staticPath = genStaticPath(staticDir);
  copyFileDir(
@@ -130,9 +125,6 @@ gulp.task("copy-static-app", async () => {

  // Panel assets
  copyMapPanel(staticDir);
-
-  // Qr Scanner assets
-  copyQrScannerWorker(staticDir);
 });

 gulp.task("copy-static-demo", async () => {
--- a/demo/src/stubs/energy.ts
+++ b/demo/src/stubs/energy.ts
@@ -82,9 +82,6 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
    ],
  }));
  hass.mockWS("energy/info", () => ({ cost_sensors: [] }));
-  hass.mockWS("energy/fossil_energy_consumption", ({ period }) => ({
-    start: period === "month" ? 500 : period === "day" ? 20 : 5,
-  }));
  const todayString = format(startOfToday(), "yyyy-MM-dd");
  const tomorrowString = format(startOfTomorrow(), "yyyy-MM-dd");
  hass.mockWS(
--- a/demo/src/stubs/history.ts
+++ b/demo/src/stubs/history.ts
@@ -1,10 +1,4 @@
-import {
-  addDays,
-  addHours,
-  addMonths,
-  differenceInHours,
-  endOfDay,
-} from "date-fns";
+import { addHours, differenceInHours, endOfDay } from "date-fns";
 import { HassEntity } from "home-assistant-js-websocket";
 import { StatisticValue } from "../../../src/data/history";
 import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
@@ -76,7 +70,6 @@ const generateMeanStatistics = (
  id: string,
  start: Date,
  end: Date,
-  period: "5minute" | "hour" | "day" | "month" = "hour",
  initValue: number,
  maxDiff: number
 ) => {
@@ -91,7 +84,6 @@ const generateMeanStatistics = (
    statistics.push({
      statistic_id: id,
      start: currentDate.toISOString(),
-      end: currentDate.toISOString(),
      mean,
      min: mean - Math.random() * maxDiff,
      max: mean + Math.random() * maxDiff,
@@ -100,12 +92,7 @@ const generateMeanStatistics = (
      sum: null,
    });
    lastVal = mean;
-    currentDate =
-      period === "day"
-        ? addDays(currentDate, 1)
-        : period === "month"
-        ? addMonths(currentDate, 1)
-        : addHours(currentDate, 1);
+    currentDate = addHours(currentDate, 1);
  }
  return statistics;
 };
@@ -114,7 +101,6 @@ const generateSumStatistics = (
  id: string,
  start: Date,
  end: Date,
-  period: "5minute" | "hour" | "day" | "month" = "hour",
  initValue: number,
  maxDiff: number
 ) => {
@@ -129,7 +115,6 @@ const generateSumStatistics = (
    statistics.push({
      statistic_id: id,
      start: currentDate.toISOString(),
-      end: currentDate.toISOString(),
      mean: null,
      min: null,
      max: null,
@@ -137,12 +122,7 @@ const generateSumStatistics = (
      state: initValue + sum,
      sum,
    });
-    currentDate =
-      period === "day"
-        ? addDays(currentDate, 1)
-        : period === "month"
-        ? addMonths(currentDate, 1)
-        : addHours(currentDate, 1);
+    currentDate = addHours(currentDate, 1);
  }
  return statistics;
 };
@@ -151,7 +131,6 @@ const generateCurvedStatistics = (
  id: string,
  start: Date,
  end: Date,
-  _period: "5minute" | "hour" | "day" | "month" = "hour",
  initValue: number,
  maxDiff: number,
  metered: boolean
@@ -170,7 +149,6 @@ const generateCurvedStatistics = (
    statistics.push({
      statistic_id: id,
      start: currentDate.toISOString(),
-      end: currentDate.toISOString(),
      mean: null,
      min: null,
      max: null,
@@ -189,38 +167,11 @@ const generateCurvedStatistics = (

 const statisticsFunctions: Record<
  string,
-  (
-    id: string,
-    start: Date,
-    end: Date,
-    period: "5minute" | "hour" | "day" | "month"
-  ) => StatisticValue[]
+  (id: string, start: Date, end: Date) => StatisticValue[]
 > = {
-  "sensor.energy_consumption_tarif_1": (
-    id: string,
-    start: Date,
-    end: Date,
-    period = "hour"
-  ) => {
-    if (period !== "hour") {
-      return generateSumStatistics(
-        id,
-        start,
-        end,
-        period,
-        0,
-        period === "day" ? 17 : 504
-      );
-    }
+  "sensor.energy_consumption_tarif_1": (id: string, start: Date, end: Date) => {
    const morningEnd = new Date(start.getTime() + 10 * 60 * 60 * 1000);
-    const morningLow = generateSumStatistics(
-      id,
-      start,
-      morningEnd,
-      period,
-      0,
-      0.7
-    );
+    const morningLow = generateSumStatistics(id, start, morningEnd, 0, 0.7);
    const eveningStart = new Date(start.getTime() + 20 * 60 * 60 * 1000);
    const morningFinalVal = morningLow.length
      ? morningLow[morningLow.length - 1].sum!
@@ -229,7 +180,6 @@ const statisticsFunctions: Record<
      id,
      morningEnd,
      eveningStart,
-      period,
      morningFinalVal,
      0
    );
@@ -237,71 +187,39 @@ const statisticsFunctions: Record<
      id,
      eveningStart,
      end,
-      period,
      morningFinalVal,
      0.7
    );
    return [...morningLow, ...empty, ...eveningLow];
  },
-  "sensor.energy_consumption_tarif_2": (
-    id: string,
-    start: Date,
-    end: Date,
-    period = "hour"
-  ) => {
-    if (period !== "hour") {
-      return generateSumStatistics(
-        id,
-        start,
-        end,
-        period,
-        0,
-        period === "day" ? 17 : 504
-      );
-    }
+  "sensor.energy_consumption_tarif_2": (id: string, start: Date, end: Date) => {
    const morningEnd = new Date(start.getTime() + 9 * 60 * 60 * 1000);
    const eveningStart = new Date(start.getTime() + 20 * 60 * 60 * 1000);
    const highTarif = generateSumStatistics(
      id,
      morningEnd,
      eveningStart,
-      period,
      0,
      0.3
    );
    const highTarifFinalVal = highTarif.length
      ? highTarif[highTarif.length - 1].sum!
      : 0;
-    const morning = generateSumStatistics(id, start, morningEnd, period, 0, 0);
+    const morning = generateSumStatistics(id, start, morningEnd, 0, 0);
    const evening = generateSumStatistics(
      id,
      eveningStart,
      end,
-      period,
      highTarifFinalVal,
      0
    );
    return [...morning, ...highTarif, ...evening];
  },
-  "sensor.energy_production_tarif_1": (id, start, end, period = "hour") =>
-    generateSumStatistics(id, start, end, period, 0, 0),
-  "sensor.energy_production_tarif_1_compensation": (
-    id,
-    start,
-    end,
-    period = "hour"
-  ) => generateSumStatistics(id, start, end, period, 0, 0),
-  "sensor.energy_production_tarif_2": (id, start, end, period = "hour") => {
-    if (period !== "hour") {
-      return generateSumStatistics(
-        id,
-        start,
-        end,
-        period,
-        0,
-        period === "day" ? 17 : 504
-      );
-    }
+  "sensor.energy_production_tarif_1": (id, start, end) =>
+    generateSumStatistics(id, start, end, 0, 0),
+  "sensor.energy_production_tarif_1_compensation": (id, start, end) =>
+    generateSumStatistics(id, start, end, 0, 0),
+  "sensor.energy_production_tarif_2": (id, start, end) => {
    const productionStart = new Date(start.getTime() + 9 * 60 * 60 * 1000);
    const productionEnd = new Date(start.getTime() + 21 * 60 * 60 * 1000);
    const dayEnd = new Date(endOfDay(productionEnd));
@@ -309,7 +227,6 @@ const statisticsFunctions: Record<
      id,
      productionStart,
      productionEnd,
-      period,
      0,
      0.15,
      true
@@ -317,43 +234,18 @@ const statisticsFunctions: Record<
    const productionFinalVal = production.length
      ? production[production.length - 1].sum!
      : 0;
-    const morning = generateSumStatistics(
-      id,
-      start,
-      productionStart,
-      period,
-      0,
-      0
-    );
+    const morning = generateSumStatistics(id, start, productionStart, 0, 0);
    const evening = generateSumStatistics(
      id,
      productionEnd,
      dayEnd,
-      period,
      productionFinalVal,
      0
    );
-    const rest = generateSumStatistics(
-      id,
-      dayEnd,
-      end,
-      period,
-      productionFinalVal,
-      1
-    );
+    const rest = generateSumStatistics(id, dayEnd, end, productionFinalVal, 1);
    return [...morning, ...production, ...evening, ...rest];
  },
-  "sensor.solar_production": (id, start, end, period = "hour") => {
-    if (period !== "hour") {
-      return generateSumStatistics(
-        id,
-        start,
-        end,
-        period,
-        0,
-        period === "day" ? 17 : 504
-      );
-    }
+  "sensor.solar_production": (id, start, end) => {
    const productionStart = new Date(start.getTime() + 7 * 60 * 60 * 1000);
    const productionEnd = new Date(start.getTime() + 23 * 60 * 60 * 1000);
    const dayEnd = new Date(endOfDay(productionEnd));
@@ -361,7 +253,6 @@ const statisticsFunctions: Record<
      id,
      productionStart,
      productionEnd,
-      period,
      0,
      0.3,
      true
@@ -369,32 +260,19 @@ const statisticsFunctions: Record<
    const productionFinalVal = production.length
      ? production[production.length - 1].sum!
      : 0;
-    const morning = generateSumStatistics(
-      id,
-      start,
-      productionStart,
-      period,
-      0,
-      0
-    );
+    const morning = generateSumStatistics(id, start, productionStart, 0, 0);
    const evening = generateSumStatistics(
      id,
      productionEnd,
      dayEnd,
-      period,
      productionFinalVal,
      0
    );
-    const rest = generateSumStatistics(
-      id,
-      dayEnd,
-      end,
-      period,
-      productionFinalVal,
-      2
-    );
+    const rest = generateSumStatistics(id, dayEnd, end, productionFinalVal, 2);
    return [...morning, ...production, ...evening, ...rest];
  },
+  "sensor.grid_fossil_fuel_percentage": (id, start, end) =>
+    generateMeanStatistics(id, start, end, 35, 1.3),
 };

 export const mockHistory = (mockHass: MockHomeAssistant) => {
@@ -469,7 +347,7 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {
  mockHass.mockWS("history/list_statistic_ids", () => []);
  mockHass.mockWS(
    "history/statistics_during_period",
-    ({ statistic_ids, start_time, end_time, period }, hass) => {
+    ({ statistic_ids, start_time, end_time }, hass) => {
      const start = new Date(start_time);
      const end = end_time ? new Date(end_time) : new Date();

@@ -477,7 +355,7 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {

      statistic_ids.forEach((id: string) => {
        if (id in statisticsFunctions) {
-          statistics[id] = statisticsFunctions[id](id, start, end, period);
+          statistics[id] = statisticsFunctions[id](id, start, end);
        } else {
          const entityState = hass.states[id];
          const state = entityState ? Number(entityState.state) : 1;
@@ -487,7 +365,6 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {
                  id,
                  start,
                  end,
-                  period,
                  state,
                  state * (state > 80 ? 0.01 : 0.05)
                )
@@ -495,7 +372,6 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {
                  id,
                  start,
                  end,
-                  period,
                  state,
                  state * (state > 80 ? 0.05 : 0.1)
                );
--- a/gallery/src/components/demo-black-white-row.ts
+++ b/gallery/src/components/demo-black-white-row.ts
@@ -52,13 +52,17 @@ class DemoBlackWhiteRow extends LitElement {

  firstUpdated(changedProps) {
    super.firstUpdated(changedProps);
-    applyThemesOnElement(this.shadowRoot!.querySelector(".dark"), {
-      default_theme: "default",
-      default_dark_theme: "default",
-      themes: {},
-      darkMode: true,
-      theme: "default",
-    });
+    applyThemesOnElement(
+      this.shadowRoot!.querySelector(".dark"),
+      {
+        default_theme: "default",
+        default_dark_theme: "default",
+        themes: {},
+        darkMode: false,
+      },
+      "default",
+      { dark: true }
+    );
  }

  handleSubmit(ev) {
--- a/gallery/src/demos/demo-ha-alert.ts
+++ b/gallery/src/demos/demo-ha-alert.ts
@@ -159,13 +159,17 @@ export class DemoHaAlert extends LitElement {

  firstUpdated(changedProps) {
    super.firstUpdated(changedProps);
-    applyThemesOnElement(this.shadowRoot!.querySelector(".dark"), {
-      default_theme: "default",
-      default_dark_theme: "default",
-      themes: {},
-      darkMode: true,
-      theme: "default",
-    });
+    applyThemesOnElement(
+      this.shadowRoot!.querySelector(".dark"),
+      {
+        default_theme: "default",
+        default_dark_theme: "default",
+        themes: {},
+        darkMode: false,
+      },
+      "default",
+      { dark: true }
+    );
  }

  static get styles() {
--- a/gallery/src/demos/demo-ha-faded.ts
+++ b/gallery/src/demos/demo-ha-faded.ts
@@ -1,88 +0,0 @@
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement } from "lit/decorators";
-import "../../../src/components/ha-card";
-import "../../../src/components/ha-faded";
-import "../../../src/components/ha-markdown";
-
-const LONG_TEXT = `
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc laoreet velit ut elit volutpat, eget ultrices odio lacinia. In imperdiet malesuada est, nec sagittis metus ultricies quis. Sed nisl ex, convallis porttitor ante quis, hendrerit tristique justo. Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque sed consequat risus. Suspendisse facilisis ligula a odio consectetur condimentum. Curabitur vehicula elit nec augue mollis, et volutpat massa dictum.
-
-Nam pellentesque auctor rutrum. Suspendisse elit est, sodales vel diam nec, porttitor faucibus massa. Ut pretium ac orci eu pharetra. Praesent in nibh at magna viverra rutrum eu vitae tortor. Etiam eget sem ex. Fusce tristique odio nec lacus mattis, vitae tempor nunc malesuada. Maecenas faucibus magna vel libero maximus egestas. Vestibulum luctus semper velit, in lobortis risus tempus non. Curabitur bibendum ornare commodo. Quisque commodo neque sit amet tincidunt lacinia. Proin elementum ante velit, eu congue nulla semper quis. Pellentesque consequat vel nunc at scelerisque. Mauris sit amet venenatis diam, blandit viverra leo. Integer commodo laoreet orci.
-
-Curabitur ipsum tortor, sodales ut augue sed, commodo porttitor libero. Pellentesque molestie vitae mi consectetur tempor. In sed lectus consequat, lobortis neque non, semper ipsum. Etiam eget ex et nibh sagittis pulvinar lacinia ac mauris. Aenean ligula eros, viverra ac nibh at, venenatis semper quam. Sed interdum ligula sit amet massa tincidunt tincidunt. Suspendisse potenti. Aliquam egestas facilisis est, sed faucibus erat scelerisque id. Duis dolor quam, viverra vitae orci euismod, laoreet pellentesque justo. Nunc malesuada non erat at ullamcorper. Mauris eget posuere odio. Vestibulum turpis nunc, pharetra eget ante in, feugiat mollis justo. Proin porttitor, diam nec vulputate pretium, tellus arcu rhoncus turpis, a blandit nisi nulla quis arcu. Nunc ac ullamcorper ligula, nec facilisis leo.
-
-In vitae eros sollicitudin, iaculis ex eget, egestas orci. Etiam sed pretium lorem. Nam nisi enim, consectetur sit amet semper ac, semper pharetra diam. In pulvinar neque sapien, ac ullamcorper est lacinia a. Etiam tincidunt velit sed diam malesuada, eu ornare ex consectetur. Phasellus in imperdiet tellus. Sed bibendum, dui sit amet fringilla aliquet, enim odio sollicitudin lorem, vel semper turpis mauris vel mauris. Aenean congue magna ac massa cursus, in dictum orci commodo. Pellentesque mollis velit in sollicitudin tincidunt. Vestibulum et efficitur nulla.
-
-Quisque posuere, velit sed porttitor dapibus, neque augue fringilla felis, eu luctus nisi nisl nec ipsum. Curabitur pellentesque ac lectus eget ultricies. Vestibulum est dolor, lacinia pharetra vulputate a, facilisis a magna. Nam vitae arcu nibh. Praesent finibus blandit ante, ac gravida ex mollis eget. Donec quam est, pulvinar vitae neque ut, bibendum aliquam erat. Nullam mollis arcu at sem tincidunt, in tristique lectus facilisis. Aenean ut lacus vel nisl finibus iaculis non a turpis. Integer eget ipsum ante. Donec nunc neque, vestibulum ac magna ac, posuere scelerisque dui. Pellentesque massa nibh, rhoncus id dolor quis, placerat posuere turpis. Donec aliquet augue nisi, eu finibus dui auctor et. Vestibulum eu varius lorem. Quisque lectus ante, malesuada pretium risus eget, interdum mattis enim.
-`;
-
-const SMALL_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
-
-@customElement("demo-ha-faded")
-export class DemoHaFaded extends LitElement {
-  protected render(): TemplateResult {
-    return html`
-      <ha-card header="ha-faded demo">
-        <div class="card-content">
-          <h3>Long text directly as slotted content</h3>
-          <ha-faded>${LONG_TEXT}</ha-faded>
-          <h3>Long text with slotted element</h3>
-          <ha-faded><span>${LONG_TEXT}</span></ha-faded>
-          <h3>No text</h3>
-          <ha-faded><span></span></ha-faded>
-          <h3>Smal text</h3>
-          <ha-faded><span>${SMALL_TEXT}</span></ha-faded>
-          <h3>Long text in markdown</h3>
-          <ha-faded>
-            <ha-markdown .content=${LONG_TEXT}> </ha-markdown>
-          </ha-faded>
-          <h3>Missing 1px from hiding</h3>
-          <ha-faded faded-height="87">
-            <span>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc
-              laoreet velit ut elit volutpat, eget ultrices odio lacinia. In
-              imperdiet malesuada est, nec sagittis metus ultricies quis. Sed
-              nisl ex, convallis porttitor ante quis, hendrerit tristique justo.
-              Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque
-              sed consequat risus. Suspendisse facilisis ligula a odio
-              consectetur condimentum. Curabitur vehicula elit nec augue mollis,
-              et volutpat massa dictum. Nam pellentesque auctor rutrum.
-              Suspendisse elit est, sodales vel diam nec, porttitor faucibus
-              massa. Ut pretium ac orci eu pharetra.
-            </span>
-          </ha-faded>
-          <h3>1px over hiding point</h3>
-          <ha-faded faded-height="85">
-            <span>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc
-              laoreet velit ut elit volutpat, eget ultrices odio lacinia. In
-              imperdiet malesuada est, nec sagittis metus ultricies quis. Sed
-              nisl ex, convallis porttitor ante quis, hendrerit tristique justo.
-              Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque
-              sed consequat risus. Suspendisse facilisis ligula a odio
-              consectetur condimentum. Curabitur vehicula elit nec augue mollis,
-              et volutpat massa dictum. Nam pellentesque auctor rutrum.
-              Suspendisse elit est, sodales vel diam nec, porttitor faucibus
-              massa. Ut pretium ac orci eu pharetra.
-            </span>
-          </ha-faded>
-        </div>
-      </ha-card>
-    `;
-  }
-
-  static get styles() {
-    return css`
-      ha-card {
-        max-width: 600px;
-        margin: 24px auto;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "demo-ha-faded": DemoHaFaded;
-  }
-}
--- a/gallery/src/demos/demo-more-info-cover.ts
+++ b/gallery/src/demos/demo-more-info-cover.ts
@@ -1,164 +0,0 @@
-import { html, LitElement, PropertyValues, TemplateResult } from "lit";
-import { customElement, property, query } from "lit/decorators";
-import "../../../src/components/ha-card";
-import {
-  SUPPORT_OPEN,
-  SUPPORT_STOP,
-  SUPPORT_CLOSE,
-  SUPPORT_SET_POSITION,
-  SUPPORT_OPEN_TILT,
-  SUPPORT_STOP_TILT,
-  SUPPORT_CLOSE_TILT,
-  SUPPORT_SET_TILT_POSITION,
-} from "../../../src/data/cover";
-import "../../../src/dialogs/more-info/more-info-content";
-import { getEntity } from "../../../src/fake_data/entity";
-import {
-  MockHomeAssistant,
-  provideHass,
-} from "../../../src/fake_data/provide_hass";
-import "../components/demo-more-infos";
-
-const ENTITIES = [
-  getEntity("cover", "position_buttons", "on", {
-    friendly_name: "Position Buttons",
-    supported_features: SUPPORT_OPEN + SUPPORT_STOP + SUPPORT_CLOSE,
-  }),
-  getEntity("cover", "position_slider_half", "on", {
-    friendly_name: "Position Half-Open",
-    supported_features:
-      SUPPORT_OPEN + SUPPORT_STOP + SUPPORT_CLOSE + SUPPORT_SET_POSITION,
-    current_position: 50,
-  }),
-  getEntity("cover", "position_slider_open", "on", {
-    friendly_name: "Position Open",
-    supported_features:
-      SUPPORT_OPEN + SUPPORT_STOP + SUPPORT_CLOSE + SUPPORT_SET_POSITION,
-    current_position: 100,
-  }),
-  getEntity("cover", "position_slider_closed", "on", {
-    friendly_name: "Position Closed",
-    supported_features:
-      SUPPORT_OPEN + SUPPORT_STOP + SUPPORT_CLOSE + SUPPORT_SET_POSITION,
-    current_position: 0,
-  }),
-  getEntity("cover", "tilt_buttons", "on", {
-    friendly_name: "Tilt Buttons",
-    supported_features:
-      SUPPORT_OPEN_TILT + SUPPORT_STOP_TILT + SUPPORT_CLOSE_TILT,
-  }),
-  getEntity("cover", "tilt_slider_half", "on", {
-    friendly_name: "Tilt Half-Open",
-    supported_features:
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
-    current_tilt_position: 50,
-  }),
-  getEntity("cover", "tilt_slider_open", "on", {
-    friendly_name: "Tilt Open",
-    supported_features:
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
-    current_tilt_position: 100,
-  }),
-  getEntity("cover", "tilt_slider_closed", "on", {
-    friendly_name: "Tilt Closed",
-    supported_features:
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
-    current_tilt_position: 0,
-  }),
-  getEntity("cover", "position_slider_tilt_slider", "on", {
-    friendly_name: "Both Sliders",
-    supported_features:
-      SUPPORT_OPEN +
-      SUPPORT_STOP +
-      SUPPORT_CLOSE +
-      SUPPORT_SET_POSITION +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
-    current_position: 30,
-    current_tilt_position: 70,
-  }),
-  getEntity("cover", "position_tilt_slider", "on", {
-    friendly_name: "Position & Tilt Slider",
-    supported_features:
-      SUPPORT_OPEN +
-      SUPPORT_STOP +
-      SUPPORT_CLOSE +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
-    current_tilt_position: 70,
-  }),
-  getEntity("cover", "position_slider_tilt", "on", {
-    friendly_name: "Position Slider & Tilt",
-    supported_features:
-      SUPPORT_OPEN +
-      SUPPORT_STOP +
-      SUPPORT_CLOSE +
-      SUPPORT_SET_POSITION +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT,
-    current_position: 30,
-  }),
-  getEntity("cover", "position_slider_only_tilt_slider", "on", {
-    friendly_name: "Position Slider Only & Tilt Buttons",
-    supported_features:
-      SUPPORT_SET_POSITION +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT,
-    current_position: 30,
-  }),
-  getEntity("cover", "position_slider_only_tilt", "on", {
-    friendly_name: "Position Slider Only & Tilt",
-    supported_features:
-      SUPPORT_SET_POSITION +
-      SUPPORT_OPEN_TILT +
-      SUPPORT_STOP_TILT +
-      SUPPORT_CLOSE_TILT +
-      SUPPORT_SET_TILT_POSITION,
-    current_position: 30,
-    current_tilt_position: 70,
-  }),
-];
-
-@customElement("demo-more-info-cover")
-class DemoMoreInfoCover extends LitElement {
-  @property() public hass!: MockHomeAssistant;
-
-  @query("demo-more-infos") private _demoRoot!: HTMLElement;
-
-  protected render(): TemplateResult {
-    return html`
-      <demo-more-infos
-        .hass=${this.hass}
-        .entities=${ENTITIES.map((ent) => ent.entityId)}
-      ></demo-more-infos>
-    `;
-  }
-
-  protected firstUpdated(changedProperties: PropertyValues) {
-    super.firstUpdated(changedProperties);
-    const hass = provideHass(this._demoRoot);
-    hass.updateTranslations(null, "en");
-    hass.addEntities(ENTITIES);
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "demo-more-info-cover": DemoMoreInfoCover;
-  }
-}
--- a/hassio/src/backups/hassio-backups.ts
+++ b/hassio/src/backups/hassio-backups.ts
@@ -173,8 +173,7 @@ export class HassioBackups extends LitElement {
        clickable
        selectable
        hasFab
-        .mainPage=${!atLeastVersion(this.hass.config.version, 2021, 12)}
-        back-path="/config"
+        main-page
        supervisor
      >
        <ha-button-menu
--- a/hassio/src/dashboard/hassio-dashboard.ts
+++ b/hassio/src/dashboard/hassio-dashboard.ts
@@ -29,20 +29,16 @@ class HassioDashboard extends LitElement {
        .narrow=${this.narrow}
        .route=${this.route}
        .tabs=${supervisorTabs(this.hass)}
-        .mainPage=${!atLeastVersion(this.hass.config.version, 2021, 12)}
-        back-path="/config"
+        main-page
        supervisor
        hasFab
      >
        <span slot="header">
-          ${this.supervisor.localize(
-            atLeastVersion(this.hass.config.version, 2021, 12)
-              ? "panel.addons"
-              : "panel.dashboard"
-          )}
+          ${this.supervisor.localize("panel.dashboard")}
        </span>
        <div class="content">
-          ${!atLeastVersion(this.hass.config.version, 2021, 12)
+          ${this.hass.config.version.includes("dev") ||
+          !atLeastVersion(this.hass.config.version, 2021, 12)
            ? html`
                <hassio-update
                  .hass=${this.hass}
--- a/hassio/src/system/hassio-system.ts
+++ b/hassio/src/system/hassio-system.ts
@@ -1,6 +1,5 @@
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
-import { atLeastVersion } from "../../../src/common/config/version";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import "../../../src/layouts/hass-tabs-subpage";
 import { haStyle } from "../../../src/resources/styles";
@@ -30,8 +29,7 @@ class HassioSystem extends LitElement {
        .narrow=${this.narrow}
        .route=${this.route}
        .tabs=${supervisorTabs(this.hass)}
-        .mainPage=${!atLeastVersion(this.hass.config.version, 2021, 12)}
-        back-path="/config"
+        main-page
        supervisor
      >
        <span slot="header"> ${this.supervisor.localize("panel.system")} </span>
--- a/hassio/src/update-available/update-available-card.ts
+++ b/hassio/src/update-available/update-available-card.ts
@@ -16,7 +16,7 @@ import "../../../src/components/ha-alert";
 import "../../../src/components/ha-button-menu";
 import "../../../src/components/ha-card";
 import "../../../src/components/ha-checkbox";
-import "../../../src/components/ha-faded";
+import "../../../src/components/ha-expansion-panel";
 import "../../../src/components/ha-formfield";
 import "../../../src/components/ha-icon-button";
 import "../../../src/components/ha-markdown";
@@ -136,10 +136,10 @@ class UpdateAvailableCard extends LitElement {
            ? html`
                ${this._changelogContent
                  ? html`
-                      <ha-faded>
+                      <ha-expansion-panel header="Changelog" outlined>
                        <ha-markdown .content=${this._changelogContent}>
                        </ha-markdown>
-                      </ha-faded>
+                      </ha-expansion-panel>
                    `
                  : ""}
                <div class="versions">
@@ -194,7 +194,7 @@ class UpdateAvailableCard extends LitElement {
                <ha-progress-button
                  .disabled=${!this._version ||
                  (this._shouldCreateBackup &&
-                    this.supervisor.info?.state !== "running")}
+                    this.supervisor.info.state !== "running")}
                  @click=${this._update}
                  raised
                >
@@ -224,11 +224,7 @@ class UpdateAvailableCard extends LitElement {
  }

  get _shouldCreateBackup(): boolean {
-    const checkbox = this.shadowRoot?.querySelector("ha-checkbox");
-    if (checkbox) {
-      return checkbox.checked;
-    }
-    return true;
+    return this.shadowRoot?.querySelector("ha-checkbox")?.checked || true;
  }

  get _version(): string {
@@ -391,6 +387,9 @@ class UpdateAvailableCard extends LitElement {
      ha-markdown {
        padding-bottom: 8px;
      }
+      ha-formfield {
+        cursor: pointer;
+      }
    `;
  }
 }
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
    "fuse.js": "^6.0.0",
    "google-timezones-json": "^1.0.2",
    "hls.js": "^1.0.11",
-    "home-assistant-js-websocket": "^5.11.3",
+    "home-assistant-js-websocket": "^5.11.1",
    "idb-keyval": "^5.1.3",
    "intl-messageformat": "^9.9.1",
    "js-yaml": "^4.1.0",
@@ -115,7 +115,6 @@
    "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",
    "resize-observer-polyfill": "^1.5.1",
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages

 setup(
    name="home-assistant-frontend",
-    version="20211203.0",
+    version="20211123.0",
    description="The Home Assistant frontend",
    url="https://github.com/home-assistant/frontend",
    author="The Home Assistant Authors",
--- a/src/auth/ha-authorize.ts
+++ b/src/auth/ha-authorize.ts
@@ -101,13 +101,17 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
    this._fetchAuthProviders();

    if (matchMedia("(prefers-color-scheme: dark)").matches) {
-      applyThemesOnElement(document.documentElement, {
-        default_theme: "default",
-        default_dark_theme: null,
-        themes: {},
-        darkMode: true,
-        theme: "default",
-      });
+      applyThemesOnElement(
+        document.documentElement,
+        {
+          default_theme: "default",
+          default_dark_theme: null,
+          themes: {},
+          darkMode: false,
+        },
+        "default",
+        { dark: true }
+      );
    }

    if (!this.redirectUri) {
--- a/src/common/color/colors.ts
+++ b/src/common/color/colors.ts
@@ -61,14 +61,3 @@ export const COLORS = [
 export function getColorByIndex(index: number) {
  return COLORS[index % COLORS.length];
 }
-
-export function getGraphColorByIndex(
-  index: number,
-  style: CSSStyleDeclaration
-) {
-  // The CSS vars for the colors use range 1..n, so we need to adjust the index from the internal 0..n color index range.
-  return (
-    style.getPropertyValue(`--graph-color-${index + 1}`) ||
-    getColorByIndex(index)
-  );
-}
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -188,9 +188,8 @@ export const DOMAINS_WITH_MORE_INFO = [
  "weather",
 ];

-/** Domains that do not show the default more info dialog content (e.g. the attribute section)
- *  and do not have a separate more info (so not in DOMAINS_WITH_MORE_INFO). */
-export const DOMAINS_HIDE_DEFAULT_MORE_INFO = [
+/** Domains that show no more info dialog. */
+export const DOMAINS_HIDE_MORE_INFO = [
  "input_number",
  "input_select",
  "input_text",
@@ -199,31 +198,6 @@ export const DOMAINS_HIDE_DEFAULT_MORE_INFO = [
  "select",
 ];

-/** Domains that render an input element instead of a text value when rendered in a row.
- *  Those rows should then not show a cursor pointer when hovered (which would normally
- *  be the default) unless the element itself enforces it (e.g. a button). Also those elements
- *  should not act as a click target to open the more info dialog (the row name and state icon
- *  still do of course) as the click might instead e.g. activate the input field that this row shows.
- */
-export const DOMAINS_INPUT_ROW = [
-  "cover",
-  "fan",
-  "humidifier",
-  "input_boolean",
-  "input_datetime",
-  "input_number",
-  "input_select",
-  "input_text",
-  "light",
-  "lock",
-  "media_player",
-  "number",
-  "scene",
-  "script",
-  "select",
-  "switch",
-];
-
 /** Domains that should have the history hidden in the more info dialog. */
 export const DOMAINS_MORE_INFO_NO_HISTORY = ["camera", "configurator", "scene"];

--- a/src/common/dom/apply_themes_on_element.ts
+++ b/src/common/dom/apply_themes_on_element.ts
@@ -23,9 +23,9 @@ let PROCESSED_THEMES: Record<string, ProcessedTheme> = {};
 * Apply a theme to an element by setting the CSS variables on it.
 *
 * element: Element to apply theme on.
- * themes: HASS theme information (e.g. active dark mode and globally active theme name).
- * selectedTheme: Selected theme (used to override the globally active theme for this element).
- * themeSettings: Additional settings such as selected colors.
+ * themes: HASS theme information.
+ * selectedTheme: Selected theme.
+ * themeSettings: Settings such as selected dark mode and colors.
 */
 export const applyThemesOnElement = (
  element,
@@ -33,33 +33,31 @@ export const applyThemesOnElement = (
  selectedTheme?: string,
  themeSettings?: Partial<HomeAssistant["selectedTheme"]>
 ) => {
-  // If there is no explicitly desired theme provided, we automatically
-  // use the active one from `themes`.
-  const themeToApply = selectedTheme || themes.theme;
-
-  // If there is no explicitly desired dark mode provided, we automatically
-  // use the active one from `themes`.
-  const darkMode =
-    themeSettings && themeSettings?.dark !== undefined
-      ? themeSettings?.dark
-      : themes.darkMode;
-
-  let cacheKey = themeToApply;
+  let cacheKey = selectedTheme;
  let themeRules: Partial<ThemeVars> = {};

-  if (darkMode) {
+  // If there is no explicitly desired dark mode provided, we automatically
+  // use the active one from hass.themes.
+  if (!themeSettings || themeSettings?.dark === undefined) {
+    themeSettings = {
+      ...themeSettings,
+      dark: themes.darkMode,
+    };
+  }
+
+  if (themeSettings.dark) {
    cacheKey = `${cacheKey}__dark`;
    themeRules = { ...darkStyles };
  }

-  if (themeToApply === "default") {
+  if (selectedTheme === "default") {
    // Determine the primary and accent colors from the current settings.
    // Fallbacks are implicitly the HA default blue and orange or the
    // derived "darkStyles" values, depending on the light vs dark mode.
-    const primaryColor = themeSettings?.primaryColor;
-    const accentColor = themeSettings?.accentColor;
+    const primaryColor = themeSettings.primaryColor;
+    const accentColor = themeSettings.accentColor;

-    if (darkMode && primaryColor) {
+    if (themeSettings.dark && primaryColor) {
      themeRules["app-header-background-color"] = hexBlend(
        primaryColor,
        "#121212",
@@ -100,17 +98,17 @@ export const applyThemesOnElement = (
  // Custom theme logic (not relevant for default theme, since it would override
  // the derived calculations from above)
  if (
-    themeToApply &&
-    themeToApply !== "default" &&
-    themes.themes[themeToApply]
+    selectedTheme &&
+    selectedTheme !== "default" &&
+    themes.themes[selectedTheme]
  ) {
    // Apply theme vars that are relevant for all modes (but extract the "modes" section first)
-    const { modes, ...baseThemeRules } = themes.themes[themeToApply];
+    const { modes, ...baseThemeRules } = themes.themes[selectedTheme];
    themeRules = { ...themeRules, ...baseThemeRules };

    // Apply theme vars for the specific mode if available
    if (modes) {
-      if (darkMode) {
+      if (themeSettings?.dark) {
        themeRules = { ...themeRules, ...modes.dark };
      } else {
        themeRules = { ...themeRules, ...modes.light };
--- a/src/common/entity/domain_icon.ts
+++ b/src/common/entity/domain_icon.ts
@@ -1,33 +1,30 @@
 import {
  mdiAccount,
  mdiAccountArrowRight,
-  mdiAirHumidifier,
  mdiAirHumidifierOff,
+  mdiAirHumidifier,
+  mdiFlash,
  mdiBluetooth,
  mdiBluetoothConnect,
-  mdiCalendar,
-  mdiCast,
-  mdiCastConnected,
-  mdiClock,
-  mdiEmoticonDead,
-  mdiFlash,
-  mdiGestureTapButton,
  mdiLanConnect,
  mdiLanDisconnect,
-  mdiLock,
+  mdiLockOpen,
  mdiLockAlert,
  mdiLockClock,
-  mdiLockOpen,
-  mdiPackageUp,
+  mdiLock,
+  mdiCastConnected,
+  mdiCast,
+  mdiEmoticonDead,
  mdiPowerPlug,
  mdiPowerPlugOff,
-  mdiRestart,
  mdiSleep,
  mdiTimerSand,
  mdiToggleSwitch,
  mdiToggleSwitchOff,
-  mdiWeatherNight,
  mdiZWave,
+  mdiClock,
+  mdiCalendar,
+  mdiWeatherNight,
 } from "@mdi/js";
 import { HassEntity } from "home-assistant-js-websocket";
 /**
@@ -55,16 +52,6 @@ export const domainIcon = (
    case "binary_sensor":
      return binarySensorIcon(compareState, stateObj);

-    case "button":
-      switch (stateObj?.attributes.device_class) {
-        case "restart":
-          return mdiRestart;
-        case "update":
-          return mdiPackageUp;
-        default:
-          return mdiGestureTapButton;
-      }
-
    case "cover":
      return coverIcon(compareState, stateObj);

--- a/src/components/chart/ha-chart-base.ts
+++ b/src/components/chart/ha-chart-base.ts
@@ -95,7 +95,7 @@ export default class HaChartBase extends LitElement {
                      borderColor: dataset.borderColor as string,
                    })}
                  ></div>
-                  <div class="label">${dataset.label}</div>
+                  ${dataset.label}
                </li>`
              )}
            </ul>
@@ -278,9 +278,11 @@ export default class HaChartBase extends LitElement {
      }
      .chartLegend li {
        cursor: pointer;
-        display: inline-grid;
-        grid-auto-flow: column;
+        display: inline-flex;
        padding: 0 8px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
        box-sizing: border-box;
        align-items: center;
        color: var(--secondary-text-color);
@@ -288,11 +290,6 @@ export default class HaChartBase extends LitElement {
      .chartLegend .hidden {
        text-decoration: line-through;
      }
-      .chartLegend .label {
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
-      }
      .chartLegend .bullet,
      .chartTooltip .bullet {
        border-width: 1px;
--- a/src/components/chart/state-history-chart-line.ts
+++ b/src/components/chart/state-history-chart-line.ts
@@ -1,7 +1,7 @@
 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 { getColorByIndex } from "../../common/color/colors";
 import {
  formatNumber,
  numberFormatToLocale,
@@ -164,7 +164,7 @@ class StateHistoryChartLine extends LitElement {
      const pushData = (timestamp: Date, datavalues: any[] | null) => {
        if (!datavalues) return;
        if (timestamp > endTime) {
-          // Drop data points that are after the requested endTime. This could happen if
+          // Drop datapoints that are after the requested endTime. This could happen if
          // endTime is "now" and client time is not in sync with server time.
          return;
        }
@@ -190,7 +190,7 @@ class StateHistoryChartLine extends LitElement {
        color?: string
      ) => {
        if (!color) {
-          color = getGraphColorByIndex(colorIndex, computedStyles);
+          color = getColorByIndex(colorIndex);
          colorIndex++;
        }
        data.push({
--- a/src/components/chart/state-history-chart-timeline.ts
+++ b/src/components/chart/state-history-chart-timeline.ts
@@ -2,7 +2,7 @@ import type { ChartData, ChartDataset, ChartOptions } from "chart.js";
 import { HassEntity } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { getGraphColorByIndex } from "../../common/color/colors";
+import { getColorByIndex } from "../../common/color/colors";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { numberFormatToLocale } from "../../common/number/format_number";
@@ -71,7 +71,7 @@ const getColor = (
    stateColorMap.set(stateString, color);
    return color;
  }
-  const color = getGraphColorByIndex(colorIndex, computedStyles);
+  const color = getColorByIndex(colorIndex);
  colorIndex++;
  stateColorMap.set(stateString, color);
  return color;
--- a/src/components/chart/statistics-chart.ts
+++ b/src/components/chart/statistics-chart.ts
@@ -13,7 +13,7 @@ import {
  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { getGraphColorByIndex } from "../../common/color/colors";
+import { getColorByIndex } from "../../common/color/colors";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
 import { computeStateName } from "../../common/entity/compute_state_name";
 import {
@@ -59,8 +59,6 @@ class StatisticsChart extends LitElement {

  @state() private _chartOptions?: ChartOptions;

-  private _computedStyle?: CSSStyleDeclaration;
-
  protected shouldUpdate(changedProps: PropertyValues): boolean {
    return changedProps.size > 1 || !changedProps.has("hass");
  }
@@ -74,10 +72,6 @@ class StatisticsChart extends LitElement {
    }
  }

-  public firstUpdated() {
-    this._computedStyle = getComputedStyle(this);
-  }
-
  protected render(): TemplateResult {
    if (!isComponentLoaded(this.hass, "history")) {
      return html`<div class="info">
@@ -267,7 +261,7 @@ class StatisticsChart extends LitElement {
      ) => {
        if (!dataValues) return;
        if (timestamp > endTime) {
-          // Drop data points that are after the requested endTime. This could happen if
+          // Drop datapoints that are after the requested endTime. This could happen if
          // endTime is "now" and client time is not in sync with server time.
          return;
        }
@@ -286,7 +280,7 @@ class StatisticsChart extends LitElement {
        prevValues = dataValues;
      };

-      const color = getGraphColorByIndex(colorIndex, this._computedStyle!);
+      const color = getColorByIndex(colorIndex);
      colorIndex++;

      const statTypes: this["statTypes"] = [];
--- a/src/components/ha-alert.ts
+++ b/src/components/ha-alert.ts
@@ -121,7 +121,6 @@ class HaAlert extends LitElement {
    }
    .main-content {
      overflow-wrap: anywhere;
-      word-break: break-word;
      margin-left: 8px;
      margin-right: 0;
    }
--- a/src/components/ha-blueprint-picker.ts
+++ b/src/components/ha-blueprint-picker.ts
@@ -23,10 +23,6 @@ class HaBluePrintPicker extends LitElement {

  @property({ type: Boolean }) public disabled = false;

-  public open() {
-    this.shadowRoot!.querySelector("paper-dropdown-menu-light")!.open();
-  }
-
  private _processedBlueprints = memoizeOne((blueprints?: Blueprints) => {
    if (!blueprints) {
      return [];
--- a/src/components/ha-chip.ts
+++ b/src/components/ha-chip.ts
@@ -14,17 +14,11 @@ import { customElement, property } from "lit/decorators";
 export class HaChip extends LitElement {
  @property({ type: Boolean }) public hasIcon = false;

-  @property({ type: Boolean }) public noText = false;
-
  protected render(): TemplateResult {
    return html`
      <div class="mdc-chip">
        ${this.hasIcon
-          ? html`<div
-              class="mdc-chip__icon mdc-chip__icon--leading ${this.noText
-                ? "no-text"
-                : ""}"
-            >
+          ? html`<div class="mdc-chip__icon mdc-chip__icon--leading">
              <slot name="icon"></slot>
            </div>`
          : null}
@@ -57,10 +51,6 @@ export class HaChip extends LitElement {
        --mdc-icon-size: 20px;
        color: var(--ha-chip-icon-color, var(--ha-chip-text-color));
      }
-      .mdc-chip
-        .mdc-chip__icon--leading:not(.mdc-chip__icon--leading-hidden).no-text {
-        margin-right: -4px;
-      }
    `;
  }
 }
--- a/src/components/ha-cover-controls.ts
+++ b/src/components/ha-cover-controls.ts
@@ -1,30 +1,39 @@
 import { mdiStop } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
+import type { HassEntity } from "home-assistant-js-websocket";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  TemplateResult,
+} from "lit";
+import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { computeCloseIcon, computeOpenIcon } from "../common/entity/cover_icon";
-import {
-  CoverEntity,
-  isClosing,
-  isFullyClosed,
-  isFullyOpen,
-  isOpening,
-  supportsClose,
-  supportsOpen,
-  supportsStop,
-} from "../data/cover";
 import { UNAVAILABLE } from "../data/entity";
 import type { HomeAssistant } from "../types";
+import CoverEntity from "../util/cover-model";
 import "./ha-icon-button";

@customElement("ha-cover-controls")
 class HaCoverControls extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property({ attribute: false }) public stateObj!: CoverEntity;
+  @property({ attribute: false }) public stateObj!: HassEntity;
+
+  @state() private _entityObj?: CoverEntity;
+
+  public willUpdate(changedProperties: PropertyValues): void {
+    super.willUpdate(changedProperties);
+
+    if (changedProperties.has("stateObj")) {
+      this._entityObj = new CoverEntity(this.hass, this.stateObj);
+    }
+  }

  protected render(): TemplateResult {
-    if (!this.stateObj) {
+    if (!this._entityObj) {
      return html``;
    }

@@ -32,7 +41,7 @@ class HaCoverControls extends LitElement {
      <div class="state">
        <ha-icon-button
          class=${classMap({
-            hidden: !supportsOpen(this.stateObj),
+            hidden: !this._entityObj.supportsOpen,
          })}
          .label=${this.hass.localize(
            "ui.dialogs.more_info_control.open_cover"
@@ -44,7 +53,7 @@ class HaCoverControls extends LitElement {
        </ha-icon-button>
        <ha-icon-button
          class=${classMap({
-            hidden: !supportsStop(this.stateObj),
+            hidden: !this._entityObj.supportsStop,
          })}
          .label=${this.hass.localize(
            "ui.dialogs.more_info_control.stop_cover"
@@ -55,7 +64,7 @@ class HaCoverControls extends LitElement {
        ></ha-icon-button>
        <ha-icon-button
          class=${classMap({
-            hidden: !supportsClose(this.stateObj),
+            hidden: !this._entityObj.supportsClose,
          })}
          .label=${this.hass.localize(
            "ui.dialogs.more_info_control.close_cover"
@@ -75,7 +84,8 @@ class HaCoverControls extends LitElement {
    }
    const assumedState = this.stateObj.attributes.assumed_state === true;
    return (
-      (isFullyOpen(this.stateObj) || isOpening(this.stateObj)) && !assumedState
+      (this._entityObj.isFullyOpen || this._entityObj.isOpening) &&
+      !assumedState
    );
  }

@@ -85,30 +95,24 @@ class HaCoverControls extends LitElement {
    }
    const assumedState = this.stateObj.attributes.assumed_state === true;
    return (
-      (isFullyClosed(this.stateObj) || isClosing(this.stateObj)) &&
+      (this._entityObj.isFullyClosed || this._entityObj.isClosing) &&
      !assumedState
    );
  }

  private _onOpenTap(ev): void {
    ev.stopPropagation();
-    this.hass.callService("cover", "open_cover", {
-      entity_id: this.stateObj.entity_id,
-    });
+    this._entityObj.openCover();
  }

  private _onCloseTap(ev): void {
    ev.stopPropagation();
-    this.hass.callService("cover", "close_cover", {
-      entity_id: this.stateObj.entity_id,
-    });
+    this._entityObj.closeCover();
  }

  private _onStopTap(ev): void {
    ev.stopPropagation();
-    this.hass.callService("cover", "stop_cover", {
-      entity_id: this.stateObj.entity_id,
-    });
+    this._entityObj.stopCover();
  }

  static get styles(): CSSResultGroup {
--- a/src/components/ha-cover-tilt-controls.ts
+++ b/src/components/ha-cover-tilt-controls.ts
@@ -1,33 +1,44 @@
 import { mdiArrowBottomLeft, mdiArrowTopRight, mdiStop } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
+import { HassEntity } from "home-assistant-js-websocket";
 import {
-  CoverEntity,
-  isFullyClosedTilt,
-  isFullyOpenTilt,
-  supportsCloseTilt,
-  supportsOpenTilt,
-  supportsStopTilt,
-} from "../data/cover";
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  TemplateResult,
+} from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { classMap } from "lit/directives/class-map";
 import { UNAVAILABLE } from "../data/entity";
 import { HomeAssistant } from "../types";
+import CoverEntity from "../util/cover-model";
 import "./ha-icon-button";

@customElement("ha-cover-tilt-controls")
 class HaCoverTiltControls extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property({ attribute: false }) stateObj!: CoverEntity;
+  @property({ attribute: false }) stateObj!: HassEntity;
+
+  @state() private _entityObj?: CoverEntity;
+
+  public willUpdate(changedProperties: PropertyValues): void {
+    super.willUpdate(changedProperties);
+
+    if (changedProperties.has("stateObj")) {
+      this._entityObj = new CoverEntity(this.hass, this.stateObj);
+    }
+  }

  protected render(): TemplateResult {
-    if (!this.stateObj) {
+    if (!this._entityObj) {
      return html``;
    }

    return html` <ha-icon-button
        class=${classMap({
-          invisible: !supportsOpenTilt(this.stateObj),
+          invisible: !this._entityObj.supportsOpenTilt,
        })}
        .label=${this.hass.localize(
          "ui.dialogs.more_info_control.open_tilt_cover"
@@ -38,7 +49,7 @@ class HaCoverTiltControls extends LitElement {
      ></ha-icon-button>
      <ha-icon-button
        class=${classMap({
-          invisible: !supportsStopTilt(this.stateObj),
+          invisible: !this._entityObj.supportsStopTilt,
        })}
        .label=${this.hass.localize("ui.dialogs.more_info_control.stop_cover")}
        .path=${mdiStop}
@@ -47,7 +58,7 @@ class HaCoverTiltControls extends LitElement {
      ></ha-icon-button>
      <ha-icon-button
        class=${classMap({
-          invisible: !supportsCloseTilt(this.stateObj),
+          invisible: !this._entityObj.supportsCloseTilt,
        })}
        .label=${this.hass.localize(
          "ui.dialogs.more_info_control.close_tilt_cover"
@@ -63,7 +74,7 @@ class HaCoverTiltControls extends LitElement {
      return true;
    }
    const assumedState = this.stateObj.attributes.assumed_state === true;
-    return isFullyOpenTilt(this.stateObj) && !assumedState;
+    return this._entityObj.isFullyOpenTilt && !assumedState;
  }

  private _computeClosedDisabled(): boolean {
@@ -71,28 +82,22 @@ class HaCoverTiltControls extends LitElement {
      return true;
    }
    const assumedState = this.stateObj.attributes.assumed_state === true;
-    return isFullyClosedTilt(this.stateObj) && !assumedState;
+    return this._entityObj.isFullyClosedTilt && !assumedState;
  }

  private _onOpenTiltTap(ev): void {
    ev.stopPropagation();
-    this.hass.callService("cover", "open_cover_tilt", {
-      entity_id: this.stateObj.entity_id,
-    });
+    this._entityObj.openCoverTilt();
  }

  private _onCloseTiltTap(ev): void {
    ev.stopPropagation();
-    this.hass.callService("cover", "close_cover_tilt", {
-      entity_id: this.stateObj.entity_id,
-    });
+    this._entityObj.closeCoverTilt();
  }

  private _onStopTiltTap(ev): void {
    ev.stopPropagation();
-    this.hass.callService("cover", "stop_cover_tilt", {
-      entity_id: this.stateObj.entity_id,
-    });
+    this._entityObj.stopCoverTilt();
  }

  static get styles(): CSSResultGroup {
--- a/src/components/ha-faded.ts
+++ b/src/components/ha-faded.ts
@@ -1,82 +0,0 @@
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { classMap } from "lit/directives/class-map";
-
-@customElement("ha-faded")
-class HaFaded extends LitElement {
-  @property({ type: Number, attribute: "faded-height" })
-  public fadedHeight = 102;
-
-  @state() _contentShown = false;
-
-  protected render(): TemplateResult {
-    return html`
-      <div
-        class="container ${classMap({ faded: !this._contentShown })}"
-        style=${!this._contentShown ? `max-height: ${this.fadedHeight}px` : ""}
-        @click=${this._showContent}
-      >
-        <slot
-          @iron-resize=${
-            // ha-markdown-element fire this when render is complete
-            this._setShowContent
-          }
-        ></slot>
-      </div>
-    `;
-  }
-
-  get _slottedHeight(): number {
-    return (
-      (
-        this.shadowRoot!.querySelector(".container")
-          ?.firstElementChild as HTMLSlotElement
-      )
-        .assignedElements()
-        .reduce(
-          (partial, element) => partial + (element as HTMLElement).offsetHeight,
-          0
-        ) || 0
-    );
-  }
-
-  private _setShowContent() {
-    const height = this._slottedHeight;
-    this._contentShown = height !== 0 && height <= this.fadedHeight + 50;
-  }
-
-  protected firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-    this._setShowContent();
-  }
-
-  private _showContent(): void {
-    this._contentShown = true;
-  }
-
-  static get styles(): CSSResultGroup {
-    return css`
-      .container {
-        display: block;
-        height: auto;
-        cursor: default;
-      }
-      .faded {
-        cursor: pointer;
-        -webkit-mask-image: linear-gradient(
-          to bottom,
-          black 25%,
-          transparent 100%
-        );
-        mask-image: linear-gradient(to bottom, black 25%, transparent 100%);
-        overflow-y: hidden;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-faded": HaFaded;
-  }
-}
--- a/src/components/ha-formfield.ts
+++ b/src/components/ha-formfield.ts
@@ -5,22 +5,6 @@ import { customElement } from "lit/decorators";
@customElement("ha-formfield")
 // @ts-expect-error
 export class HaFormfield extends Formfield {
-  protected _labelClick() {
-    const input = this.input;
-    if (input) {
-      input.focus();
-      switch (input.tagName) {
-        case "HA-CHECKBOX":
-        case "HA-RADIO":
-          (input as any).checked = !(input as any).checked;
-          break;
-        default:
-          input.click();
-          break;
-      }
-    }
-  }
-
  protected static get styles(): CSSResultGroup {
    return [
      Formfield.styles,
--- a/src/components/ha-hls-player.ts
+++ b/src/components/ha-hls-player.ts
@@ -7,11 +7,10 @@ import {
  PropertyValues,
  TemplateResult,
 } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
+import { customElement, property, query } from "lit/decorators";
 import { nextRender } from "../common/util/render-status";
 import { getExternalConfig } from "../external_app/external_config";
 import type { HomeAssistant } from "../types";
-import "./ha-alert";

 type HlsLite = Omit<
  HlsType,
@@ -42,8 +41,6 @@ class HaHLSPlayer extends LitElement {
  // don't cache this, as we remove it on disconnects
  @query("video") private _videoEl!: HTMLVideoElement;

-  @state() private _error?: string;
-
  private _hlsPolyfillInstance?: HlsLite;

  private _exoPlayer = false;
@@ -61,9 +58,6 @@ class HaHLSPlayer extends LitElement {
  }

  protected render(): TemplateResult {
-    if (this._error) {
-      return html`<ha-alert alert-type="error">${this._error}</ha-alert>`;
-    }
    return html`
      <video
        ?autoplay=${this.autoPlay}
@@ -96,8 +90,6 @@ class HaHLSPlayer extends LitElement {
  }

  private async _startHls(): Promise<void> {
-    this._error = undefined;
-
    const videoEl = this._videoEl;
    const useExoPlayerPromise = this._getUseExoPlayer();
    const masterPlaylistPromise = fetch(this.url);
@@ -117,7 +109,7 @@ class HaHLSPlayer extends LitElement {
    }

    if (!hlsSupported) {
-      this._error = this.hass.localize(
+      videoEl.innerHTML = this.hass.localize(
        "ui.components.media-browser.video_not_supported"
      );
      return;
@@ -204,44 +196,6 @@ class HaHLSPlayer extends LitElement {
    hls.on(Hls.Events.MEDIA_ATTACHED, () => {
      hls.loadSource(url);
    });
-    hls.on(Hls.Events.ERROR, (_, data: any) => {
-      if (!data.fatal) {
-        return;
-      }
-      if (data.type === Hls.ErrorTypes.NETWORK_ERROR) {
-        switch (data.details) {
-          case Hls.ErrorDetails.MANIFEST_LOAD_ERROR: {
-            let error = "Error starting stream, see logs for details";
-            if (
-              data.response !== undefined &&
-              data.response.code !== undefined
-            ) {
-              if (data.response.code >= 500) {
-                error += " (Server failure)";
-              } else if (data.response.code >= 400) {
-                error += " (Stream never started)";
-              } else {
-                error += " (" + data.response.code + ")";
-              }
-            }
-            this._error = error;
-            return;
-          }
-          case Hls.ErrorDetails.MANIFEST_LOAD_TIMEOUT:
-            this._error = "Timeout while starting stream";
-            return;
-          default:
-            this._error = "Unknown stream network error (" + data.details + ")";
-            return;
-        }
-        this._error = "Error with media stream contents (" + data.details + ")";
-      } else if (data.type === Hls.ErrorTypes.MEDIA_ERROR) {
-        this._error = "Error with media stream contents (" + data.details + ")";
-      } else {
-        this._error =
-          "Unknown error with stream (" + data.type + ", " + data.details + ")";
-      }
-    });
  }

  private async _renderHLSNative(videoEl: HTMLVideoElement, url: string) {
@@ -277,11 +231,6 @@ class HaHLSPlayer extends LitElement {
        width: 100%;
        max-height: var(--video-max-height, calc(100vh - 97px));
      }
-
-      ha-alert {
-        display: block;
-        padding: 100px 16px;
-      }
    `;
  }
 }
--- a/src/components/ha-icon-overflow-menu.ts
+++ b/src/components/ha-icon-overflow-menu.ts
@@ -1,12 +1,12 @@
-import "@material/mwc-list/mwc-list-item";
-import { mdiDotsVertical } from "@mdi/js";
-import "@polymer/paper-tooltip/paper-tooltip";
 import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
-import { HomeAssistant } from "../types";
 import "./ha-button-menu";
-import "./ha-icon-button";
+import "@material/mwc-list/mwc-list-item";
+import "@material/mwc-icon-button";
 import "./ha-svg-icon";
+import { mdiDotsVertical } from "@mdi/js";
+import { HomeAssistant } from "../types";
+import "@polymer/paper-tooltip/paper-tooltip";

 export interface IconOverflowMenuItem {
  [key: string]: any;
@@ -37,11 +37,13 @@ export class HaIconOverflowMenu extends LitElement {
              corner="BOTTOM_START"
              absolute
            >
-              <ha-icon-button
+              <mwc-icon-button
+                .title=${this.hass.localize("ui.common.menu")}
                .label=${this.hass.localize("ui.common.overflow_menu")}
-                .path=${mdiDotsVertical}
                slot="trigger"
-              ></ha-icon-button>
+              >
+                <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
+              </mwc-icon-button>

              ${this.items.map(
                (item) => html`
--- a/src/components/ha-markdown-element.ts
+++ b/src/components/ha-markdown-element.ts
@@ -24,7 +24,7 @@ class HaMarkdownElement extends ReactiveElement {

  private async _render() {
    this.innerHTML = await renderMarkdown(
-      String(this.content),
+      this.content,
      {
        breaks: this.breaks,
        gfm: true,
--- a/src/components/ha-qr-scanner.ts
+++ b/src/components/ha-qr-scanner.ts
@@ -1,162 +0,0 @@
-import "@material/mwc-list/mwc-list-item";
-import "@material/mwc-select/mwc-select";
-import type { Select } from "@material/mwc-select/mwc-select";
-import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
-import { customElement, property, query, state } from "lit/decorators";
-import type QrScanner from "qr-scanner";
-import { fireEvent } from "../common/dom/fire_event";
-import { stopPropagation } from "../common/dom/stop_propagation";
-import { LocalizeFunc } from "../common/translations/localize";
-import "./ha-alert";
-
-@customElement("ha-qr-scanner")
-class HaQrScanner extends LitElement {
-  @property() localize!: LocalizeFunc;
-
-  @state() private _cameras?: QrScanner.Camera[];
-
-  @state() private _error?: string;
-
-  private _qrScanner?: QrScanner;
-
-  private _qrNotFoundCount = 0;
-
-  @query("video", true) private _video!: HTMLVideoElement;
-
-  @query("#canvas-container", true) private _canvasContainer!: HTMLDivElement;
-
-  public disconnectedCallback(): void {
-    super.disconnectedCallback();
-    this._qrNotFoundCount = 0;
-    if (this._qrScanner) {
-      this._qrScanner.stop();
-      this._qrScanner.destroy();
-      this._qrScanner = undefined;
-    }
-    while (this._canvasContainer.lastChild) {
-      this._canvasContainer.removeChild(this._canvasContainer.lastChild);
-    }
-  }
-
-  public connectedCallback(): void {
-    super.connectedCallback();
-    if (this.hasUpdated && navigator.mediaDevices) {
-      this._loadQrScanner();
-    }
-  }
-
-  protected firstUpdated() {
-    if (navigator.mediaDevices) {
-      this._loadQrScanner();
-    }
-  }
-
-  protected updated(changedProps: PropertyValues) {
-    if (changedProps.has("_error") && this._error) {
-      fireEvent(this, "qr-code-error", { message: this._error });
-    }
-  }
-
-  protected render(): TemplateResult {
-    return html`${this._cameras && this._cameras.length > 1
-      ? html`<mwc-select
-          .label=${this.localize(
-            "ui.panel.config.zwave_js.add_node.select_camera"
-          )}
-          fixedMenuPosition
-          naturalMenuWidth
-          @closed=${stopPropagation}
-          @selected=${this._cameraChanged}
-        >
-          ${this._cameras!.map(
-            (camera) => html`
-              <mwc-list-item .value=${camera.id}>${camera.label}</mwc-list-item>
-            `
-          )}
-        </mwc-select>`
-      : ""}
-    ${this._error
-      ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
-      : ""}
-    ${navigator.mediaDevices
-      ? html`<video></video>
-          <div id="canvas-container"></div>`
-      : html`<ha-alert alert-type="warning"
-          >${!window.isSecureContext
-            ? "You can only use your camera to scan a QR core when using HTTPS."
-            : "Your browser doesn't support QR scanning."}</ha-alert
-        >`}`;
-  }
-
-  private async _loadQrScanner() {
-    const QrScanner = (await import("qr-scanner")).default;
-    if (!(await QrScanner.hasCamera())) {
-      this._error = "No camera found";
-      return;
-    }
-    QrScanner.WORKER_PATH = "/static/js/qr-scanner-worker.min.js";
-    this._listCameras(QrScanner);
-    this._qrScanner = new QrScanner(
-      this._video,
-      this._qrCodeScanned,
-      this._qrCodeError
-    );
-    // @ts-ignore
-    const canvas = this._qrScanner.$canvas;
-    this._canvasContainer.appendChild(canvas);
-    canvas.style.display = "block";
-    try {
-      await this._qrScanner.start();
-    } catch (err: any) {
-      this._error = err;
-    }
-  }
-
-  private async _listCameras(qrScanner: typeof QrScanner): Promise<void> {
-    this._cameras = await qrScanner.listCameras(true);
-  }
-
-  private _qrCodeError = (err: any) => {
-    if (err === "No QR code found") {
-      this._qrNotFoundCount++;
-      if (this._qrNotFoundCount === 250) {
-        this._error = err;
-      }
-      return;
-    }
-    this._error = err.message || err;
-    // eslint-disable-next-line no-console
-    console.log(err);
-  };
-
-  private _qrCodeScanned = async (qrCodeString: string): Promise<void> => {
-    this._qrNotFoundCount = 0;
-    fireEvent(this, "qr-code-scanned", { value: qrCodeString });
-  };
-
-  private _cameraChanged(ev: CustomEvent): void {
-    this._qrScanner?.setCamera((ev.target as Select).value);
-  }
-
-  static styles = css`
-    canvas {
-      width: 100%;
-    }
-    mwc-select {
-      width: 100%;
-      margin-bottom: 16px;
-    }
-  `;
-}
-
-declare global {
-  // for fire event
-  interface HASSDomEvents {
-    "qr-code-scanned": { value: string };
-    "qr-code-error": { message: string };
-  }
-
-  interface HTMLElementTagNameMap {
-    "ha-qr-scanner": HaQrScanner;
-  }
-}
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -3,11 +3,13 @@ import {
  mdiBell,
  mdiCalendar,
  mdiCart,
+  mdiCellphoneCog,
  mdiChartBox,
  mdiClose,
  mdiCog,
  mdiFormatListBulletedType,
  mdiHammer,
+  mdiHomeAssistant,
  mdiLightningBolt,
  mdiMenu,
  mdiMenuOpen,
@@ -43,6 +45,10 @@ import {
  PersistentNotification,
  subscribeNotifications,
 } from "../data/persistent_notification";
+import {
+  ExternalConfig,
+  getExternalConfig,
+} from "../external_app/external_config";
 import { actionHandler } from "../panels/lovelace/common/directives/action-handler-directive";
 import { haStyleScrollbar } from "../resources/styles";
 import type { HomeAssistant, PanelInfo, Route } from "../types";
@@ -52,7 +58,7 @@ import "./ha-menu-button";
 import "./ha-svg-icon";
 import "./user/ha-user-badge";

-const SHOW_AFTER_SPACER = ["config", "developer-tools"];
+const SHOW_AFTER_SPACER = ["config", "developer-tools", "hassio"];

 const SUPPORT_SCROLL_IF_NEEDED = "scrollIntoViewIfNeeded" in document.body;

@@ -62,6 +68,7 @@ const SORT_VALUE_URL_PATHS = {
  logbook: 3,
  history: 4,
  "developer-tools": 9,
+  hassio: 10,
  config: 11,
 };

@@ -70,6 +77,7 @@ const PANEL_ICONS = {
  config: mdiCog,
  "developer-tools": mdiHammer,
  energy: mdiLightningBolt,
+  hassio: mdiHomeAssistant,
  history: mdiChartBox,
  logbook: mdiFormatListBulletedType,
  lovelace: mdiViewDashboard,
@@ -187,6 +195,8 @@ class HaSidebar extends LitElement {

  @property({ type: Boolean }) public editMode = false;

+  @state() private _externalConfig?: ExternalConfig;
+
  @state() private _notifications?: PersistentNotification[];

  @state() private _renderEmptySortable = false;
@@ -233,6 +243,7 @@ class HaSidebar extends LitElement {
      changedProps.has("expanded") ||
      changedProps.has("narrow") ||
      changedProps.has("alwaysExpand") ||
+      changedProps.has("_externalConfig") ||
      changedProps.has("_notifications") ||
      changedProps.has("editMode") ||
      changedProps.has("_renderEmptySortable") ||
@@ -263,6 +274,11 @@ class HaSidebar extends LitElement {
  protected firstUpdated(changedProps: PropertyValues) {
    super.firstUpdated(changedProps);

+    if (this.hass && this.hass.auth.external) {
+      getExternalConfig(this.hass.auth.external).then((conf) => {
+        this._externalConfig = conf;
+      });
+    }
    subscribeNotifications(this.hass.connection, (notifications) => {
      this._notifications = notifications;
    });
@@ -337,8 +353,10 @@ class HaSidebar extends LitElement {
      this._hiddenPanels
    );

-    // Show the supervisor as beeing part of configuration
-    const selectedPanel = this.route.path?.startsWith("/hassio/")
+    // Show the update-available as beeing part of configuration
+    const selectedPanel = this.route.path?.startsWith(
+      "/hassio/update-available"
+    )
      ? "config"
      : this.hass.panelUrl;

@@ -358,6 +376,7 @@ class HaSidebar extends LitElement {
          : this._renderPanels(beforeSpacer)}
        ${this._renderSpacer()}
        ${this._renderPanels(afterSpacer)}
+        ${this._renderExternalConfiguration()}
      </paper-listbox>
    `;
  }
@@ -542,6 +561,34 @@ class HaSidebar extends LitElement {
    </a>`;
  }

+  private _renderExternalConfiguration() {
+    return html`${this._externalConfig && this._externalConfig.hasSettingsScreen
+      ? html`
+          <a
+            aria-role="option"
+            aria-label=${this.hass.localize(
+              "ui.sidebar.external_app_configuration"
+            )}
+            href="#external-app-configuration"
+            tabindex="-1"
+            @click=${this._handleExternalAppConfiguration}
+            @mouseenter=${this._itemMouseEnter}
+            @mouseleave=${this._itemMouseLeave}
+          >
+            <paper-icon-item>
+              <ha-svg-icon
+                slot="item-icon"
+                .path=${mdiCellphoneCog}
+              ></ha-svg-icon>
+              <span class="item-text">
+                ${this.hass.localize("ui.sidebar.external_app_configuration")}
+              </span>
+            </paper-icon-item>
+          </a>
+        `
+      : ""}`;
+  }
+
  private get _tooltip() {
    return this.shadowRoot!.querySelector(".tooltip")! as HTMLDivElement;
  }
@@ -713,6 +760,13 @@ class HaSidebar extends LitElement {
    fireEvent(this, "hass-show-notifications");
  }

+  private _handleExternalAppConfiguration(ev: Event) {
+    ev.preventDefault();
+    this.hass.auth.external!.fireMessage({
+      type: "config_screen/show",
+    });
+  }
+
  private _toggleSidebar(ev: CustomEvent) {
    if (ev.detail.action !== "tap") {
      return;
--- a/src/components/ha-time-input.ts
+++ b/src/components/ha-time-input.ts
@@ -27,7 +27,7 @@ export class HaTimeInput extends LitElement {
    const parts = this.value?.split(":") || [];
    let hours = parts[0];
    const numberHours = Number(parts[0]);
-    if (numberHours && useAMPM && numberHours > 12 && numberHours < 24) {
+    if (numberHours && useAMPM && numberHours > 12) {
      hours = String(numberHours - 12).padStart(2, "0");
    }
    if (useAMPM && numberHours === 0) {
--- a/src/components/map/ha-entity-marker.ts
+++ b/src/components/map/ha-entity-marker.ts
@@ -2,8 +2,11 @@ import { LitElement, html, css } from "lit";
 import { property } from "lit/decorators";
 import { styleMap } from "lit/directives/style-map";
 import { fireEvent } from "../../common/dom/fire_event";
+import { HomeAssistant } from "../../types";

 class HaEntityMarker extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
  @property({ attribute: "entity-id" }) public entityId?: string;

  @property({ attribute: "entity-name" }) public entityName?: string;
@@ -23,7 +26,9 @@ class HaEntityMarker extends LitElement {
          ? html`<div
              class="entity-picture"
              style=${styleMap({
-                "background-image": `url(${this.entityPicture})`,
+                "background-image": `url(${this.hass.hassUrl(
+                  this.entityPicture
+                )})`,
              })}
            ></div>`
          : this.entityName}
@@ -64,9 +69,3 @@ class HaEntityMarker extends LitElement {
 }

 customElements.define("ha-entity-marker", HaEntityMarker);
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-entity-marker": HaEntityMarker;
-  }
-}
--- a/src/components/map/ha-map.ts
+++ b/src/components/map/ha-map.ts
@@ -412,9 +412,7 @@ export class HaMap extends ReactiveElement {
              <ha-entity-marker
                entity-id="${getEntityId(entity)}"
                entity-name="${entityName}"
-                entity-picture="${
-                  entityPicture ? this.hass.hassUrl(entityPicture) : ""
-                }"
+                entity-picture="${entityPicture || ""}"
                ${
                  typeof entity !== "string"
                    ? `entity-color="${entity.color}"`
--- a/src/data/automation.ts
+++ b/src/data/automation.ts
@@ -179,7 +179,7 @@ export interface StateCondition extends BaseCondition {
  condition: "state";
  entity_id: string;
  attribute?: string;
-  state: string | number | string[];
+  state: string | number;
  for?: string | number | ForDict;
 }

--- a/src/data/cover.ts
+++ b/src/data/cover.ts
@@ -1,95 +0,0 @@
-import {
-  HassEntityAttributeBase,
-  HassEntityBase,
-} from "home-assistant-js-websocket";
-import { supportsFeature } from "../common/entity/supports-feature";
-
-export const SUPPORT_OPEN = 1;
-export const SUPPORT_CLOSE = 2;
-export const SUPPORT_SET_POSITION = 4;
-export const SUPPORT_STOP = 8;
-export const SUPPORT_OPEN_TILT = 16;
-export const SUPPORT_CLOSE_TILT = 32;
-export const SUPPORT_STOP_TILT = 64;
-export const SUPPORT_SET_TILT_POSITION = 128;
-
-export const FEATURE_CLASS_NAMES = {
-  4: "has-set_position",
-  16: "has-open_tilt",
-  32: "has-close_tilt",
-  64: "has-stop_tilt",
-  128: "has-set_tilt_position",
-};
-
-export const supportsOpen = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_OPEN);
-
-export const supportsClose = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_CLOSE);
-
-export const supportsSetPosition = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_SET_POSITION);
-
-export const supportsStop = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_STOP);
-
-export const supportsOpenTilt = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_OPEN_TILT);
-
-export const supportsCloseTilt = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_CLOSE_TILT);
-
-export const supportsStopTilt = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_STOP_TILT);
-
-export const supportsSetTiltPosition = (stateObj) =>
-  supportsFeature(stateObj, SUPPORT_SET_TILT_POSITION);
-
-export function isFullyOpen(stateObj: CoverEntity) {
-  if (stateObj.attributes.current_position !== undefined) {
-    return stateObj.attributes.current_position === 100;
-  }
-  return stateObj.state === "open";
-}
-
-export function isFullyClosed(stateObj: CoverEntity) {
-  if (stateObj.attributes.current_position !== undefined) {
-    return stateObj.attributes.current_position === 0;
-  }
-  return stateObj.state === "closed";
-}
-
-export function isFullyOpenTilt(stateObj: CoverEntity) {
-  return stateObj.attributes.current_tilt_position === 100;
-}
-
-export function isFullyClosedTilt(stateObj: CoverEntity) {
-  return stateObj.attributes.current_tilt_position === 0;
-}
-
-export function isOpening(stateObj: CoverEntity) {
-  return stateObj.state === "opening";
-}
-
-export function isClosing(stateObj: CoverEntity) {
-  return stateObj.state === "closing";
-}
-
-export function isTiltOnly(stateObj: CoverEntity) {
-  const supportsCover =
-    supportsOpen(stateObj) || supportsClose(stateObj) || supportsStop(stateObj);
-  const supportsTilt =
-    supportsOpenTilt(stateObj) ||
-    supportsCloseTilt(stateObj) ||
-    supportsStopTilt(stateObj);
-  return supportsTilt && !supportsCover;
-}
-
-interface CoverEntityAttributes extends HassEntityAttributeBase {
-  current_position: number;
-  current_tilt_position: number;
-}
-
-export interface CoverEntity extends HassEntityBase {
-  attributes: CoverEntityAttributes;
-}
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -1,6 +1,5 @@
 import {
  addHours,
-  differenceInDays,
  endOfToday,
  endOfYesterday,
  startOfToday,
@@ -192,27 +191,6 @@ export const saveEnergyPreferences = async (
  return newPrefs;
 };

-export interface FossilEnergyConsumption {
-  [date: string]: number;
-}
-
-export const getFossilEnergyConsumption = async (
-  hass: HomeAssistant,
-  startTime: Date,
-  energy_statistic_ids: string[],
-  co2_statistic_id: string,
-  endTime?: Date,
-  period: "5minute" | "hour" | "day" | "month" = "hour"
-) =>
-  hass.callWS<FossilEnergyConsumption>({
-    type: "energy/fossil_energy_consumption",
-    start_time: startTime.toISOString(),
-    end_time: endTime?.toISOString(),
-    energy_statistic_ids,
-    co2_statistic_id,
-    period,
-  });
-
 interface EnergySourceByType {
  grid?: GridSourceTypeEnergyPreference[];
  solar?: SolarSourceTypeEnergyPreference[];
@@ -231,7 +209,6 @@ export interface EnergyData {
  stats: Statistics;
  co2SignalConfigEntry?: ConfigEntry;
  co2SignalEntity?: string;
-  fossilEnergyConsumption?: FossilEnergyConsumption;
 }

 const getEnergyData = async (
@@ -269,9 +246,12 @@ const getEnergyData = async (
    }
  }

-  const consumptionStatIDs: string[] = [];
  const statIDs: string[] = [];

+  if (co2SignalEntity !== undefined) {
+    statIDs.push(co2SignalEntity);
+  }
+
  for (const source of prefs.energy_sources) {
    if (source.type === "solar") {
      statIDs.push(source.stat_energy_from);
@@ -298,7 +278,6 @@ const getEnergyData = async (

    // grid source
    for (const flowFrom of source.flow_from) {
-      consumptionStatIDs.push(flowFrom.stat_energy_from);
      statIDs.push(flowFrom.stat_energy_from);
      if (flowFrom.stat_cost) {
        statIDs.push(flowFrom.stat_cost);
@@ -320,44 +299,7 @@ const getEnergyData = async (
    }
  }

-  const dayDifference = differenceInDays(end || new Date(), start);
-
-  // Subtract 1 hour from start to get starting point data
-  const startMinHour = addHours(start, -1);
-
-  const stats = await fetchStatistics(
-    hass!,
-    startMinHour,
-    end,
-    statIDs,
-    dayDifference > 35 ? "month" : dayDifference > 2 ? "day" : "hour"
-  );
-
-  let fossilEnergyConsumption: FossilEnergyConsumption | undefined;
-
-  if (co2SignalEntity !== undefined) {
-    fossilEnergyConsumption = await getFossilEnergyConsumption(
-      hass!,
-      start,
-      consumptionStatIDs,
-      co2SignalEntity,
-      end,
-      dayDifference > 35 ? "month" : dayDifference > 2 ? "day" : "hour"
-    );
-  }
-
-  Object.values(stats).forEach((stat) => {
-    // if the start of the first value is after the requested period, we have the first data point, and should add a zero point
-    if (stat.length && new Date(stat[0].start) > startMinHour) {
-      stat.unshift({
-        ...stat[0],
-        start: startMinHour.toISOString(),
-        end: startMinHour.toISOString(),
-        sum: 0,
-        state: 0,
-      });
-    }
-  });
+  const stats = await fetchStatistics(hass!, addHours(start, -1), end, statIDs); // Subtract 1 hour from start to get starting point data

  const data = {
    start,
@@ -367,7 +309,6 @@ const getEnergyData = async (
    stats,
    co2SignalConfigEntry,
    co2SignalEntity,
-    fossilEnergyConsumption,
  };

  return data;
--- a/src/data/entity_registry.ts
+++ b/src/data/entity_registry.ts
@@ -21,8 +21,6 @@ export interface ExtEntityRegistryEntry extends EntityRegistryEntry {
  capabilities: Record<string, unknown>;
  original_name?: string;
  original_icon?: string;
-  device_class?: string;
-  original_device_class?: string;
 }

 export interface UpdateEntityRegistryEntryResult {
@@ -34,7 +32,6 @@ export interface UpdateEntityRegistryEntryResult {
 export interface EntityRegistryEntryUpdateParams {
  name?: string | null;
  icon?: string | null;
-  device_class?: string | null;
  area_id?: string | null;
  disabled_by?: string | null;
  new_entity_id?: string;
--- a/src/data/history.ts
+++ b/src/data/history.ts
@@ -1,3 +1,4 @@
+import { addDays, addMonths, startOfDay, startOfMonth } from "date-fns";
 import { HassEntity } from "home-assistant-js-websocket";
 import { computeStateDisplay } from "../common/entity/compute_state_display";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
@@ -62,7 +63,6 @@ export interface Statistics {
 export interface StatisticValue {
  statistic_id: string;
  start: string;
-  end: string;
  last_reset: string | null;
  max: number | null;
  mean: number | null;
@@ -350,7 +350,7 @@ export const fetchStatistics = (
  startTime: Date,
  endTime?: Date,
  statistic_ids?: string[],
-  period: "5minute" | "hour" | "day" | "month" = "hour"
+  period: "hour" | "5minute" = "hour"
 ) =>
  hass.callWS<Statistics>({
    type: "history/statistics_during_period",
@@ -428,3 +428,151 @@ export const statisticsHaveType = (
  stats: StatisticValue[],
  type: StatisticType
 ) => stats.some((stat) => stat[type] !== null);
+
+// Merge the growth of multiple sum statistics into one
+const mergeSumGrowthStatistics = (stats: StatisticValue[][]) => {
+  const result = {};
+
+  stats.forEach((stat) => {
+    if (stat.length === 0) {
+      return;
+    }
+    let prevSum: number | null = null;
+    stat.forEach((statVal) => {
+      if (statVal.sum === null) {
+        return;
+      }
+      if (prevSum === null) {
+        prevSum = statVal.sum;
+        return;
+      }
+      const growth = statVal.sum - prevSum;
+      if (statVal.start in result) {
+        result[statVal.start] += growth;
+      } else {
+        result[statVal.start] = growth;
+      }
+      prevSum = statVal.sum;
+    });
+  });
+
+  return result;
+};
+
+/**
+ * Get the growth of a statistic over the given period while applying a
+ * per-period percentage.
+ */
+export const calculateStatisticsSumGrowthWithPercentage = (
+  percentageStat: StatisticValue[],
+  sumStats: StatisticValue[][]
+): number | null => {
+  let sum: number | null = null;
+
+  if (sumStats.length === 0 || percentageStat.length === 0) {
+    return null;
+  }
+
+  const sumGrowthToProcess = mergeSumGrowthStatistics(sumStats);
+
+  percentageStat.forEach((percentageStatValue) => {
+    const sumGrowth = sumGrowthToProcess[percentageStatValue.start];
+    if (sumGrowth === undefined) {
+      return;
+    }
+    if (sum === null) {
+      sum = sumGrowth * (percentageStatValue.mean! / 100);
+    } else {
+      sum += sumGrowth * (percentageStatValue.mean! / 100);
+    }
+  });
+
+  return sum;
+};
+
+export const reduceSumStatisticsByDay = (
+  values: StatisticValue[]
+): StatisticValue[] => {
+  if (!values?.length) {
+    return [];
+  }
+  const result: StatisticValue[] = [];
+  if (
+    values.length > 1 &&
+    new Date(values[0].start).getDate() === new Date(values[1].start).getDate()
+  ) {
+    // add init value if the first value isn't end of previous period
+    result.push({
+      ...values[0]!,
+      start: startOfDay(addDays(new Date(values[0].start), -1)).toISOString(),
+    });
+  }
+  let lastValue: StatisticValue;
+  let prevDate: number | undefined;
+  for (const value of values) {
+    const date = new Date(value.start).getDate();
+    if (prevDate === undefined) {
+      prevDate = date;
+    }
+    if (prevDate !== date) {
+      // Last value of the day
+      result.push({
+        ...lastValue!,
+        start: startOfDay(new Date(lastValue!.start)).toISOString(),
+      });
+      prevDate = date;
+    }
+    lastValue = value;
+  }
+  // Add final value
+  result.push({
+    ...lastValue!,
+    start: startOfDay(new Date(lastValue!.start)).toISOString(),
+  });
+  return result;
+};
+
+export const reduceSumStatisticsByMonth = (
+  values: StatisticValue[]
+): StatisticValue[] => {
+  if (!values?.length) {
+    return [];
+  }
+  const result: StatisticValue[] = [];
+  if (
+    values.length > 1 &&
+    new Date(values[0].start).getMonth() ===
+      new Date(values[1].start).getMonth()
+  ) {
+    // add init value if the first value isn't end of previous period
+    result.push({
+      ...values[0]!,
+      start: startOfMonth(
+        addMonths(new Date(values[0].start), -1)
+      ).toISOString(),
+    });
+  }
+  let lastValue: StatisticValue;
+  let prevMonth: number | undefined;
+  for (const value of values) {
+    const month = new Date(value.start).getMonth();
+    if (prevMonth === undefined) {
+      prevMonth = month;
+    }
+    if (prevMonth !== month) {
+      // Last value of the month
+      result.push({
+        ...lastValue!,
+        start: startOfMonth(new Date(lastValue!.start)).toISOString(),
+      });
+      prevMonth = month;
+    }
+    lastValue = value;
+  }
+  // Add final value
+  result.push({
+    ...lastValue!,
+    start: startOfMonth(new Date(lastValue!.start)).toISOString(),
+  });
+  return result;
+};
--- a/src/data/scene.ts
+++ b/src/data/scene.ts
@@ -18,15 +18,10 @@ export const SCENE_IGNORED_DOMAINS = [
  "zone",
 ];

-let inititialSceneEditorData:
-  | { config?: Partial<SceneConfig>; areaId?: string }
-  | undefined;
+let inititialSceneEditorData: Partial<SceneConfig> | undefined;

-export const showSceneEditor = (
-  config?: Partial<SceneConfig>,
-  areaId?: string
-) => {
-  inititialSceneEditorData = { config, areaId };
+export const showSceneEditor = (data?: Partial<SceneConfig>) => {
+  inititialSceneEditorData = data;
  navigate("/config/scene/edit/new");
 };

--- a/src/data/user.ts
+++ b/src/data/user.ts
@@ -13,7 +13,6 @@ export interface User {
  name: string;
  is_owner: boolean;
  is_active: boolean;
-  local_only: boolean;
  system_generated: boolean;
  group_ids: string[];
  credentials: Credential[];
@@ -23,7 +22,6 @@ export interface UpdateUserParams {
  name?: User["name"];
  is_active?: User["is_active"];
  group_ids?: User["group_ids"];
-  local_only?: boolean;
 }

 export const fetchUsers = async (hass: HomeAssistant) =>
@@ -35,14 +33,12 @@ export const createUser = async (
  hass: HomeAssistant,
  name: string,
  // eslint-disable-next-line: variable-name
-  group_ids?: User["group_ids"],
-  local_only?: boolean
+  group_ids?: User["group_ids"]
 ) =>
  hass.callWS<{ user: User }>({
    type: "config/auth/create",
    name,
    group_ids,
-    local_only,
  });

 export const updateUser = async (
--- a/src/data/weather.ts
+++ b/src/data/weather.ts
@@ -152,11 +152,17 @@ export const getWeatherUnit = (
  hass: HomeAssistant,
  measure: string
 ): string => {
+  const lengthUnit = hass.config.unit_system.length || "";
  switch (measure) {
+    case "pressure":
+      return lengthUnit === "km" ? "hPa" : "inHg";
+    case "wind_speed":
+      return `${lengthUnit}/h`;
    case "visibility":
-      return hass.config.unit_system.length || "";
+    case "length":
+      return lengthUnit;
    case "precipitation":
-      return hass.config.unit_system.accumulated_precipitation || "";
+      return lengthUnit === "km" ? "mm" : "in";
    case "humidity":
    case "precipitation_probability":
      return "%";
--- a/src/data/ws-themes.ts
+++ b/src/data/ws-themes.ts
@@ -23,8 +23,6 @@ export interface Themes {
  // in theme picker, this property will still contain either true or false based on
  // what has been determined via system preferences and support from the selected theme.
  darkMode: boolean;
-  // Currently globally active theme name
-  theme: string;
 }

 const fetchThemes = (conn) =>
--- a/src/data/zwave_js.ts
+++ b/src/data/zwave_js.ts
@@ -57,45 +57,6 @@ export enum SecurityClass {
  S0_Legacy = 7,
 }

-/** A named list of Z-Wave features */
-export enum ZWaveFeature {
-  // Available starting with Z-Wave SDK 6.81
-  SmartStart,
-}
-
-enum QRCodeVersion {
-  S2 = 0,
-  SmartStart = 1,
-}
-
-enum Protocols {
-  ZWave = 0,
-  ZWaveLongRange = 1,
-}
-export interface QRProvisioningInformation {
-  version: QRCodeVersion;
-  securityClasses: SecurityClass[];
-  dsk: string;
-  genericDeviceClass: number;
-  specificDeviceClass: number;
-  installerIconType: number;
-  manufacturerId: number;
-  productType: number;
-  productId: number;
-  applicationVersion: string;
-  maxInclusionRequestInterval?: number | undefined;
-  uuid?: string | undefined;
-  supportedProtocols?: Protocols[] | undefined;
-}
-
-export interface PlannedProvisioningEntry {
-  /** The device specific key (DSK) in the form aaaaa-bbbbb-ccccc-ddddd-eeeee-fffff-11111-22222 */
-  dsk: string;
-  security_classes: SecurityClass[];
-}
-
-export const MINIMUM_QR_STRING_LENGTH = 52;
-
 export interface ZWaveJSNodeIdentifiers {
  home_id: string;
  node_id: number;
@@ -205,16 +166,6 @@ export const enum NodeStatus {
  Alive,
 }

-export interface ZwaveJSProvisioningEntry {
-  /** The device specific key (DSK) in the form aaaaa-bbbbb-ccccc-ddddd-eeeee-fffff-11111-22222 */
-  dsk: string;
-  securityClasses: SecurityClass[];
-  /**
-   * Additional properties to be stored in this provisioning entry, e.g. the device ID from a scanned QR code
-   */
-  [prop: string]: any;
-}
-
 export interface RequestedGrant {
  /**
   * An array of security classes that are requested or to be granted.
@@ -246,7 +197,7 @@ export const migrateZwave = (
    dry_run,
  });

-export const fetchZwaveNetworkStatus = (
+export const fetchNetworkStatus = (
  hass: HomeAssistant,
  entry_id: string
 ): Promise<ZWaveJSNetwork> =>
@@ -255,7 +206,7 @@ export const fetchZwaveNetworkStatus = (
    entry_id,
  });

-export const fetchZwaveDataCollectionStatus = (
+export const fetchDataCollectionStatus = (
  hass: HomeAssistant,
  entry_id: string
 ): Promise<ZWaveJSDataCollectionStatus> =>
@@ -264,7 +215,7 @@ export const fetchZwaveDataCollectionStatus = (
    entry_id,
  });

-export const setZwaveDataCollectionPreference = (
+export const setDataCollectionPreference = (
  hass: HomeAssistant,
  entry_id: string,
  opted_in: boolean
@@ -275,40 +226,25 @@ export const setZwaveDataCollectionPreference = (
    opted_in,
  });

-export const fetchZwaveProvisioningEntries = (
-  hass: HomeAssistant,
-  entry_id: string
-): Promise<any> =>
-  hass.callWS({
-    type: "zwave_js/get_provisioning_entries",
-    entry_id,
-  });
-
-export const subscribeAddZwaveNode = (
+export const subscribeAddNode = (
  hass: HomeAssistant,
  entry_id: string,
  callbackFunction: (message: any) => void,
-  inclusion_strategy: InclusionStrategy = InclusionStrategy.Default,
-  qr_provisioning_information?: QRProvisioningInformation,
-  qr_code_string?: string,
-  planned_provisioning_entry?: PlannedProvisioningEntry
+  inclusion_strategy: InclusionStrategy = InclusionStrategy.Default
 ): Promise<UnsubscribeFunc> =>
  hass.connection.subscribeMessage((message) => callbackFunction(message), {
    type: "zwave_js/add_node",
    entry_id: entry_id,
    inclusion_strategy,
-    qr_code_string,
-    qr_provisioning_information,
-    planned_provisioning_entry,
  });

-export const stopZwaveInclusion = (hass: HomeAssistant, entry_id: string) =>
+export const stopInclusion = (hass: HomeAssistant, entry_id: string) =>
  hass.callWS({
    type: "zwave_js/stop_inclusion",
    entry_id,
  });

-export const zwaveGrantSecurityClasses = (
+export const grantSecurityClasses = (
  hass: HomeAssistant,
  entry_id: string,
  security_classes: SecurityClass[],
@@ -321,7 +257,7 @@ export const zwaveGrantSecurityClasses = (
    client_side_auth,
  });

-export const zwaveValidateDskAndEnterPin = (
+export const validateDskAndEnterPin = (
  hass: HomeAssistant,
  entry_id: string,
  pin: string
@@ -332,57 +268,7 @@ export const zwaveValidateDskAndEnterPin = (
    pin,
  });

-export const zwaveSupportsFeature = (
-  hass: HomeAssistant,
-  entry_id: string,
-  feature: ZWaveFeature
-): Promise<{ supported: boolean }> =>
-  hass.callWS({
-    type: "zwave_js/supports_feature",
-    entry_id,
-    feature,
-  });
-
-export const zwaveParseQrCode = (
-  hass: HomeAssistant,
-  entry_id: string,
-  qr_code_string: string
-): Promise<QRProvisioningInformation> =>
-  hass.callWS({
-    type: "zwave_js/parse_qr_code_string",
-    entry_id,
-    qr_code_string,
-  });
-
-export const provisionZwaveSmartStartNode = (
-  hass: HomeAssistant,
-  entry_id: string,
-  qr_provisioning_information?: QRProvisioningInformation,
-  qr_code_string?: string,
-  planned_provisioning_entry?: PlannedProvisioningEntry
-): Promise<QRProvisioningInformation> =>
-  hass.callWS({
-    type: "zwave_js/provision_smart_start_node",
-    entry_id,
-    qr_code_string,
-    qr_provisioning_information,
-    planned_provisioning_entry,
-  });
-
-export const unprovisionZwaveSmartStartNode = (
-  hass: HomeAssistant,
-  entry_id: string,
-  dsk?: string,
-  node_id?: number
-): Promise<QRProvisioningInformation> =>
-  hass.callWS({
-    type: "zwave_js/unprovision_smart_start_node",
-    entry_id,
-    dsk,
-    node_id,
-  });
-
-export const fetchZwaveNodeStatus = (
+export const fetchNodeStatus = (
  hass: HomeAssistant,
  entry_id: string,
  node_id: number
@@ -393,7 +279,7 @@ export const fetchZwaveNodeStatus = (
    node_id,
  });

-export const fetchZwaveNodeMetadata = (
+export const fetchNodeMetadata = (
  hass: HomeAssistant,
  entry_id: string,
  node_id: number
@@ -404,7 +290,7 @@ export const fetchZwaveNodeMetadata = (
    node_id,
  });

-export const fetchZwaveNodeConfigParameters = (
+export const fetchNodeConfigParameters = (
  hass: HomeAssistant,
  entry_id: string,
  node_id: number
@@ -415,7 +301,7 @@ export const fetchZwaveNodeConfigParameters = (
    node_id,
  });

-export const setZwaveNodeConfigParameter = (
+export const setNodeConfigParameter = (
  hass: HomeAssistant,
  entry_id: string,
  node_id: number,
@@ -434,7 +320,7 @@ export const setZwaveNodeConfigParameter = (
  return hass.callWS(data);
 };

-export const reinterviewZwaveNode = (
+export const reinterviewNode = (
  hass: HomeAssistant,
  entry_id: string,
  node_id: number,
@@ -449,7 +335,7 @@ export const reinterviewZwaveNode = (
    }
  );

-export const healZwaveNode = (
+export const healNode = (
  hass: HomeAssistant,
  entry_id: string,
  node_id: number
@@ -460,7 +346,7 @@ export const healZwaveNode = (
    node_id,
  });

-export const removeFailedZwaveNode = (
+export const removeFailedNode = (
  hass: HomeAssistant,
  entry_id: string,
  node_id: number,
@@ -475,7 +361,7 @@ export const removeFailedZwaveNode = (
    }
  );

-export const healZwaveNetwork = (
+export const healNetwork = (
  hass: HomeAssistant,
  entry_id: string
 ): Promise<UnsubscribeFunc> =>
@@ -484,7 +370,7 @@ export const healZwaveNetwork = (
    entry_id,
  });

-export const stopHealZwaveNetwork = (
+export const stopHealNetwork = (
  hass: HomeAssistant,
  entry_id: string
 ): Promise<UnsubscribeFunc> =>
@@ -493,7 +379,7 @@ export const stopHealZwaveNetwork = (
    entry_id,
  });

-export const subscribeZwaveNodeReady = (
+export const subscribeNodeReady = (
  hass: HomeAssistant,
  entry_id: string,
  node_id: number,
@@ -508,7 +394,7 @@ export const subscribeZwaveNodeReady = (
    }
  );

-export const subscribeHealZwaveNetworkProgress = (
+export const subscribeHealNetworkProgress = (
  hass: HomeAssistant,
  entry_id: string,
  callbackFunction: (message: ZWaveJSHealNetworkStatusMessage) => void
@@ -521,7 +407,7 @@ export const subscribeHealZwaveNetworkProgress = (
    }
  );

-export const getZwaveJsIdentifiersFromDevice = (
+export const getIdentifiersFromDevice = (
  device: DeviceRegistryEntry
 ): ZWaveJSNodeIdentifiers | undefined => {
  if (!device) {
--- a/src/dialogs/developert-tools/ha-developer-tools-dialog.ts
+++ b/src/dialogs/developert-tools/ha-developer-tools-dialog.ts
@@ -1,138 +0,0 @@
-import { mdiClose } from "@mdi/js";
-import "@polymer/paper-tabs";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
-import { customElement, property, state, query } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
-import { haStyleDialog } from "../../resources/styles";
-import type { HomeAssistant, Route } from "../../types";
-import "../../components/ha-dialog";
-import "../../components/ha-tabs";
-import "../../components/ha-icon-button";
-import "../../panels/developer-tools/developer-tools-router";
-import type { HaDialog } from "../../components/ha-dialog";
-import "@material/mwc-button/mwc-button";
-
-@customElement("ha-developer-tools-dialog")
-export class HaDeveloperToolsDialog extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @state() private _opened = false;
-
-  @state() private _route: Route = {
-    prefix: "/developer-tools",
-    path: "/state",
-  };
-
-  @query("ha-dialog", true) private _dialog!: HaDialog;
-
-  public async showDialog(): Promise<void> {
-    this._opened = true;
-  }
-
-  public async closeDialog(): Promise<void> {
-    this._opened = false;
-    fireEvent(this, "dialog-closed", { dialog: this.localName });
-  }
-
-  protected render(): TemplateResult {
-    if (!this._opened) {
-      return html``;
-    }
-    return html`
-      <ha-dialog open @closed=${this.closeDialog}>
-        <div class="header">
-          <ha-tabs
-            scrollable
-            attr-for-selected="page-name"
-            .selected=${this._route.path.substr(1)}
-            @iron-activate=${this.handlePageSelected}
-          >
-            <paper-tab page-name="state">
-              ${this.hass.localize(
-                "ui.panel.developer-tools.tabs.states.title"
-              )}
-            </paper-tab>
-            <paper-tab page-name="service">
-              ${this.hass.localize(
-                "ui.panel.developer-tools.tabs.services.title"
-              )}
-            </paper-tab>
-            <paper-tab page-name="template">
-              ${this.hass.localize(
-                "ui.panel.developer-tools.tabs.templates.title"
-              )}
-            </paper-tab>
-            <paper-tab page-name="event">
-              ${this.hass.localize(
-                "ui.panel.developer-tools.tabs.events.title"
-              )}
-            </paper-tab>
-            <paper-tab page-name="statistics">
-              ${this.hass.localize(
-                "ui.panel.developer-tools.tabs.statistics.title"
-              )}
-            </paper-tab>
-          </ha-tabs>
-          <ha-icon-button
-            .path=${mdiClose}
-            @click=${this.closeDialog}
-          ></ha-icon-button>
-        </div>
-        <developer-tools-router
-          .route=${this._route}
-          .narrow=${document.body.clientWidth < 600}
-          .hass=${this.hass}
-        ></developer-tools-router>
-      </ha-dialog>
-    `;
-  }
-
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.updated(changedProps);
-    this.hass.loadBackendTranslation("title");
-    this.hass.loadFragmentTranslation("developer-tools");
-  }
-
-  private handlePageSelected(ev) {
-    const newPage = ev.detail.item.getAttribute("page-name");
-    if (newPage !== this._route.path.substr(1)) {
-      this._route = {
-        prefix: "/developer-tools",
-        path: `/${newPage}`,
-      };
-    } else {
-      // scrollTo(0, 0);
-    }
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      haStyleDialog,
-      css`
-        ha-dialog {
-          --mdc-dialog-min-width: 100vw;
-          --mdc-dialog-min-height: 100vh;
-        }
-        .header {
-          display: flex;
-        }
-        ha-tabs {
-          flex: 1;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-developer-tools-dialog": HaDeveloperToolsDialog;
-  }
-}
--- a/src/dialogs/developert-tools/show-dialog-developer-tools.ts
+++ b/src/dialogs/developert-tools/show-dialog-developer-tools.ts
@@ -1,12 +0,0 @@
-import { fireEvent } from "../../common/dom/fire_event";
-
-export const loadDeveloperToolDialog = () =>
-  import("./ha-developer-tools-dialog");
-
-export const showDeveloperToolDialog = (element: HTMLElement): void => {
-  fireEvent(element, "show-dialog", {
-    dialogTag: "ha-developer-tools-dialog",
-    dialogImport: loadDeveloperToolDialog,
-    dialogParams: {},
-  });
-};
--- a/src/dialogs/more-info/controls/more-info-climate.ts
+++ b/src/dialogs/more-info/controls/more-info-climate.ts
@@ -192,7 +192,7 @@ class MoreInfoClimate extends LitElement {
          </div>
        </div>

-        ${supportPresetMode && stateObj.attributes.preset_modes
+        ${supportPresetMode
          ? html`
              <div class="container-preset_modes">
                <ha-paper-dropdown-menu
@@ -220,7 +220,7 @@ class MoreInfoClimate extends LitElement {
              </div>
            `
          : ""}
-        ${supportFanMode && stateObj.attributes.fan_modes
+        ${supportFanMode
          ? html`
              <div class="container-fan_list">
                <ha-paper-dropdown-menu
@@ -248,7 +248,7 @@ class MoreInfoClimate extends LitElement {
              </div>
            `
          : ""}
-        ${supportSwingMode && stateObj.attributes.swing_modes
+        ${supportSwingMode
          ? html`
              <div class="container-swing_list">
                <ha-paper-dropdown-menu
--- a/src/dialogs/more-info/controls/more-info-cover.js
+++ b/src/dialogs/more-info/controls/more-info-cover.js
@@ -0,0 +1,124 @@
+import "@polymer/iron-flex-layout/iron-flex-layout-classes";
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+/* eslint-plugin-disable lit */
+import { PolymerElement } from "@polymer/polymer/polymer-element";
+import { attributeClassNames } from "../../../common/entity/attribute_class_names";
+import { featureClassNames } from "../../../common/entity/feature_class_names";
+import "../../../components/ha-cover-tilt-controls";
+import "../../../components/ha-labeled-slider";
+import LocalizeMixin from "../../../mixins/localize-mixin";
+import CoverEntity from "../../../util/cover-model";
+
+const FEATURE_CLASS_NAMES = {
+  4: "has-set_position",
+  128: "has-set_tilt_position",
+};
+class MoreInfoCover extends LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+      <style include="iron-flex"></style>
+      <style>
+        .current_position,
+        .tilt {
+          max-height: 0px;
+          overflow: hidden;
+        }
+
+        .has-set_position .current_position,
+        .has-current_position .current_position,
+        .has-set_tilt_position .tilt,
+        .has-current_tilt_position .tilt {
+          max-height: 208px;
+        }
+
+        [invisible] {
+          visibility: hidden !important;
+        }
+      </style>
+      <div class$="[[computeClassNames(stateObj)]]">
+        <div class="current_position">
+          <ha-labeled-slider
+            caption="[[localize('ui.card.cover.position')]]"
+            pin=""
+            value="{{coverPositionSliderValue}}"
+            disabled="[[!entityObj.supportsSetPosition]]"
+            on-change="coverPositionSliderChanged"
+          ></ha-labeled-slider>
+        </div>
+
+        <div class="tilt">
+          <ha-labeled-slider
+            caption="[[localize('ui.card.cover.tilt_position')]]"
+            pin=""
+            extra=""
+            value="{{coverTiltPositionSliderValue}}"
+            disabled="[[!entityObj.supportsSetTiltPosition]]"
+            on-change="coverTiltPositionSliderChanged"
+          >
+            <ha-cover-tilt-controls
+              slot="extra"
+              hidden$="[[entityObj.isTiltOnly]]"
+              hass="[[hass]]"
+              state-obj="[[stateObj]]"
+            ></ha-cover-tilt-controls>
+          </ha-labeled-slider>
+        </div>
+      </div>
+      <ha-attributes
+        hass="[[hass]]"
+        state-obj="[[stateObj]]"
+        extra-filters="current_position,current_tilt_position"
+      ></ha-attributes>
+    `;
+  }
+
+  static get properties() {
+    return {
+      hass: Object,
+      stateObj: {
+        type: Object,
+        observer: "stateObjChanged",
+      },
+      entityObj: {
+        type: Object,
+        computed: "computeEntityObj(hass, stateObj)",
+      },
+      coverPositionSliderValue: Number,
+      coverTiltPositionSliderValue: Number,
+    };
+  }
+
+  computeEntityObj(hass, stateObj) {
+    return new CoverEntity(hass, stateObj);
+  }
+
+  stateObjChanged(newVal) {
+    if (newVal) {
+      this.setProperties({
+        coverPositionSliderValue: newVal.attributes.current_position,
+        coverTiltPositionSliderValue: newVal.attributes.current_tilt_position,
+      });
+    }
+  }
+
+  computeClassNames(stateObj) {
+    const classes = [
+      attributeClassNames(stateObj, [
+        "current_position",
+        "current_tilt_position",
+      ]),
+      featureClassNames(stateObj, FEATURE_CLASS_NAMES),
+    ];
+    return classes.join(" ");
+  }
+
+  coverPositionSliderChanged(ev) {
+    this.entityObj.setCoverPosition(ev.target.value);
+  }
+
+  coverTiltPositionSliderChanged(ev) {
+    this.entityObj.setCoverTiltPosition(ev.target.value);
+  }
+}
+
+customElements.define("more-info-cover", MoreInfoCover);
--- a/src/dialogs/more-info/controls/more-info-cover.ts
+++ b/src/dialogs/more-info/controls/more-info-cover.ts
@@ -1,140 +0,0 @@
-import { css, CSSResult, html, LitElement, TemplateResult } from "lit";
-import { customElement, property } from "lit/decorators";
-import { attributeClassNames } from "../../../common/entity/attribute_class_names";
-import { featureClassNames } from "../../../common/entity/feature_class_names";
-import "../../../components/ha-attributes";
-import "../../../components/ha-cover-tilt-controls";
-import "../../../components/ha-labeled-slider";
-import {
-  CoverEntity,
-  FEATURE_CLASS_NAMES,
-  isTiltOnly,
-  supportsSetPosition,
-  supportsSetTiltPosition,
-} from "../../../data/cover";
-import { HomeAssistant } from "../../../types";
-
-@customElement("more-info-cover")
-class MoreInfoCover extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public stateObj!: CoverEntity;
-
-  protected render(): TemplateResult {
-    if (!this.stateObj) {
-      return html``;
-    }
-
-    const _isTiltOnly = isTiltOnly(this.stateObj);
-
-    return html`
-      <div class=${this._computeClassNames(this.stateObj)}>
-        <div class="current_position">
-          <ha-labeled-slider
-            .caption=${this.hass.localize("ui.card.cover.position")}
-            pin=""
-            .value=${this.stateObj.attributes.current_position}
-            .disabled=${!supportsSetPosition(this.stateObj)}
-            @change=${this._coverPositionSliderChanged}
-          ></ha-labeled-slider>
-        </div>
-
-        <div class="tilt">
-          ${supportsSetTiltPosition(this.stateObj)
-            ? // Either render the labeled slider and put the tilt buttons into its slot
-              // or (if tilt position is not supported and therefore no slider is shown)
-              // render a title <div> (same style as for a labeled slider) and directly put
-              // the tilt controls on the more-info.
-              html` <ha-labeled-slider
-                .caption=${this.hass.localize("ui.card.cover.tilt_position")}
-                pin=""
-                extra=""
-                .value=${this.stateObj.attributes.current_tilt_position}
-                @change=${this._coverTiltPositionSliderChanged}
-              >
-                ${!_isTiltOnly
-                  ? html`<ha-cover-tilt-controls
-                      .hass=${this.hass}
-                      slot="extra"
-                      .stateObj=${this.stateObj}
-                    ></ha-cover-tilt-controls> `
-                  : html``}
-              </ha-labeled-slider>`
-            : !_isTiltOnly
-            ? html`
-                <div class="title">
-                  ${this.hass.localize("ui.card.cover.tilt_position")}
-                </div>
-                <ha-cover-tilt-controls
-                  .hass=${this.hass}
-                  .stateObj=${this.stateObj}
-                ></ha-cover-tilt-controls>
-              `
-            : html``}
-        </div>
-      </div>
-      <ha-attributes
-        .hass=${this.hass}
-        .stateObj=${this.stateObj}
-        extra-filters="current_position,current_tilt_position"
-      ></ha-attributes>
-    `;
-  }
-
-  private _computeClassNames(stateObj) {
-    const classes = [
-      attributeClassNames(stateObj, [
-        "current_position",
-        "current_tilt_position",
-      ]),
-      featureClassNames(stateObj, FEATURE_CLASS_NAMES),
-    ];
-    return classes.join(" ");
-  }
-
-  private _coverPositionSliderChanged(ev) {
-    this.hass.callService("cover", "set_cover_position", {
-      entity_id: this.stateObj.entity_id,
-      position: ev.target.value,
-    });
-  }
-
-  private _coverTiltPositionSliderChanged(ev) {
-    this.hass.callService("cover", "set_cover_tilt_position", {
-      entity_id: this.stateObj.entity_id,
-      tilt_position: ev.target.value,
-    });
-  }
-
-  static get styles(): CSSResult {
-    return css`
-      .current_position,
-      .tilt {
-        max-height: 0px;
-        overflow: hidden;
-      }
-
-      .has-set_position .current_position,
-      .has-current_position .current_position,
-      .has-open_tilt .tilt,
-      .has-close_tilt .tilt,
-      .has-stop_tilt .tilt,
-      .has-set_tilt_position .tilt,
-      .has-current_tilt_position .tilt {
-        max-height: 208px;
-      }
-
-      /* from ha-labeled-slider for consistent look */
-      .title {
-        margin: 5px 0 8px;
-        color: var(--primary-text-color);
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "more-info-cover": MoreInfoCover;
-  }
-}
--- a/src/dialogs/more-info/state_more_info_control.ts
+++ b/src/dialogs/more-info/state_more_info_control.ts
@@ -1,6 +1,6 @@
 import type { HassEntity } from "home-assistant-js-websocket";
 import {
-  DOMAINS_HIDE_DEFAULT_MORE_INFO,
+  DOMAINS_HIDE_MORE_INFO,
  DOMAINS_WITH_MORE_INFO,
 } from "../../common/const";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
@@ -40,7 +40,7 @@ export const domainMoreInfoType = (domain: string): string => {
  if (DOMAINS_WITH_MORE_INFO.includes(domain)) {
    return domain;
  }
-  if (DOMAINS_HIDE_DEFAULT_MORE_INFO.includes(domain)) {
+  if (DOMAINS_HIDE_MORE_INFO.includes(domain)) {
    return "hidden";
  }
  return "default";
--- a/src/fake_data/demo_config.ts
+++ b/src/fake_data/demo_config.ts
@@ -10,9 +10,6 @@ export const demoConfig: HassConfig = {
    mass: "kg",
    temperature: "°C",
    volume: "L",
-    pressure: "Pa",
-    wind_speed: "m/s",
-    accumulated_precipitation: "mm",
  },
  components: [
    "notify.html5",
--- a/src/fake_data/provide_hass.ts
+++ b/src/fake_data/provide_hass.ts
@@ -201,7 +201,6 @@ export const provideHass = (
      default_dark_theme: null,
      themes: {},
      darkMode: false,
-      theme: "default",
    },
    panels: demoPanels,
    services: demoServices,
--- a/src/layouts/ha-init-page.ts
+++ b/src/layouts/ha-init-page.ts
@@ -21,7 +21,7 @@ class HaInitPage extends LitElement {
                  Home Assistant is not currently connected. You can ask it to
                  come online from your
                  <a href="https://account.nabucasa.com/"
-                    >Nabu Casa account page</a
+                    >Naba Casa account page</a
                  >.
                </p>
              `
--- a/src/layouts/hass-subpage.ts
+++ b/src/layouts/hass-subpage.ts
@@ -91,7 +91,7 @@ class HassSubpage extends LitElement {
        box-sizing: border-box;
      }
      .toolbar a {
-        color: var(--sidebar-text-color);
+        color: var(--app-header-text-color);
        text-decoration: none;
      }

--- a/src/layouts/hass-tabs-subpage.ts
+++ b/src/layouts/hass-tabs-subpage.ts
@@ -227,7 +227,7 @@ class HassTabsSubpage extends LitElement {
        box-sizing: border-box;
      }
      .toolbar a {
-        color: var(--sidebar-text-color);
+        color: var(--app-header-text-color);
        text-decoration: none;
      }
      .bottom-bar a {
--- a/src/onboarding/ha-onboarding.ts
+++ b/src/onboarding/ha-onboarding.ts
@@ -13,11 +13,12 @@ import { extractSearchParamsObject } from "../common/url/search-params";
 import { subscribeOne } from "../common/util/subscribe-one";
 import { AuthUrlSearchParams, hassUrl } from "../data/auth";
 import {
-  fetchInstallationType,
+  InstallationType,
  fetchOnboardingOverview,
  OnboardingResponses,
  OnboardingStep,
  onboardIntegrationStep,
+  fetchInstallationType,
 } from "../data/onboarding";
 import { subscribeUser } from "../data/ws-user";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
@@ -68,6 +69,8 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {

  @state() private _steps?: OnboardingStep[];

+  @state() private _installation_type?: InstallationType;
+
  protected render(): TemplateResult {
    const step = this._curStep()!;

@@ -87,6 +90,7 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
          ? html`<onboarding-restore-backup
              .localize=${this.localize}
              .restoring=${this._restoring}
+              .installtionType=${this._installation_type}
              @restoring=${this._restoringBackup}
            >
            </onboarding-restore-backup>`
@@ -133,13 +137,17 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
      import("./particles");
    }
    if (matchMedia("(prefers-color-scheme: dark)").matches) {
-      applyThemesOnElement(document.documentElement, {
-        default_theme: "default",
-        default_dark_theme: null,
-        themes: {},
-        darkMode: true,
-        theme: "default",
-      });
+      applyThemesOnElement(
+        document.documentElement,
+        {
+          default_theme: "default",
+          default_dark_theme: null,
+          themes: {},
+          darkMode: false,
+        },
+        "default",
+        { dark: true }
+      );
    }
  }

--- a/src/onboarding/onboarding-restore-backup.ts
+++ b/src/onboarding/onboarding-restore-backup.ts
@@ -2,15 +2,15 @@ import "@material/mwc-button/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../hassio/src/components/hassio-ansi-to-html";
-import { showBackupUploadDialog } from "../../hassio/src/dialogs/backup/show-dialog-backup-upload";
 import { showHassioBackupDialog } from "../../hassio/src/dialogs/backup/show-dialog-hassio-backup";
+import { showBackupUploadDialog } from "../../hassio/src/dialogs/backup/show-dialog-backup-upload";
 import type { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-card";
-import { fetchInstallationType } from "../data/onboarding";
 import { makeDialogManager } from "../dialogs/make-dialog-manager";
 import { ProvideHassLitMixin } from "../mixins/provide-hass-lit-mixin";
 import { haStyle } from "../resources/styles";
 import "./onboarding-loading";
+import { fetchInstallationType, InstallationType } from "../data/onboarding";

 declare global {
  interface HASSDomEvents {
@@ -26,6 +26,9 @@ class OnboardingRestoreBackup extends ProvideHassLitMixin(LitElement) {

  @property({ type: Boolean }) public restoring = false;

+  @property({ attribute: false })
+  public installationType?: InstallationType;
+
  protected render(): TemplateResult {
    return this.restoring
      ? html`<ha-card
--- a/src/panels/config/areas/ha-config-area-page.ts
+++ b/src/panels/config/areas/ha-config-area-page.ts
@@ -35,11 +35,6 @@ import {
  loadAreaRegistryDetailDialog,
  showAreaRegistryDetailDialog,
 } from "./show-dialog-area-registry-detail";
-import { computeDomain } from "../../../common/entity/compute_domain";
-import { SceneEntity } from "../../../data/scene";
-import { ScriptEntity } from "../../../data/script";
-import { AutomationEntity } from "../../../data/automation";
-import { groupBy } from "../../../common/util/group-by";

@customElement("ha-config-area-page")
 class HaConfigAreaPage extends LitElement {
@@ -136,10 +131,6 @@ class HaConfigAreaPage extends LitElement {
      this.entities
    );

-    const grouped = groupBy(entities, (entity) =>
-      computeDomain(entity.entity_id)
-    );
-
    return html`
      <hass-tabs-subpage
        .hass=${this.hass}
@@ -230,22 +221,19 @@ class HaConfigAreaPage extends LitElement {
              )}
            >
              ${entities.length
-                ? entities.map((entity) =>
-                    ["scene", "script", "automation"].includes(
-                      computeDomain(entity.entity_id)
-                    )
-                      ? ""
-                      : html`
-                          <paper-item
-                            @click=${this._openEntity}
-                            .entity=${entity}
-                          >
-                            <paper-item-body>
-                              ${computeEntityRegistryName(this.hass, entity)}
-                            </paper-item-body>
-                            <ha-icon-next></ha-icon-next>
-                          </paper-item>
-                        `
+                ? entities.map(
+                    (entity) =>
+                      html`
+                        <paper-item
+                          @click=${this._openEntity}
+                          .entity=${entity}
+                        >
+                          <paper-item-body>
+                            ${computeEntityRegistryName(this.hass, entity)}
+                          </paper-item-body>
+                          <ha-icon-next></ha-icon-next>
+                        </paper-item>
+                      `
                  )
                : html`
                    <paper-item class="no-link"
@@ -263,44 +251,48 @@ class HaConfigAreaPage extends LitElement {
                    .header=${this.hass.localize(
                      "ui.panel.config.devices.automation.automations"
                    )}
-                  >
-                    ${grouped.automation?.length
-                      ? html`<h3>Assigned to this area:</h3>
-                          ${grouped.automation.map((entity) => {
-                            const entityState = this.hass.states[
-                              entity.entity_id
-                            ] as AutomationEntity | undefined;
-                            return entityState
-                              ? this._renderAutomation(entityState)
-                              : "";
-                          })}`
-                      : ""}
-                    ${this._related?.automation?.filter(
-                      (entityId) =>
-                        !grouped.automation?.find(
-                          (entity) => entity.entity_id === entityId
-                        )
-                    ).length
-                      ? html`<h3>Targeting this area:</h3>
-                          ${this._related.automation.map((scene) => {
-                            const entityState = this.hass.states[scene] as
-                              | AutomationEntity
-                              | undefined;
-                            return entityState
-                              ? this._renderAutomation(entityState)
-                              : "";
-                          })}`
-                      : ""}
-                    ${!grouped.automation?.length &&
-                    !this._related?.automation?.length
-                      ? html`
+                    >${this._related?.automation?.length
+                      ? this._related.automation.map((automation) => {
+                          const entityState = this.hass.states[automation];
+                          return entityState
+                            ? html`
+                                <div>
+                                  <a
+                                    href=${ifDefined(
+                                      entityState.attributes.id
+                                        ? `/config/automation/edit/${entityState.attributes.id}`
+                                        : undefined
+                                    )}
+                                  >
+                                    <paper-item
+                                      .disabled=${!entityState.attributes.id}
+                                    >
+                                      <paper-item-body>
+                                        ${computeStateName(entityState)}
+                                      </paper-item-body>
+                                      <ha-icon-next></ha-icon-next>
+                                    </paper-item>
+                                  </a>
+                                  ${!entityState.attributes.id
+                                    ? html`
+                                        <paper-tooltip animation-delay="0">
+                                          ${this.hass.localize(
+                                            "ui.panel.config.devices.cant_edit"
+                                          )}
+                                        </paper-tooltip>
+                                      `
+                                    : ""}
+                                </div>
+                              `
+                            : "";
+                        })
+                      : html`
                          <paper-item class="no-link"
                            >${this.hass.localize(
                              "ui.panel.config.devices.automation.no_automations"
                            )}</paper-item
                          >
-                        `
-                      : ""}
+                        `}
                  </ha-card>
                `
              : ""}
@@ -312,40 +304,48 @@ class HaConfigAreaPage extends LitElement {
                    .header=${this.hass.localize(
                      "ui.panel.config.devices.scene.scenes"
                    )}
-                  >
-                    ${grouped.scene?.length
-                      ? html`<h3>Assigned to this area:</h3>
-                          ${grouped.scene.map((entity) => {
-                            const entityState =
-                              this.hass.states[entity.entity_id];
-                            return entityState
-                              ? this._renderScene(entityState)
-                              : "";
-                          })}`
-                      : ""}
-                    ${this._related?.scene?.filter(
-                      (entityId) =>
-                        !grouped.scene?.find(
-                          (entity) => entity.entity_id === entityId
-                        )
-                    ).length
-                      ? html`<h3>Targeting this area:</h3>
-                          ${this._related.scene.map((scene) => {
-                            const entityState = this.hass.states[scene];
-                            return entityState
-                              ? this._renderScene(entityState)
-                              : "";
-                          })}`
-                      : ""}
-                    ${!grouped.scene?.length && !this._related?.scene?.length
-                      ? html`
+                    >${this._related?.scene?.length
+                      ? this._related.scene.map((scene) => {
+                          const entityState = this.hass.states[scene];
+                          return entityState
+                            ? html`
+                                <div>
+                                  <a
+                                    href=${ifDefined(
+                                      entityState.attributes.id
+                                        ? `/config/scene/edit/${entityState.attributes.id}`
+                                        : undefined
+                                    )}
+                                  >
+                                    <paper-item
+                                      .disabled=${!entityState.attributes.id}
+                                    >
+                                      <paper-item-body>
+                                        ${computeStateName(entityState)}
+                                      </paper-item-body>
+                                      <ha-icon-next></ha-icon-next>
+                                    </paper-item>
+                                  </a>
+                                  ${!entityState.attributes.id
+                                    ? html`
+                                        <paper-tooltip animation-delay="0">
+                                          ${this.hass.localize(
+                                            "ui.panel.config.devices.cant_edit"
+                                          )}
+                                        </paper-tooltip>
+                                      `
+                                    : ""}
+                                </div>
+                              `
+                            : "";
+                        })
+                      : html`
                          <paper-item class="no-link"
                            >${this.hass.localize(
                              "ui.panel.config.devices.scene.no_scenes"
                            )}</paper-item
                          >
-                        `
-                      : ""}
+                        `}
                  </ha-card>
                `
              : ""}
@@ -355,43 +355,31 @@ class HaConfigAreaPage extends LitElement {
                    .header=${this.hass.localize(
                      "ui.panel.config.devices.script.scripts"
                    )}
-                  >
-                    ${grouped.script?.length
-                      ? html`<h3>Assigned to this area:</h3>
-                          ${grouped.script.map((entity) => {
-                            const entityState = this.hass.states[
-                              entity.entity_id
-                            ] as ScriptEntity | undefined;
-                            return entityState
-                              ? this._renderScript(entityState)
-                              : "";
-                          })}`
-                      : ""}
-                    ${this._related?.script?.filter(
-                      (entityId) =>
-                        !grouped.script?.find(
-                          (entity) => entity.entity_id === entityId
-                        )
-                    ).length
-                      ? html`<h3>Targeting this area:</h3>
-                          ${this._related.script.map((scene) => {
-                            const entityState = this.hass.states[scene] as
-                              | ScriptEntity
-                              | undefined;
-                            return entityState
-                              ? this._renderScript(entityState)
-                              : "";
-                          })}`
-                      : ""}
-                    ${!grouped.script?.length && !this._related?.script?.length
-                      ? html`
-                          <paper-item class="no-link"
-                            >${this.hass.localize(
+                    >${this._related?.script?.length
+                      ? this._related.script.map((script) => {
+                          const entityState = this.hass.states[script];
+                          return entityState
+                            ? html`
+                                <a
+                                  href=${`/config/script/edit/${entityState.entity_id}`}
+                                >
+                                  <paper-item>
+                                    <paper-item-body>
+                                      ${computeStateName(entityState)}
+                                    </paper-item-body>
+                                    <ha-icon-next></ha-icon-next>
+                                  </paper-item>
+                                </a>
+                              `
+                            : "";
+                        })
+                      : html`
+                          <paper-item class="no-link">
+                            ${this.hass.localize(
                              "ui.panel.config.devices.script.no_scripts"
                            )}</paper-item
                          >
-                        `
-                      : ""}
+                        `}
                  </ha-card>
                `
              : ""}
@@ -401,63 +389,6 @@ class HaConfigAreaPage extends LitElement {
    `;
  }

-  private _renderScene(entityState: SceneEntity) {
-    return html`<div>
-      <a
-        href=${ifDefined(
-          entityState.attributes.id
-            ? `/config/scene/edit/${entityState.attributes.id}`
-            : undefined
-        )}
-      >
-        <paper-item .disabled=${!entityState.attributes.id}>
-          <paper-item-body> ${computeStateName(entityState)} </paper-item-body>
-          <ha-icon-next></ha-icon-next>
-        </paper-item>
-      </a>
-      ${!entityState.attributes.id
-        ? html`
-            <paper-tooltip animation-delay="0">
-              ${this.hass.localize("ui.panel.config.devices.cant_edit")}
-            </paper-tooltip>
-          `
-        : ""}
-    </div>`;
-  }
-
-  private _renderAutomation(entityState: AutomationEntity) {
-    return html`<div>
-      <a
-        href=${ifDefined(
-          entityState.attributes.id
-            ? `/config/automation/edit/${entityState.attributes.id}`
-            : undefined
-        )}
-      >
-        <paper-item .disabled=${!entityState.attributes.id}>
-          <paper-item-body> ${computeStateName(entityState)} </paper-item-body>
-          <ha-icon-next></ha-icon-next>
-        </paper-item>
-      </a>
-      ${!entityState.attributes.id
-        ? html`
-            <paper-tooltip animation-delay="0">
-              ${this.hass.localize("ui.panel.config.devices.cant_edit")}
-            </paper-tooltip>
-          `
-        : ""}
-    </div>`;
-  }
-
-  private _renderScript(entityState: ScriptEntity) {
-    return html`<a href=${`/config/script/edit/${entityState.entity_id}`}>
-      <paper-item>
-        <paper-item-body> ${computeStateName(entityState)} </paper-item-body>
-        <ha-icon-next></ha-icon-next>
-      </paper-item>
-    </a>`;
-  }
-
  private async _findRelated() {
    this._related = await findRelated(this.hass, "area", this.areaId);
  }
@@ -526,13 +457,6 @@ class HaConfigAreaPage extends LitElement {
          align-items: center;
        }

-        h3 {
-          margin: 0;
-          padding: 0 16px;
-          font-weight: 500;
-          color: var(--secondary-text-color);
-        }
-
        img {
          border-radius: var(--ha-card-border-radius, 4px);
          width: 100%;
--- a/src/panels/config/areas/ha-config-areas-dashboard.ts
+++ b/src/panels/config/areas/ha-config-areas-dashboard.ts
@@ -50,8 +50,11 @@ export class HaConfigAreasDashboard extends LitElement {
        let noServicesInArea = 0;
        let noEntitiesInArea = 0;

+        const devicesInArea = new Set();
+
        for (const device of devices) {
          if (device.area_id === area.area_id) {
+            devicesInArea.add(device.id);
            if (device.entry_type === "service") {
              noServicesInArea++;
            } else {
@@ -61,7 +64,11 @@ export class HaConfigAreasDashboard extends LitElement {
        }

        for (const entity of entities) {
-          if (entity.area_id === area.area_id) {
+          if (
+            entity.area_id
+              ? entity.area_id === area.area_id
+              : devicesInArea.has(entity.device_id)
+          ) {
            noEntitiesInArea++;
          }
        }
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -5,7 +5,6 @@ import "@polymer/paper-item/paper-item";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { handleStructError } from "../../../../common/structs/handle-errors";
 import "../../../../components/ha-button-menu";
 import "../../../../components/ha-card";
 import "../../../../components/ha-icon-button";
@@ -52,8 +51,6 @@ export default class HaAutomationConditionRow extends LitElement {

  @state() private _yamlMode = false;

-  @state() private _warnings?: string[];
-
  protected render() {
    if (!this.condition) {
      return html``;
@@ -90,25 +87,7 @@ export default class HaAutomationConditionRow extends LitElement {
              </mwc-list-item>
            </ha-button-menu>
          </div>
-          ${this._warnings
-            ? html`<ha-alert
-                alert-type="warning"
-                .title=${this.hass.localize(
-                  "ui.errors.config.editor_not_supported"
-                )}
-              >
-                ${this._warnings!.length > 0 && this._warnings![0] !== undefined
-                  ? html` <ul>
-                      ${this._warnings!.map(
-                        (warning) => html`<li>${warning}</li>`
-                      )}
-                    </ul>`
-                  : ""}
-                ${this.hass.localize("ui.errors.config.edit_in_yaml_supported")}
-              </ha-alert>`
-            : ""}
          <ha-automation-condition-editor
-            @ui-mode-not-available=${this._handleUiModeNotAvailable}
            .yamlMode=${this._yamlMode}
            .hass=${this.hass}
            .condition=${this.condition}
@@ -118,15 +97,6 @@ export default class HaAutomationConditionRow extends LitElement {
    `;
  }

-  private _handleUiModeNotAvailable(ev: CustomEvent) {
-    // Prevent possible parent action-row from switching to yamlMode
-    ev.stopPropagation();
-    this._warnings = handleStructError(this.hass, ev.detail).warnings;
-    if (!this._yamlMode) {
-      this._yamlMode = true;
-    }
-  }
-
  private _handleAction(ev: CustomEvent<ActionDetail>) {
    switch (ev.detail.index) {
      case 0:
@@ -155,7 +125,6 @@ export default class HaAutomationConditionRow extends LitElement {
  }

  private _switchYamlMode() {
-    this._warnings = undefined;
    this._yamlMode = !this._yamlMode;
  }

--- a/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
+++ b/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
@@ -1,5 +1,5 @@
 import "@polymer/paper-input/paper-input";
-import { html, LitElement, PropertyValues } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import "../../../../../components/entity/ha-entity-attribute-picker";
@@ -11,7 +11,6 @@ import {
  handleChangeEvent,
 } from "../ha-automation-condition-row";
 import "../../../../../components/ha-duration-input";
-import { fireEvent } from "../../../../../common/dom/fire_event";

@customElement("ha-automation-condition-state")
 export class HaStateCondition extends LitElement implements ConditionElement {
@@ -23,23 +22,6 @@ export class HaStateCondition extends LitElement implements ConditionElement {
    return { entity_id: "", state: "" };
  }

-  public willUpdate(changedProperties: PropertyValues): boolean {
-    if (
-      changedProperties.has("condition") &&
-      Array.isArray(this.condition?.state)
-    ) {
-      fireEvent(
-        this,
-        "ui-mode-not-available",
-        Error(this.hass.localize("ui.errors.config.no_state_array_support"))
-      );
-      // We have to stop the update if state is an array.
-      // Otherwise the state will be changed to a comma-separated string by the input element.
-      return false;
-    }
-    return true;
-  }
-
  protected render() {
    const { entity_id, attribute, state } = this.condition;
    const forTime = createDurationData(this.condition.for);
--- a/src/panels/config/automation/dialog-new-automation.ts
+++ b/src/panels/config/automation/dialog-new-automation.ts
@@ -1,19 +1,24 @@
 import "@material/mwc-button";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { nextRender } from "../../../common/util/render-status";
 import "../../../components/ha-blueprint-picker";
 import "../../../components/ha-card";
 import "../../../components/ha-circular-progress";
 import { createCloseHeading } from "../../../components/ha-dialog";
-import { showAutomationEditor } from "../../../data/automation";
-import { HassDialog } from "../../../dialogs/make-dialog-manager";
+import {
+  AutomationConfig,
+  showAutomationEditor,
+} from "../../../data/automation";
+import {
+  HassDialog,
+  replaceDialog,
+} from "../../../dialogs/make-dialog-manager";
 import { haStyle, haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
-import "@material/mwc-list/mwc-list-item";
-import "../../../components/ha-icon-next";
-import "@material/mwc-list/mwc-list";
+import { showThingtalkDialog } from "./thingtalk/show-dialog-thingtalk";

@customElement("ha-dialog-new-automation")
 class DialogNewAutomation extends LitElement implements HassDialog {
@@ -37,52 +42,84 @@ class DialogNewAutomation extends LitElement implements HassDialog {
    return html`
      <ha-dialog
        open
-        hideActions
        @closed=${this.closeDialog}
        .heading=${createCloseHeading(
          this.hass,
-          this.hass.localize("ui.panel.config.automation.dialog_new.how")
+          this.hass.localize("ui.panel.config.automation.dialog_new.header")
        )}
      >
-        <mwc-list>
-          <mwc-list-item twoline class="blueprint" @click=${this._blueprint}>
-            ${this.hass.localize(
-              "ui.panel.config.automation.dialog_new.blueprint.use_blueprint"
-            )}
-            <span slot="secondary">
-              <ha-blueprint-picker
-                @value-changed=${this._blueprintPicked}
-                .hass=${this.hass}
-              ></ha-blueprint-picker>
-            </span>
-          </mwc-list-item>
-          <li divider role="separator"></li>
-          <mwc-list-item hasmeta twoline @click=${this._blank}>
-            ${this.hass.localize(
-              "ui.panel.config.automation.dialog_new.start_empty"
-            )}
-            <span slot="secondary">
-              ${this.hass.localize(
-                "ui.panel.config.automation.dialog_new.start_empty_description"
-              )}
-            </span>
-            <ha-icon-next slot="meta"></ha-icon-next
-          ></mwc-list-item>
-        </mwc-list>
+        <div>
+          ${this.hass.localize("ui.panel.config.automation.dialog_new.how")}
+          <div class="container">
+            ${isComponentLoaded(this.hass, "cloud")
+              ? html`<ha-card outlined>
+                  <div>
+                    <h3>
+                      ${this.hass.localize(
+                        "ui.panel.config.automation.dialog_new.thingtalk.header"
+                      )}
+                    </h3>
+                    ${this.hass.localize(
+                      "ui.panel.config.automation.dialog_new.thingtalk.intro"
+                    )}
+                    <div class="side-by-side">
+                      <paper-input
+                        id="input"
+                        .label=${this.hass.localize(
+                          "ui.panel.config.automation.dialog_new.thingtalk.input_label"
+                        )}
+                      ></paper-input>
+                      <mwc-button @click=${this._thingTalk}
+                        >${this.hass.localize(
+                          "ui.panel.config.automation.dialog_new.thingtalk.create"
+                        )}</mwc-button
+                      >
+                    </div>
+                  </div>
+                </ha-card>`
+              : html``}
+            ${isComponentLoaded(this.hass, "blueprint")
+              ? html`<ha-card outlined>
+                  <div>
+                    <h3>
+                      ${this.hass.localize(
+                        "ui.panel.config.automation.dialog_new.blueprint.use_blueprint"
+                      )}
+                    </h3>
+                    <ha-blueprint-picker
+                      @value-changed=${this._blueprintPicked}
+                      .hass=${this.hass}
+                    ></ha-blueprint-picker>
+                  </div>
+                </ha-card>`
+              : html``}
+          </div>
+        </div>
+        <mwc-button slot="primaryAction" @click=${this._blank}>
+          ${this.hass.localize(
+            "ui.panel.config.automation.dialog_new.start_empty"
+          )}
+        </mwc-button>
      </ha-dialog>
    `;
  }

+  private _thingTalk() {
+    replaceDialog();
+    showThingtalkDialog(this, {
+      callback: (config: Partial<AutomationConfig> | undefined) =>
+        showAutomationEditor(config),
+      input: this.shadowRoot!.querySelector("paper-input")!.value as string,
+    });
+    this.closeDialog();
+  }
+
  private async _blueprintPicked(ev: CustomEvent) {
    this.closeDialog();
    await nextRender();
    showAutomationEditor({ use_blueprint: { path: ev.detail.value } });
  }

-  private async _blueprint() {
-    this.shadowRoot!.querySelector("ha-blueprint-picker")!.open();
-  }
-
  private async _blank() {
    this.closeDialog();
    await nextRender();
@@ -94,14 +131,38 @@ class DialogNewAutomation extends LitElement implements HassDialog {
      haStyle,
      haStyleDialog,
      css`
-        mwc-list-item.blueprint {
-          height: 92px;
+        .container {
+          display: flex;
+        }
+        ha-card {
+          width: calc(50% - 8px);
+          margin: 4px;
+        }
+        ha-card div {
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+        }
+        ha-card {
+          box-sizing: border-box;
+          padding: 8px;
        }
        ha-blueprint-picker {
-          margin-top: -16px;
+          width: 100%;
        }
-        ha-dialog {
-          --dialog-content-padding: 0;
+        .side-by-side {
+          display: flex;
+          flex-direction: row;
+          align-items: flex-end;
+        }
+        @media all and (max-width: 500px) {
+          .container {
+            flex-direction: column;
+          }
+          ha-card {
+            width: 100%;
+          }
        }
      `,
    ];
--- a/src/panels/config/automation/ha-automation-picker.ts
+++ b/src/panels/config/automation/ha-automation-picker.ts
@@ -315,7 +315,10 @@ class HaAutomationPicker extends LitElement {
  };

  private _createNew() {
-    if (isComponentLoaded(this.hass, "blueprint")) {
+    if (
+      isComponentLoaded(this.hass, "cloud") ||
+      isComponentLoaded(this.hass, "blueprint")
+    ) {
      showNewAutomationDialog(this);
    } else {
      navigate("/config/automation/edit/new");
--- a/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts
+++ b/src/panels/config/cloud/dialog-cloud-certificate/dialog-cloud-certificate.ts
@@ -3,7 +3,7 @@ import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { formatDateTime } from "../../../../common/datetime/format_date_time";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import { haStyleDialog } from "../../../../resources/styles";
+import { haStyle } from "../../../../resources/styles";
 import type { HomeAssistant } from "../../../../types";
 import type { CloudCertificateParams as CloudCertificateDialogParams } from "./show-dialog-cloud-certificate";

@@ -68,7 +68,7 @@ class DialogCloudCertificate extends LitElement {

  static get styles(): CSSResultGroup {
    return [
-      haStyleDialog,
+      haStyle,
      css`
        ha-dialog {
          --mdc-dialog-max-width: 535px;
--- a/src/panels/config/dashboard/ha-config-dashboard.ts
+++ b/src/panels/config/dashboard/ha-config-dashboard.ts
@@ -1,32 +1,21 @@
-import { mdiCellphoneCog, mdiCloudLock } from "@mdi/js";
+import "./ha-config-updates";
+import { mdiCloudLock } from "@mdi/js";
 import "@polymer/app-layout/app-header/app-header";
 import "@polymer/app-layout/app-toolbar/app-toolbar";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  PropertyValues,
-  TemplateResult,
-} from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import "../../../components/ha-card";
 import "../../../components/ha-icon-next";
 import "../../../components/ha-menu-button";
 import { CloudStatus } from "../../../data/cloud";
-import { SupervisorAvailableUpdates } from "../../../data/supervisor/supervisor";
-import {
-  ExternalConfig,
-  getExternalConfig,
-} from "../../../external_app/external_config";
 import "../../../layouts/ha-app-layout";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import "../ha-config-section";
 import { configSections } from "../ha-panel-config";
 import "./ha-config-navigation";
-import "./ha-config-updates";
+import { SupervisorAvailableUpdates } from "../../../data/supervisor/supervisor";

@customElement("ha-config-dashboard")
 class HaConfigDashboard extends LitElement {
@@ -43,18 +32,6 @@ class HaConfigDashboard extends LitElement {

  @property() public showAdvanced!: boolean;

-  @state() private _externalConfig?: ExternalConfig;
-
-  protected firstUpdated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
-
-    if (this.hass && this.hass.auth.external) {
-      getExternalConfig(this.hass.auth.external).then((conf) => {
-        this._externalConfig = conf;
-      });
-    }
-  }
-
  protected render(): TemplateResult {
    return html`
      <ha-app-layout>
@@ -76,7 +53,7 @@ class HaConfigDashboard extends LitElement {
          ${isComponentLoaded(this.hass, "hassio") &&
          this.supervisorUpdates === undefined
            ? html``
-            : html`${this.supervisorUpdates?.length
+            : html`${this.supervisorUpdates !== null
                  ? html`<ha-card>
                      <ha-config-updates
                        .hass=${this.hass}
@@ -86,7 +63,7 @@ class HaConfigDashboard extends LitElement {
                    </ha-card>`
                  : ""}
                <ha-card>
-                  ${this.narrow && this.supervisorUpdates?.length
+                  ${this.narrow && this.supervisorUpdates !== null
                    ? html`<div class="title">
                        ${this.hass.localize("panel.config")}
                      </div>`
@@ -95,7 +72,6 @@ class HaConfigDashboard extends LitElement {
                    ? html`
                        <ha-config-navigation
                          .hass=${this.hass}
-                          .narrow=${this.narrow}
                          .showAdvanced=${this.showAdvanced}
                          .pages=${[
                            {
@@ -110,45 +86,31 @@ class HaConfigDashboard extends LitElement {
                        ></ha-config-navigation>
                      `
                    : ""}
-                  ${this._externalConfig?.hasSettingsScreen
-                    ? html`
-                        <ha-config-navigation
-                          .hass=${this.hass}
-                          .narrow=${this.narrow}
-                          .showAdvanced=${this.showAdvanced}
-                          .pages=${[
-                            {
-                              path: "#external-app-configuration",
-                              name: "Companion App",
-                              description: "Location and notifications",
-                              iconPath: mdiCellphoneCog,
-                              iconColor: "#37474F",
-                              core: true,
-                            },
-                          ]}
-                          @click=${this._handleExternalAppConfiguration}
-                        ></ha-config-navigation>
-                      `
-                    : ""}
                  <ha-config-navigation
                    .hass=${this.hass}
-                    .narrow=${this.narrow}
                    .showAdvanced=${this.showAdvanced}
                    .pages=${configSections.dashboard}
                  ></ha-config-navigation>
-                </ha-card>`}
+                </ha-card>
+                ${!this.showAdvanced
+                  ? html`
+                      <div class="promo-advanced">
+                        ${this.hass.localize(
+                          "ui.panel.config.advanced_mode.hint_enable"
+                        )}
+                        <a href="/profile"
+                          >${this.hass.localize(
+                            "ui.panel.config.advanced_mode.link_profile_page"
+                          )}</a
+                        >.
+                      </div>
+                    `
+                  : ""}`}
        </ha-config-section>
      </ha-app-layout>
    `;
  }

-  private _handleExternalAppConfiguration(ev: Event) {
-    ev.preventDefault();
-    this.hass.auth.external!.fireMessage({
-      type: "config_screen/show",
-    });
-  }
-
  static get styles(): CSSResultGroup {
    return [
      haStyle,
@@ -177,6 +139,14 @@ class HaConfigDashboard extends LitElement {
          padding: 16px;
          padding-bottom: 0;
        }
+        .promo-advanced {
+          text-align: center;
+          color: var(--secondary-text-color);
+          margin-bottom: 24px;
+        }
+        .promo-advanced a {
+          color: var(--secondary-text-color);
+        }
        :host([narrow]) ha-card {
          background-color: var(--primary-background-color);
          box-shadow: unset;
--- a/src/panels/config/dashboard/ha-config-navigation.ts
+++ b/src/panels/config/dashboard/ha-config-navigation.ts
@@ -13,8 +13,6 @@ import { HomeAssistant } from "../../../types";
 class HaConfigNavigation extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property({ type: Boolean }) public narrow!: boolean;
-
  @property() public showAdvanced!: boolean;

  @property() public pages!: PageNavigation[];
@@ -25,7 +23,7 @@ class HaConfigNavigation extends LitElement {
        canShowPage(this.hass, page)
          ? html`
              <a href=${page.path} aria-role="option" tabindex="-1">
-                <paper-icon-item @click=${this._entryClicked}>
+                <paper-icon-item>
                  <div
                    class=${page.iconColor ? "icon-background" : ""}
                    slot="item-icon"
@@ -66,7 +64,7 @@ class HaConfigNavigation extends LitElement {
                          </div>
                        `}
                  </paper-item-body>
-                  ${!this.narrow ? html`<ha-icon-next></ha-icon-next>` : ""}
+                  <ha-icon-next></ha-icon-next>
                </paper-icon-item>
              </a>
            `
@@ -75,10 +73,6 @@ class HaConfigNavigation extends LitElement {
    `;
  }

-  private _entryClicked(ev) {
-    ev.currentTarget.blur();
-  }
-
  static get styles(): CSSResultGroup {
    return css`
      a {
--- a/src/panels/config/dashboard/ha-config-updates.ts
+++ b/src/panels/config/dashboard/ha-config-updates.ts
@@ -29,7 +29,7 @@ class HaConfigUpdates extends LitElement {
  @state() private _showAll = false;

  protected render(): TemplateResult {
-    if (!this.supervisorUpdates?.length) {
+    if (!this.supervisorUpdates) {
      return html``;
    }

@@ -76,12 +76,11 @@ class HaConfigUpdates extends LitElement {
          </paper-icon-item>
        `
      )}
+      ${!this._showAll && !this.narrow ? html`<div class="divider"></div>` : ""}
      ${!this._showAll && this.supervisorUpdates.length >= 4
        ? html`
            <button class="link show-all" @click=${this._showAllClicked}>
-              ${this.hass.localize("ui.panel.config.updates.more_updates", {
-                count: this.supervisorUpdates!.length - updates.length,
-              })}
+              ${this.hass.localize("ui.panel.config.updates.show_all_updates")}
            </button>
          `
        : ""}
@@ -123,7 +122,13 @@ class HaConfigUpdates extends LitElement {
        button.show-all {
          color: var(--primary-color);
          text-decoration: none;
-          margin: 16px;
+          margin: 8px 16px;
+        }
+        .divider::before {
+          content: " ";
+          display: block;
+          height: 1px;
+          background-color: var(--divider-color);
        }
      `,
    ];
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -9,7 +9,7 @@ import {
  PropertyValues,
  TemplateResult,
 } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { computeDomain } from "../../../../common/entity/compute_domain";
 import { domainIcon } from "../../../../common/entity/domain_icon";
 import "../../../../components/entity/state-badge";
@@ -25,10 +25,6 @@ import { showEntityEditorDialog } from "../../entities/show-dialog-entity-editor
 import { EntityRegistryStateEntry } from "../ha-config-device-page";
 import { computeStateName } from "../../../../common/entity/compute_state_name";
 import { stripPrefixFromEntityName } from "../../../../common/entity/strip_prefix_from_entity_name";
-import {
-  ExtEntityRegistryEntry,
-  getExtendedEntityRegistryEntry,
-} from "../../../../data/entity_registry";

@customElement("ha-device-entities-card")
 export class HaDeviceEntitiesCard extends LitElement {
@@ -42,11 +38,6 @@ export class HaDeviceEntitiesCard extends LitElement {

  @property() public showDisabled = false;

-  @state() private _extDisabledEntityEntries?: Record<
-    string,
-    ExtEntityRegistryEntry
-  >;
-
  private _entityRows: Array<LovelaceRow | HuiErrorCard> = [];

  protected shouldUpdate(changedProps: PropertyValues) {
@@ -69,13 +60,7 @@ export class HaDeviceEntitiesCard extends LitElement {
              <div id="entities" @hass-more-info=${this._overrideMoreInfo}>
                ${this.entities.map((entry: EntityRegistryStateEntry) => {
                  if (entry.disabled_by) {
-                    if (this._extDisabledEntityEntries) {
-                      disabledEntities.push(
-                        this._extDisabledEntityEntries[entry.entity_id] || entry
-                      );
-                    } else {
-                      disabledEntities.push(entry);
-                    }
+                    disabledEntities.push(entry);
                    return "";
                  }
                  return this.hass.states[entry.entity_id]
@@ -130,28 +115,6 @@ export class HaDeviceEntitiesCard extends LitElement {

  private _toggleShowDisabled() {
    this.showDisabled = !this.showDisabled;
-    if (!this.showDisabled || this._extDisabledEntityEntries !== undefined) {
-      return;
-    }
-    this._extDisabledEntityEntries = {};
-    const toFetch = this.entities.filter((entry) => entry.disabled_by);
-
-    const worker = async () => {
-      if (toFetch.length === 0) {
-        return;
-      }
-
-      const entityId = toFetch.pop()!.entity_id;
-      const entry = await getExtendedEntityRegistryEntry(this.hass, entityId);
-      this._extDisabledEntityEntries![entityId] = entry;
-      this.requestUpdate("_extDisabledEntityEntries");
-      worker();
-    };
-
-    // Fetch 3 in parallel
-    worker();
-    worker();
-    worker();
  }

  private _renderEntity(entry: EntityRegistryStateEntry): TemplateResult {
@@ -162,9 +125,9 @@ export class HaDeviceEntitiesCard extends LitElement {
    const element = createRowElement(config);
    if (this.hass) {
      element.hass = this.hass;
-      const stateObj = this.hass.states[entry.entity_id];
+      const state = this.hass.states[entry.entity_id];
      const name = stripPrefixFromEntityName(
-        computeStateName(stateObj),
+        computeStateName(state),
        `${this.deviceName} `.toLowerCase()
      );
      if (name) {
@@ -178,11 +141,6 @@ export class HaDeviceEntitiesCard extends LitElement {
  }

  private _renderEntry(entry: EntityRegistryStateEntry): TemplateResult {
-    const name =
-      entry.stateName ||
-      entry.name ||
-      (entry as ExtEntityRegistryEntry).original_name;
-
    return html`
      <paper-icon-item
        class="disabled-entry"
@@ -195,9 +153,9 @@ export class HaDeviceEntitiesCard extends LitElement {
        ></ha-svg-icon>
        <paper-item-body>
          <div class="name">
-            ${name
+            ${entry.stateName
              ? stripPrefixFromEntityName(
-                  name,
+                  entry.stateName,
                  `${this.deviceName} `.toLowerCase()
                )
              : entry.entity_id}
--- a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-actions-zwave_js.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-actions-zwave_js.ts
@@ -10,7 +10,7 @@ import {
 import { customElement, property, state } from "lit/decorators";
 import { DeviceRegistryEntry } from "../../../../../../data/device_registry";
 import {
-  getZwaveJsIdentifiersFromDevice,
+  getIdentifiersFromDevice,
  ZWaveJSNodeIdentifiers,
 } from "../../../../../../data/zwave_js";
 import { haStyle } from "../../../../../../resources/styles";
@@ -34,7 +34,7 @@ export class HaDeviceActionsZWaveJS extends LitElement {
      this._entryId = this.device.config_entries[0];

      const identifiers: ZWaveJSNodeIdentifiers | undefined =
-        getZwaveJsIdentifiersFromDevice(this.device);
+        getIdentifiersFromDevice(this.device);
      if (!identifiers) {
        return;
      }
--- a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
@@ -13,8 +13,8 @@ import {
  getConfigEntries,
 } from "../../../../../../data/config_entries";
 import {
-  fetchZwaveNodeStatus,
-  getZwaveJsIdentifiersFromDevice,
+  fetchNodeStatus,
+  getIdentifiersFromDevice,
  nodeStatus,
  ZWaveJSNodeStatus,
  ZWaveJSNodeIdentifiers,
@@ -42,7 +42,7 @@ export class HaDeviceInfoZWaveJS extends LitElement {
  protected updated(changedProperties: PropertyValues) {
    if (changedProperties.has("device")) {
      const identifiers: ZWaveJSNodeIdentifiers | undefined =
-        getZwaveJsIdentifiersFromDevice(this.device);
+        getIdentifiersFromDevice(this.device);
      if (!identifiers) {
        return;
      }
@@ -76,11 +76,7 @@ export class HaDeviceInfoZWaveJS extends LitElement {
      zwaveJsConfEntries++;
    }

-    this._node = await fetchZwaveNodeStatus(
-      this.hass,
-      this._entryId,
-      this._nodeId
-    );
+    this._node = await fetchNodeStatus(this.hass, this._entryId, this._nodeId);
  }

  protected render(): TemplateResult {
--- a/src/panels/config/devices/ha-config-devices-dashboard.ts
+++ b/src/panels/config/devices/ha-config-devices-dashboard.ts
@@ -17,7 +17,6 @@ import {
 } from "../../../components/data-table/ha-data-table";
 import "../../../components/entity/ha-battery-icon";
 import "../../../components/ha-button-menu";
-import "../../../components/ha-fab";
 import "../../../components/ha-icon-button";
 import { AreaRegistryEntry } from "../../../data/area_registry";
 import { ConfigEntry } from "../../../data/config_entries";
@@ -36,7 +35,6 @@ import "../../../layouts/hass-tabs-subpage-data-table";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant, Route } from "../../../types";
 import { configSections } from "../ha-panel-config";
-import { showZWaveJSAddNodeDialog } from "../integrations/integration-panels/zwave_js/show-dialog-zwave_js-add-node";

 interface DeviceRowData extends DeviceRegistryEntry {
  device?: DeviceRowData;
@@ -172,7 +170,7 @@ export class HaConfigDeviceDashboard extends LitElement {
        areaLookup[area.area_id] = area;
      }

-      let filterConfigEntry: ConfigEntry | undefined;
+      const filterDomains: string[] = [];

      filters.forEach((value, key) => {
        if (key === "config_entry") {
@@ -180,7 +178,10 @@ export class HaConfigDeviceDashboard extends LitElement {
            device.config_entries.includes(value)
          );
          startLength = outputDevices.length;
-          filterConfigEntry = entries.find((entry) => entry.entry_id === value);
+          const configEntry = entries.find((entry) => entry.entry_id === value);
+          if (configEntry) {
+            filterDomains.push(configEntry.domain);
+          }
        }
      });

@@ -219,10 +220,7 @@ export class HaConfigDeviceDashboard extends LitElement {
      }));

      this._numHiddenDevices = startLength - outputDevices.length;
-      return {
-        devicesOutput: outputDevices,
-        filteredConfigEntry: filterConfigEntry,
-      };
+      return { devicesOutput: outputDevices, filteredDomains: filterDomains };
    }
  );

@@ -354,16 +352,16 @@ export class HaConfigDeviceDashboard extends LitElement {
  }

  protected render(): TemplateResult {
-    const { devicesOutput, filteredConfigEntry } =
-      this._devicesAndFilterDomains(
-        this.devices,
-        this.entries,
-        this.entities,
-        this.areas,
-        this._searchParms,
-        this._showDisabled,
-        this.hass.localize
-      );
+    const { devicesOutput, filteredDomains } = this._devicesAndFilterDomains(
+      this.devices,
+      this.entries,
+      this.entities,
+      this.areas,
+      this._searchParms,
+      this._showDisabled,
+      this.hass.localize
+    );
+    const includeZHAFab = filteredDomains.includes("zha");
    const activeFilters = this._activeFilters(
      this.entries,
      this._searchParms,
@@ -396,25 +394,9 @@ export class HaConfigDeviceDashboard extends LitElement {
        @search-changed=${this._handleSearchChange}
        @row-click=${this._handleRowClicked}
        clickable
-        .hasFab=${filteredConfigEntry &&
-        (filteredConfigEntry.domain === "zha" ||
-          filteredConfigEntry.domain === "zwave_js")}
+        .hasFab=${includeZHAFab}
      >
-        ${!filteredConfigEntry
-          ? ""
-          : filteredConfigEntry.domain === "zwave_js"
-          ? html`
-              <ha-fab
-                slot="fab"
-                .label=${this.hass.localize("ui.panel.config.zha.add_device")}
-                extended
-                ?rtl=${computeRTL(this.hass)}
-                @click=${this._showZJSAddDeviceDialog}
-              >
-                <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
-              </ha-fab>
-            `
-          : filteredConfigEntry.domain === "zha"
+        ${includeZHAFab
          ? html`<a href="/config/zha/add" slot="fab">
              <ha-fab
                .label=${this.hass.localize("ui.panel.config.zha.add_device")}
@@ -499,22 +481,6 @@ export class HaConfigDeviceDashboard extends LitElement {
    this._showDisabled = true;
  }

-  private _showZJSAddDeviceDialog() {
-    const { filteredConfigEntry } = this._devicesAndFilterDomains(
-      this.devices,
-      this.entries,
-      this.entities,
-      this.areas,
-      this._searchParms,
-      this._showDisabled,
-      this.hass.localize
-    );
-
-    showZWaveJSAddNodeDialog(this, {
-      entry_id: filteredConfigEntry!.entry_id,
-    });
-  }
-
  static get styles(): CSSResultGroup {
    return [
      css`
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -1,6 +1,5 @@
 import "@material/mwc-button/mwc-button";
 import "@polymer/paper-input/paper-input";
-import type { PaperItemElement } from "@polymer/paper-item/paper-item";
 import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
  css,
@@ -17,7 +16,6 @@ import { domainIcon } from "../../../common/entity/domain_icon";
 import "../../../components/ha-area-picker";
 import "../../../components/ha-expansion-panel";
 import "../../../components/ha-icon-picker";
-import "../../../components/ha-paper-dropdown-menu";
 import "../../../components/ha-switch";
 import type { HaSwitch } from "../../../components/ha-switch";
 import {
@@ -41,11 +39,6 @@ import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
 import { showDeviceRegistryDetailDialog } from "../devices/device-registry-detail/show-dialog-device-registry-detail";

-const OVERRIDE_DEVICE_CLASSES = {
-  cover: ["window", "door", "garage"],
-  binary_sensor: ["window", "door", "garage_door", "opening"],
-};
-
@customElement("entity-registry-settings")
 export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
  @property({ attribute: false }) public hass!: HomeAssistant;
@@ -58,8 +51,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {

  @state() private _entityId!: string;

-  @state() private _deviceClass?: string;
-
  @state() private _areaId?: string | null;

  @state() private _disabledBy!: string | null;
@@ -94,8 +85,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
      this._error = undefined;
      this._name = this.entry.name || "";
      this._icon = this.entry.icon || "";
-      this._deviceClass =
-        this.entry.device_class || this.entry.original_device_class;
      this._origEntityId = this.entry.entity_id;
      this._areaId = this.entry.area_id;
      this._entityId = this.entry.entity_id;
@@ -113,11 +102,9 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
    }
    const stateObj: HassEntity | undefined =
      this.hass.states[this.entry.entity_id];
-
-    const domain = computeDomain(this.entry.entity_id);
-
-    const invalidDomainUpdate = computeDomain(this._entityId.trim()) !== domain;
-
+    const invalidDomainUpdate =
+      computeDomain(this._entityId.trim()) !==
+      computeDomain(this.entry.entity_id);
    return html`
      ${!stateObj
        ? html`
@@ -156,31 +143,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
            : undefined}
          .disabled=${this._submitting}
        ></ha-icon-picker>
-        ${OVERRIDE_DEVICE_CLASSES[domain]?.includes(this._deviceClass) ||
-        (domain === "cover" && this.entry.original_device_class === null)
-          ? html`<ha-paper-dropdown-menu
-              .label=${this.hass.localize(
-                "ui.dialogs.entity_registry.editor.device_class"
-              )}
-            >
-              <paper-listbox
-                slot="dropdown-content"
-                attr-for-selected="item-value"
-                .selected=${this._deviceClass}
-                @selected-item-changed=${this._deviceClassChanged}
-              >
-                ${OVERRIDE_DEVICE_CLASSES[domain].map(
-                  (deviceClass: string) => html`
-                    <paper-item .itemValue=${deviceClass}>
-                      ${this.hass.localize(
-                        `ui.dialogs.entity_registry.editor.device_classes.${domain}.${deviceClass}`
-                      )}
-                    </paper-item>
-                  `
-                )}
-              </paper-listbox>
-            </ha-paper-dropdown-menu>`
-          : ""}
        <paper-input
          .value=${this._entityId}
          @value-changed=${this._entityIdChanged}
@@ -302,14 +264,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
    this._entityId = ev.detail.value;
  }

-  private _deviceClassChanged(ev: PolymerChangedEvent<PaperItemElement>): void {
-    this._error = undefined;
-    if (ev.detail.value === null) {
-      return;
-    }
-    this._deviceClass = (ev.detail.value as any).itemValue;
-  }
-
  private _areaPicked(ev: CustomEvent) {
    this._error = undefined;
    this._areaId = ev.detail.value;
@@ -335,7 +289,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
      name: this._name.trim() || null,
      icon: this._icon.trim() || null,
      area_id: this._areaId || null,
-      device_class: this._deviceClass || null,
      new_entity_id: this._entityId.trim(),
    };
    if (
@@ -425,9 +378,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
          padding-bottom: max(env(safe-area-inset-bottom), 8px);
          background-color: var(--mdc-theme-surface, #fff);
        }
-        ha-paper-dropdown-menu {
-          width: 100%;
-        }
        ha-switch {
          margin-right: 16px;
        }
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -320,6 +320,8 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
        }
      }

+      entities.forEach((entity) => entity);
+
      let filteredEntities = showReadOnly
        ? entities.concat(stateEntities)
        : entities;
--- a/src/panels/config/ha-panel-config.ts
+++ b/src/panels/config/ha-panel-config.ts
@@ -56,7 +56,7 @@ export const configSections: { [name: string]: PageNavigation[] } = {
    },
    {
      path: "/config/automation",
-      name: "Automations & Scenes",
+      name: "Automations",
      description: "Automations, blueprints, scenes and scripts",
      iconPath: mdiRobot,
      iconColor: "#518C43",
@@ -64,7 +64,7 @@ export const configSections: { [name: string]: PageNavigation[] } = {
    },
    {
      path: "/config/helpers",
-      name: "Automation Helpers",
+      name: "Helpers",
      description: "Elements that help build automations",
      iconPath: mdiTools,
      iconColor: "#4D2EA4",
@@ -72,7 +72,7 @@ export const configSections: { [name: string]: PageNavigation[] } = {
    },
    {
      path: "/hassio",
-      name: "Add-ons & Backups (Supervisor)",
+      name: "Add-ons & Backups",
      description: "Create backups, check logs or reboot your system",
      iconPath: mdiHomeAssistant,
      iconColor: "#4084CD",
--- a/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts
+++ b/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts
@@ -21,10 +21,10 @@ import {
 import {
  migrateZwave,
  ZWaveJsMigrationData,
-  fetchZwaveNetworkStatus as fetchZwaveJsNetworkStatus,
-  fetchZwaveNodeStatus,
-  getZwaveJsIdentifiersFromDevice,
-  subscribeZwaveNodeReady,
+  fetchNetworkStatus as fetchZwaveJsNetworkStatus,
+  fetchNodeStatus,
+  getIdentifiersFromDevice,
+  subscribeNodeReady,
 } from "../../../../../data/zwave_js";
 import {
  fetchMigrationConfig,
@@ -425,7 +425,7 @@ export class ZwaveMigration extends LitElement {
      this._zwaveJsEntryId!
    );
    const nodeStatePromisses = networkStatus.controller.nodes.map((nodeId) =>
-      fetchZwaveNodeStatus(this.hass, this._zwaveJsEntryId!, nodeId)
+      fetchNodeStatus(this.hass, this._zwaveJsEntryId!, nodeId)
    );
    const nodesNotReady = (await Promise.all(nodeStatePromisses)).filter(
      (node) => !node.ready
@@ -436,18 +436,13 @@ export class ZwaveMigration extends LitElement {
      return;
    }
    this._nodeReadySubscriptions = nodesNotReady.map((node) =>
-      subscribeZwaveNodeReady(
-        this.hass,
-        this._zwaveJsEntryId!,
-        node.node_id,
-        () => {
-          this._getZwaveJSNodesStatus();
-        }
-      )
+      subscribeNodeReady(this.hass, this._zwaveJsEntryId!, node.node_id, () => {
+        this._getZwaveJSNodesStatus();
+      })
    );
    const deviceReg = await fetchDeviceRegistry(this.hass);
    this._waitingOnDevices = deviceReg
-      .map((device) => getZwaveJsIdentifiersFromDevice(device))
+      .map((device) => getIdentifiersFromDevice(device))
      .filter(Boolean);
  }

--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
@@ -1,40 +1,30 @@
 import "@material/mwc-button/mwc-button";
-import type { TextField } from "@material/mwc-textfield/mwc-textfield";
-import "@material/mwc-textfield/mwc-textfield";
-import { mdiAlertCircle, mdiCheckCircle, mdiQrcodeScan } from "@mdi/js";
+import { mdiAlertCircle, mdiCheckCircle, mdiCloseCircle } from "@mdi/js";
 import "@polymer/paper-input/paper-input";
 import type { PaperInputElement } from "@polymer/paper-input/paper-input";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
-import "../../../../../components/ha-alert";
-import { HaCheckbox } from "../../../../../components/ha-checkbox";
 import "../../../../../components/ha-circular-progress";
 import { createCloseHeading } from "../../../../../components/ha-dialog";
 import "../../../../../components/ha-formfield";
-import "../../../../../components/ha-radio";
 import "../../../../../components/ha-switch";
 import {
-  zwaveGrantSecurityClasses,
+  grantSecurityClasses,
  InclusionStrategy,
-  MINIMUM_QR_STRING_LENGTH,
-  zwaveParseQrCode,
-  provisionZwaveSmartStartNode,
-  QRProvisioningInformation,
  RequestedGrant,
  SecurityClass,
-  stopZwaveInclusion,
-  subscribeAddZwaveNode,
-  zwaveSupportsFeature,
-  zwaveValidateDskAndEnterPin,
-  ZWaveFeature,
-  PlannedProvisioningEntry,
+  stopInclusion,
+  subscribeAddNode,
+  validateDskAndEnterPin,
 } from "../../../../../data/zwave_js";
 import { haStyle, haStyleDialog } from "../../../../../resources/styles";
 import { HomeAssistant } from "../../../../../types";
 import { ZWaveJSAddNodeDialogParams } from "./show-dialog-zwave_js-add-node";
-import "../../../../../components/ha-qr-scanner";
+import "../../../../../components/ha-radio";
+import { HaCheckbox } from "../../../../../components/ha-checkbox";
+import "../../../../../components/ha-alert";

 export interface ZWaveJSAddNodeDevice {
  id: string;
@@ -50,14 +40,11 @@ class DialogZWaveJSAddNode extends LitElement {
  @state() private _status?:
    | "loading"
    | "started"
-    | "started_specific"
    | "choose_strategy"
-    | "qr_scan"
    | "interviewing"
    | "failed"
    | "timed_out"
    | "finished"
-    | "provisioned"
    | "validate_dsk_enter_pin"
    | "grant_security_classes";

@@ -77,14 +64,10 @@ class DialogZWaveJSAddNode extends LitElement {

  @state() private _lowSecurity = false;

-  @state() private _supportsSmartStart?: boolean;
-
  private _addNodeTimeoutHandle?: number;

  private _subscribed?: Promise<UnsubscribeFunc>;

-  private _qrProcessing = false;
-
  public disconnectedCallback(): void {
    super.disconnectedCallback();
    this._unsubscribe();
@@ -93,7 +76,6 @@ class DialogZWaveJSAddNode extends LitElement {
  public async showDialog(params: ZWaveJSAddNodeDialogParams): Promise<void> {
    this._entryId = params.entry_id;
    this._status = "loading";
-    this._checkSmartStartSupport();
    this._startInclusion();
  }

@@ -175,22 +157,6 @@ class DialogZWaveJSAddNode extends LitElement {
              >
                Search device
              </mwc-button>`
-          : this._status === "qr_scan"
-          ? html`<ha-qr-scanner
-                .localize=${this.hass.localize}
-                @qr-code-scanned=${this._qrCodeScanned}
-              ></ha-qr-scanner>
-              <p>
-                If scanning doesn't work, you can enter the QR code value
-                manually:
-              </p>
-              <mwc-textfield
-                .label=${this.hass.localize(
-                  "ui.panel.config.zwave_js.add_node.enter_qr_code"
-                )}
-                .disabled=${this._qrProcessing}
-                @keydown=${this._qrKeyDown}
-              ></mwc-textfield>`
          : this._status === "validate_dsk_enter_pin"
          ? html`
                <p>
@@ -275,28 +241,18 @@ class DialogZWaveJSAddNode extends LitElement {
                Retry
              </mwc-button>
            `
-          : this._status === "started_specific"
-          ? html`<h3>
-                ${this.hass.localize(
-                  "ui.panel.config.zwave_js.add_node.searching_device"
-                )}
-              </h3>
-              <ha-circular-progress active></ha-circular-progress>
-              <p>
-                ${this.hass.localize(
-                  "ui.panel.config.zwave_js.add_node.follow_device_instructions"
-                )}
-              </p>`
          : this._status === "started"
          ? html`
-              <div class="select-inclusion">
-                <div class="outline">
-                  <h2>
-                    ${this.hass.localize(
-                      "ui.panel.config.zwave_js.add_node.searching_device"
-                    )}
-                  </h2>
-                  <ha-circular-progress active></ha-circular-progress>
+              <div class="flex-container">
+                <ha-circular-progress active></ha-circular-progress>
+                <div class="status">
+                  <p>
+                    <b
+                      >${this.hass.localize(
+                        "ui.panel.config.zwave_js.add_node.controller_in_inclusion_mode"
+                      )}</b
+                    >
+                  </p>
                  <p>
                    ${this.hass.localize(
                      "ui.panel.config.zwave_js.add_node.follow_device_instructions"
@@ -307,37 +263,15 @@ class DialogZWaveJSAddNode extends LitElement {
                      class="link"
                      @click=${this._chooseInclusionStrategy}
                    >
-                      ${this.hass.localize(
-                        "ui.panel.config.zwave_js.add_node.choose_inclusion_strategy"
-                      )}
+                      Advanced inclusion
                    </button>
                  </p>
                </div>
-                ${this._supportsSmartStart
-                  ? html` <div class="outline">
-                      <h2>
-                        ${this.hass.localize(
-                          "ui.panel.config.zwave_js.add_node.qr_code"
-                        )}
-                      </h2>
-                      <ha-svg-icon .path=${mdiQrcodeScan}></ha-svg-icon>
-                      <p>
-                        ${this.hass.localize(
-                          "ui.panel.config.zwave_js.add_node.qr_code_paragraph"
-                        )}
-                      </p>
-                      <p>
-                        <mwc-button @click=${this._scanQRCode}>
-                          ${this.hass.localize(
-                            "ui.panel.config.zwave_js.add_node.scan_qr_code"
-                          )}
-                        </mwc-button>
-                      </p>
-                    </div>`
-                  : ""}
              </div>
              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
-                ${this.hass.localize("ui.common.cancel")}
+                ${this.hass.localize(
+                  "ui.panel.config.zwave_js.add_node.cancel_inclusion"
+                )}
              </mwc-button>
            `
          : this._status === "interviewing"
@@ -376,18 +310,16 @@ class DialogZWaveJSAddNode extends LitElement {
          : this._status === "failed"
          ? html`
              <div class="flex-container">
+                <ha-svg-icon
+                  .path=${mdiCloseCircle}
+                  class="failed"
+                ></ha-svg-icon>
                <div class="status">
-                  <ha-alert
-                    alert-type="error"
-                    .title=${this.hass.localize(
+                  <p>
+                    ${this.hass.localize(
                      "ui.panel.config.zwave_js.add_node.inclusion_failed"
                    )}
-                  >
-                    ${this._error ||
-                    this.hass.localize(
-                      "ui.panel.config.zwave_js.add_node.check_logs"
-                    )}
-                  </ha-alert>
+                  </p>
                  ${this._stages
                    ? html` <div class="stages">
                        ${this._stages.map(
@@ -459,23 +391,6 @@ class DialogZWaveJSAddNode extends LitElement {
                ${this.hass.localize("ui.panel.config.zwave_js.common.close")}
              </mwc-button>
            `
-          : this._status === "provisioned"
-          ? html` <div class="flex-container">
-                <ha-svg-icon
-                  .path=${mdiCheckCircle}
-                  class="success"
-                ></ha-svg-icon>
-                <div class="status">
-                  <p>
-                    ${this.hass.localize(
-                      "ui.panel.config.zwave_js.add_node.provisioning_finished"
-                    )}
-                  </p>
-                </div>
-              </div>
-              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
-                ${this.hass.localize("ui.panel.config.zwave_js.common.close")}
-              </mwc-button>`
          : ""}
      </ha-dialog>
    `;
@@ -502,83 +417,6 @@ class DialogZWaveJSAddNode extends LitElement {
    }
  }

-  private async _scanQRCode(): Promise<void> {
-    this._unsubscribe();
-    this._status = "qr_scan";
-  }
-
-  private _qrKeyDown(ev: KeyboardEvent) {
-    if (this._qrProcessing) {
-      return;
-    }
-    if (ev.key === "Enter") {
-      this._handleQrCodeScanned((ev.target as TextField).value);
-    }
-  }
-
-  private _qrCodeScanned(ev: CustomEvent): void {
-    if (this._qrProcessing) {
-      return;
-    }
-    this._handleQrCodeScanned(ev.detail.value);
-  }
-
-  private async _handleQrCodeScanned(qrCodeString: string): Promise<void> {
-    this._error = undefined;
-    if (this._status !== "qr_scan" || this._qrProcessing) {
-      return;
-    }
-    this._qrProcessing = true;
-    if (
-      qrCodeString.length < MINIMUM_QR_STRING_LENGTH ||
-      !qrCodeString.startsWith("90")
-    ) {
-      this._qrProcessing = false;
-      this._error = `Invalid QR code (${qrCodeString})`;
-      return;
-    }
-    let provisioningInfo: QRProvisioningInformation;
-    try {
-      provisioningInfo = await zwaveParseQrCode(
-        this.hass,
-        this._entryId!,
-        qrCodeString
-      );
-    } catch (err: any) {
-      this._qrProcessing = false;
-      this._error = err.message;
-      return;
-    }
-    this._status = "loading";
-    // wait for QR scanner to be removed before resetting qr processing
-    this.updateComplete.then(() => {
-      this._qrProcessing = false;
-    });
-    if (provisioningInfo.version === 1) {
-      try {
-        await provisionZwaveSmartStartNode(
-          this.hass,
-          this._entryId!,
-          provisioningInfo
-        );
-        this._status = "provisioned";
-      } catch (err: any) {
-        this._error = err.message;
-        this._status = "failed";
-      }
-    } else if (provisioningInfo.version === 0) {
-      this._inclusionStrategy = InclusionStrategy.Security_S2;
-      // this._startInclusion(provisioningInfo);
-      this._startInclusion(undefined, undefined, {
-        dsk: "34673-15546-46480-39591-32400-22155-07715-45994",
-        security_classes: [0, 1, 7],
-      });
-    } else {
-      this._error = "This QR code is not supported";
-      this._status = "failed";
-    }
-  }
-
  private _handlePinKeyUp(ev: KeyboardEvent) {
    if (ev.key === "Enter") {
      this._validateDskAndEnterPin();
@@ -589,7 +427,7 @@ class DialogZWaveJSAddNode extends LitElement {
    this._status = "loading";
    this._error = undefined;
    try {
-      await zwaveValidateDskAndEnterPin(
+      await validateDskAndEnterPin(
        this.hass,
        this._entryId!,
        this._pinInput!.value as string
@@ -604,7 +442,7 @@ class DialogZWaveJSAddNode extends LitElement {
    this._status = "loading";
    this._error = undefined;
    try {
-      await zwaveGrantSecurityClasses(
+      await grantSecurityClasses(
        this.hass,
        this._entryId!,
        this._securityClasses
@@ -622,33 +460,17 @@ class DialogZWaveJSAddNode extends LitElement {
    this._startInclusion();
  }

-  private async _checkSmartStartSupport() {
-    this._supportsSmartStart = (
-      await zwaveSupportsFeature(
-        this.hass,
-        this._entryId!,
-        ZWaveFeature.SmartStart
-      )
-    ).supported;
-  }
-
-  private _startInclusion(
-    qrProvisioningInformation?: QRProvisioningInformation,
-    qrCodeString?: string,
-    plannedProvisioningEntry?: PlannedProvisioningEntry
-  ): void {
+  private _startInclusion(): void {
    if (!this.hass) {
      return;
    }
    this._lowSecurity = false;
-    const specificDevice =
-      qrProvisioningInformation || qrCodeString || plannedProvisioningEntry;
-    this._subscribed = subscribeAddZwaveNode(
+    this._subscribed = subscribeAddNode(
      this.hass,
      this._entryId!,
      (message) => {
        if (message.event === "inclusion started") {
-          this._status = specificDevice ? "started_specific" : "started";
+          this._status = "started";
        }
        if (message.event === "inclusion failed") {
          this._unsubscribe();
@@ -669,7 +491,7 @@ class DialogZWaveJSAddNode extends LitElement {

        if (message.event === "grant security classes") {
          if (this._inclusionStrategy === undefined) {
-            zwaveGrantSecurityClasses(
+            grantSecurityClasses(
              this.hass,
              this._entryId!,
              message.requested_grant.securityClasses,
@@ -703,10 +525,7 @@ class DialogZWaveJSAddNode extends LitElement {
          }
        }
      },
-      this._inclusionStrategy,
-      qrProvisioningInformation,
-      qrCodeString,
-      plannedProvisioningEntry
+      this._inclusionStrategy
    );
    this._addNodeTimeoutHandle = window.setTimeout(() => {
      this._unsubscribe();
@@ -720,7 +539,7 @@ class DialogZWaveJSAddNode extends LitElement {
      this._subscribed = undefined;
    }
    if (this._entryId) {
-      stopZwaveInclusion(this.hass, this._entryId);
+      stopInclusion(this.hass, this._entryId);
    }
    this._requestedGrant = undefined;
    this._dsk = undefined;
@@ -739,7 +558,6 @@ class DialogZWaveJSAddNode extends LitElement {
    this._status = undefined;
    this._device = undefined;
    this._stages = undefined;
-    this._error = undefined;
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

@@ -760,6 +578,10 @@ class DialogZWaveJSAddNode extends LitElement {
          color: var(--warning-color);
        }

+        .failed {
+          color: var(--error-color);
+        }
+
        .stages {
          margin-top: 16px;
          display: grid;
@@ -788,39 +610,6 @@ class DialogZWaveJSAddNode extends LitElement {
          padding: 8px 0;
        }

-        .select-inclusion {
-          display: flex;
-          align-items: center;
-        }
-
-        .select-inclusion .outline:nth-child(2) {
-          margin-left: 16px;
-        }
-
-        .select-inclusion .outline {
-          border: 1px solid var(--divider-color);
-          border-radius: 4px;
-          padding: 16px;
-          min-height: 250px;
-          text-align: center;
-          flex: 1;
-        }
-
-        @media all and (max-width: 500px) {
-          .select-inclusion {
-            flex-direction: column;
-          }
-
-          .select-inclusion .outline:nth-child(2) {
-            margin-left: 0;
-            margin-top: 16px;
-          }
-        }
-
-        mwc-textfield {
-          width: 100%;
-        }
-
        ha-svg-icon {
          width: 68px;
          height: 48px;
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-heal-network.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-heal-network.ts
@@ -7,10 +7,10 @@ import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { createCloseHeading } from "../../../../../components/ha-dialog";
 import {
-  fetchZwaveNetworkStatus,
-  healZwaveNetwork,
-  stopHealZwaveNetwork,
-  subscribeHealZwaveNetworkProgress,
+  fetchNetworkStatus,
+  healNetwork,
+  stopHealNetwork,
+  subscribeHealNetworkProgress,
  ZWaveJSHealNetworkStatusMessage,
  ZWaveJSNetwork,
 } from "../../../../../data/zwave_js";
@@ -202,13 +202,13 @@ class DialogZWaveJSHealNetwork extends LitElement {
    if (!this.hass) {
      return;
    }
-    const network: ZWaveJSNetwork = await fetchZwaveNetworkStatus(
+    const network: ZWaveJSNetwork = await fetchNetworkStatus(
      this.hass!,
      this.entry_id!
    );
    if (network.controller.is_heal_network_active) {
      this._status = "started";
-      this._subscribed = subscribeHealZwaveNetworkProgress(
+      this._subscribed = subscribeHealNetworkProgress(
        this.hass,
        this.entry_id!,
        this._handleMessage.bind(this)
@@ -220,9 +220,9 @@ class DialogZWaveJSHealNetwork extends LitElement {
    if (!this.hass) {
      return;
    }
-    healZwaveNetwork(this.hass, this.entry_id!);
+    healNetwork(this.hass, this.entry_id!);
    this._status = "started";
-    this._subscribed = subscribeHealZwaveNetworkProgress(
+    this._subscribed = subscribeHealNetworkProgress(
      this.hass,
      this.entry_id!,
      this._handleMessage.bind(this)
@@ -233,7 +233,7 @@ class DialogZWaveJSHealNetwork extends LitElement {
    if (!this.hass) {
      return;
    }
-    stopHealZwaveNetwork(this.hass, this.entry_id!);
+    stopHealNetwork(this.hass, this.entry_id!);
    this._unsubscribe();
    this._status = "cancelled";
  }
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-heal-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-heal-node.ts
@@ -10,8 +10,8 @@ import {
  computeDeviceName,
 } from "../../../../../data/device_registry";
 import {
-  fetchZwaveNetworkStatus,
-  healZwaveNode,
+  fetchNetworkStatus,
+  healNode,
  ZWaveJSNetwork,
 } from "../../../../../data/zwave_js";
 import { haStyleDialog } from "../../../../../resources/styles";
@@ -206,7 +206,7 @@ class DialogZWaveJSHealNode extends LitElement {
    if (!this.hass) {
      return;
    }
-    const network: ZWaveJSNetwork = await fetchZwaveNetworkStatus(
+    const network: ZWaveJSNetwork = await fetchNetworkStatus(
      this.hass!,
      this.entry_id!
    );
@@ -221,11 +221,7 @@ class DialogZWaveJSHealNode extends LitElement {
    }
    this._status = "started";
    try {
-      this._status = (await healZwaveNode(
-        this.hass,
-        this.entry_id!,
-        this.node_id!
-      ))
+      this._status = (await healNode(this.hass, this.entry_id!, this.node_id!))
        ? "finished"
        : "failed";
    } catch (err: any) {
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts
@@ -6,7 +6,7 @@ import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-circular-progress";
 import { createCloseHeading } from "../../../../../components/ha-dialog";
-import { reinterviewZwaveNode } from "../../../../../data/zwave_js";
+import { reinterviewNode } from "../../../../../data/zwave_js";
 import { haStyleDialog } from "../../../../../resources/styles";
 import { HomeAssistant } from "../../../../../types";
 import { ZWaveJSReinterviewNodeDialogParams } from "./show-dialog-zwave_js-reinterview-node";
@@ -157,7 +157,7 @@ class DialogZWaveJSReinterviewNode extends LitElement {
    if (!this.hass) {
      return;
    }
-    this._subscribed = reinterviewZwaveNode(
+    this._subscribed = reinterviewNode(
      this.hass,
      this.entry_id!,
      this.node_id!,
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-failed-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-remove-failed-node.ts
@@ -7,7 +7,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-circular-progress";
 import { createCloseHeading } from "../../../../../components/ha-dialog";
 import {
-  removeFailedZwaveNode,
+  removeFailedNode,
  ZWaveJSRemovedNode,
 } from "../../../../../data/zwave_js";
 import { haStyleDialog } from "../../../../../resources/styles";
@@ -164,7 +164,7 @@ class DialogZWaveJSRemoveFailedNode extends LitElement {
      return;
    }
    this._status = "started";
-    this._subscribed = removeFailedZwaveNode(
+    this._subscribed = removeFailedNode(
      this.hass,
      this.entry_id!,
      this.node_id!,
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
@@ -1,30 +1,21 @@
 import "@material/mwc-button/mwc-button";
-import {
-  mdiAlertCircle,
-  mdiCheckCircle,
-  mdiCircle,
-  mdiPlus,
-  mdiRefresh,
-} from "@mdi/js";
+import { mdiAlertCircle, mdiCheckCircle, mdiCircle, mdiRefresh } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import "../../../../../components/ha-card";
 import "../../../../../components/ha-icon-button";
-import "../../../../../components/ha-fab";
 import "../../../../../components/ha-icon-next";
 import "../../../../../components/ha-svg-icon";
 import { getSignedPath } from "../../../../../data/auth";
 import {
-  fetchZwaveDataCollectionStatus,
-  fetchZwaveNetworkStatus,
-  fetchZwaveNodeStatus,
-  fetchZwaveProvisioningEntries,
+  fetchDataCollectionStatus,
+  fetchNetworkStatus,
+  fetchNodeStatus,
  NodeStatus,
-  setZwaveDataCollectionPreference,
+  setDataCollectionPreference,
  ZWaveJSNetwork,
  ZWaveJSNodeStatus,
-  ZwaveJSProvisioningEntry,
 } from "../../../../../data/zwave_js";
 import {
  ConfigEntry,
@@ -45,7 +36,6 @@ import { showZWaveJSHealNetworkDialog } from "./show-dialog-zwave_js-heal-networ
 import { showZWaveJSRemoveNodeDialog } from "./show-dialog-zwave_js-remove-node";
 import { configTabs } from "./zwave_js-config-router";
 import { showOptionsFlowDialog } from "../../../../../dialogs/config-flow/show-dialog-options-flow";
-import { computeRTL } from "../../../../../common/util/compute_rtl";

@customElement("zwave_js-config-dashboard")
 class ZWaveJSConfigDashboard extends LitElement {
@@ -65,8 +55,6 @@ class ZWaveJSConfigDashboard extends LitElement {

  @state() private _nodes?: ZWaveJSNodeStatus[];

-  @state() private _provisioningEntries?: ZwaveJSProvisioningEntry[];
-
  @state() private _status = "unknown";

  @state() private _icon = mdiCircle;
@@ -88,9 +76,6 @@ class ZWaveJSConfigDashboard extends LitElement {
      return this._renderErrorScreen();
    }

-    const notReadyDevices =
-      this._nodes?.filter((node) => !node.ready).length ?? 0;
-
    return html`
      <hass-tabs-subpage
        .hass=${this.hass}
@@ -143,25 +128,32 @@ class ZWaveJSConfigDashboard extends LitElement {
                              ${this.hass.localize(
                                `ui.panel.config.zwave_js.network_status.${this._status}`
                              )}<br />
-                              <small>
-                                ${this.hass.localize(
-                                  `ui.panel.config.zwave_js.dashboard.devices`,
-                                  {
-                                    count:
-                                      this._network.controller.nodes.length,
-                                  }
-                                )}
-                                ${notReadyDevices > 0
-                                  ? html`(${this.hass.localize(
-                                      `ui.panel.config.zwave_js.dashboard.not_ready`,
-                                      { count: notReadyDevices }
-                                    )})`
-                                  : ""}
-                              </small>
+                              <small
+                                >${this._network.client.ws_server_url}</small
+                              >
                            </div>
                          `
                        : ``}
                    </div>
+                    <div class="secondary">
+                      ${this.hass.localize(
+                        "ui.panel.config.zwave_js.dashboard.driver_version"
+                      )}:
+                      ${this._network.client.driver_version}<br />
+                      ${this.hass.localize(
+                        "ui.panel.config.zwave_js.dashboard.server_version"
+                      )}:
+                      ${this._network.client.server_version}<br />
+                      ${this.hass.localize(
+                        "ui.panel.config.zwave_js.dashboard.home_id"
+                      )}:
+                      ${this._network.controller.home_id}<br />
+                      ${this.hass.localize(
+                        "ui.panel.config.zwave_js.dashboard.nodes_ready"
+                      )}:
+                      ${this._nodes?.filter((node) => node.ready).length ?? 0} /
+                      ${this._network.controller.nodes.length}
+                    </div>
                  </div>
                  <div class="card-actions">
                    <a
@@ -180,66 +172,22 @@ class ZWaveJSConfigDashboard extends LitElement {
                        )}
                      </mwc-button>
                    </a>
-                    ${this._provisioningEntries?.length
-                      ? html`<a
-                          href=${`provisioned?config_entry=${this.configEntryId}`}
-                          ><mwc-button>
-                            ${this.hass.localize(
-                              "ui.panel.config.zwave_js.dashboard.provisioned_devices"
-                            )}
-                          </mwc-button></a
-                        >`
-                      : ""}
-                  </div>
-                </ha-card>
-                <ha-card header="Diagnostics">
-                  <div class="card-content">
-                    ${this.hass.localize(
-                      "ui.panel.config.zwave_js.dashboard.driver_version"
-                    )}:
-                    ${this._network.client.driver_version}<br />
-                    ${this.hass.localize(
-                      "ui.panel.config.zwave_js.dashboard.server_version"
-                    )}:
-                    ${this._network.client.server_version}<br />
-                    ${this.hass.localize(
-                      "ui.panel.config.zwave_js.dashboard.home_id"
-                    )}:
-                    ${this._network.controller.home_id}<br />
-                    ${this.hass.localize(
-                      "ui.panel.config.zwave_js.dashboard.server_url"
-                    )}:
-                    ${this._network.client.ws_server_url}<br />
-                  </div>
-                  <div class="card-actions">
-                    <mwc-button
-                      @click=${this._dumpDebugClicked}
-                      .disabled=${this._status === "connecting"}
-                    >
+                    <mwc-button @click=${this._addNodeClicked}>
                      ${this.hass.localize(
-                        "ui.panel.config.zwave_js.dashboard.dump_debug"
+                        "ui.panel.config.zwave_js.common.add_node"
                      )}
                    </mwc-button>
-                    <mwc-button
-                      @click=${this._removeNodeClicked}
-                      .disabled=${this._status === "connecting"}
-                    >
+                    <mwc-button @click=${this._removeNodeClicked}>
                      ${this.hass.localize(
                        "ui.panel.config.zwave_js.common.remove_node"
                      )}
                    </mwc-button>
-                    <mwc-button
-                      @click=${this._healNetworkClicked}
-                      .disabled=${this._status === "connecting"}
-                    >
+                    <mwc-button @click=${this._healNetworkClicked}>
                      ${this.hass.localize(
                        "ui.panel.config.zwave_js.common.heal_network"
                      )}
                    </mwc-button>
-                    <mwc-button
-                      @click=${this._openOptionFlow}
-                      .disabled=${this._status === "connecting"}
-                    >
+                    <mwc-button @click=${this._openOptionFlow}>
                      ${this.hass.localize(
                        "ui.panel.config.zwave_js.common.reconfigure_server"
                      )}
@@ -281,19 +229,12 @@ class ZWaveJSConfigDashboard extends LitElement {
                </ha-card>
              `
            : ``}
+          <button class="link dump" @click=${this._dumpDebugClicked}>
+            ${this.hass.localize(
+              "ui.panel.config.zwave_js.dashboard.dump_debug"
+            )}
+          </button>
        </ha-config-section>
-        <ha-fab
-          slot="fab"
-          .label=${this.hass.localize(
-            "ui.panel.config.zwave_js.common.add_node"
-          )}
-          .disabled=${this._status === "connecting"}
-          extended
-          ?rtl=${computeRTL(this.hass)}
-          @click=${this._addNodeClicked}
-        >
-          <ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
-        </ha-fab>
      </hass-tabs-subpage>
    `;
  }
@@ -375,14 +316,10 @@ class ZWaveJSConfigDashboard extends LitElement {
      return;
    }

-    const [network, dataCollectionStatus, provisioningEntries] =
-      await Promise.all([
-        fetchZwaveNetworkStatus(this.hass!, this.configEntryId),
-        fetchZwaveDataCollectionStatus(this.hass!, this.configEntryId),
-        fetchZwaveProvisioningEntries(this.hass!, this.configEntryId),
-      ]);
-
-    this._provisioningEntries = provisioningEntries;
+    const [network, dataCollectionStatus] = await Promise.all([
+      fetchNetworkStatus(this.hass!, this.configEntryId),
+      fetchDataCollectionStatus(this.hass!, this.configEntryId),
+    ]);

    this._network = network;

@@ -403,7 +340,7 @@ class ZWaveJSConfigDashboard extends LitElement {
      return;
    }
    const nodeStatePromisses = this._network.controller.nodes.map((nodeId) =>
-      fetchZwaveNodeStatus(this.hass, this.configEntryId!, nodeId)
+      fetchNodeStatus(this.hass, this.configEntryId!, nodeId)
    );
    this._nodes = await Promise.all(nodeStatePromisses);
  }
@@ -427,7 +364,7 @@ class ZWaveJSConfigDashboard extends LitElement {
  }

  private _dataCollectionToggled(ev) {
-    setZwaveDataCollectionPreference(
+    setDataCollectionPreference(
      this.hass!,
      this.configEntryId!,
      ev.target.checked
@@ -549,6 +486,7 @@ class ZWaveJSConfigDashboard extends LitElement {
        .network-status div.heading {
          display: flex;
          align-items: center;
+          margin-bottom: 16px;
        }

        .network-status div.heading .icon {
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts
@@ -49,10 +49,6 @@ class ZWaveJSConfigRouter extends HassRouterPage {
        tag: "zwave_js-logs",
        load: () => import("./zwave_js-logs"),
      },
-      provisioned: {
-        tag: "zwave_js-provisioned",
-        load: () => import("./zwave_js-provisioned"),
-      },
    },
  };

--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
@@ -32,9 +32,9 @@ import {
  subscribeDeviceRegistry,
 } from "../../../../../data/device_registry";
 import {
-  fetchZwaveNodeConfigParameters,
-  fetchZwaveNodeMetadata,
-  setZwaveNodeConfigParameter,
+  fetchNodeConfigParameters,
+  fetchNodeMetadata,
+  setNodeConfigParameter,
  ZWaveJSNodeConfigParams,
  ZwaveJSNodeMetadata,
  ZWaveJSSetConfigParamResult,
@@ -377,7 +377,7 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
  private async _updateConfigParameter(target, value) {
    const nodeId = getNodeId(this._device!);
    try {
-      const result = await setZwaveNodeConfigParameter(
+      const result = await setNodeConfigParameter(
        this.hass,
        this.configEntryId!,
        nodeId!,
@@ -429,8 +429,8 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
    }

    [this._nodeMetadata, this._config] = await Promise.all([
-      fetchZwaveNodeMetadata(this.hass, this.configEntryId, nodeId!),
-      fetchZwaveNodeConfigParameters(this.hass, this.configEntryId, nodeId!),
+      fetchNodeMetadata(this.hass, this.configEntryId, nodeId!),
+      fetchNodeConfigParameters(this.hass, this.configEntryId, nodeId!),
    ]);
  }

--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-provisioned.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-provisioned.ts
@@ -1,128 +0,0 @@
-import { mdiDelete } from "@mdi/js";
-import { html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { DataTableColumnContainer } from "../../../../../components/data-table/ha-data-table";
-import {
-  ZwaveJSProvisioningEntry,
-  fetchZwaveProvisioningEntries,
-  SecurityClass,
-  unprovisionZwaveSmartStartNode,
-} from "../../../../../data/zwave_js";
-import { showConfirmationDialog } from "../../../../../dialogs/generic/show-dialog-box";
-import "../../../../../layouts/hass-tabs-subpage-data-table";
-import { HomeAssistant, Route } from "../../../../../types";
-import { configTabs } from "./zwave_js-config-router";
-
-@customElement("zwave_js-provisioned")
-class ZWaveJSProvisioned extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ type: Object }) public route!: Route;
-
-  @property({ type: Boolean }) public narrow!: boolean;
-
-  @property() public configEntryId!: string;
-
-  @state() private _provisioningEntries: ZwaveJSProvisioningEntry[] = [];
-
-  protected render() {
-    return html`
-      <hass-tabs-subpage-data-table
-        .hass=${this.hass}
-        .narrow=${this.narrow}
-        .route=${this.route}
-        .tabs=${configTabs}
-        .columns=${this._columns(this.narrow)}
-        .data=${this._provisioningEntries}
-      >
-      </hass-tabs-subpage-data-table>
-    `;
-  }
-
-  private _columns = memoizeOne(
-    (narrow: boolean): DataTableColumnContainer => ({
-      dsk: {
-        title: this.hass.localize("ui.panel.config.zwave_js.provisioned.dsk"),
-        sortable: true,
-        filterable: true,
-        grows: true,
-      },
-      securityClasses: {
-        title: this.hass.localize(
-          "ui.panel.config.zwave_js.provisioned.security_classes"
-        ),
-        width: "15%",
-        hidden: narrow,
-        filterable: true,
-        sortable: true,
-        template: (securityClasses: SecurityClass[]) =>
-          securityClasses
-            .map((secClass) =>
-              this.hass.localize(
-                `ui.panel.config.zwave_js.security_classes.${SecurityClass[secClass]}`
-              )
-            )
-            .join(", "),
-      },
-      unprovision: {
-        title: this.hass.localize(
-          "ui.panel.config.zwave_js.provisioned.unprovison"
-        ),
-        type: "icon-button",
-        template: (_info, provisioningEntry: any) => html`
-          <ha-icon-button
-            .label=${this.hass.localize(
-              "ui.panel.config.zwave_js.provisioned.unprovison"
-            )}
-            .path=${mdiDelete}
-            .provisioningEntry=${provisioningEntry}
-            @click=${this._unprovision}
-          ></ha-icon-button>
-        `,
-      },
-    })
-  );
-
-  protected firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-    this._fetchData();
-  }
-
-  private async _fetchData() {
-    this._provisioningEntries = await fetchZwaveProvisioningEntries(
-      this.hass!,
-      this.configEntryId
-    );
-  }
-
-  private _unprovision = async (ev) => {
-    const confirm = await showConfirmationDialog(this, {
-      title: this.hass.localize(
-        "ui.panel.config.zwave_js.provisioned.confirm_unprovision_title"
-      ),
-      text: this.hass.localize(
-        "ui.panel.config.zwave_js.provisioned.confirm_unprovision_text"
-      ),
-      confirmText: this.hass.localize(
-        "ui.panel.config.zwave_js.provisioned.unprovison"
-      ),
-    });
-
-    if (!confirm) {
-      return;
-    }
-
-    await unprovisionZwaveSmartStartNode(
-      this.hass,
-      this.configEntryId,
-      ev.currentTarget.provisioningEntry.dsk
-    );
-  };
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "zwave_js-provisioned": ZWaveJSProvisioned;
-  }
-}
--- a/src/panels/config/logs/error-log-card.ts
+++ b/src/panels/config/logs/error-log-card.ts
@@ -20,7 +20,7 @@ class ErrorLogCard extends LitElement {
                <ha-icon-button
                  .path=${mdiRefresh}
                  @click=${this._refreshErrorLog}
-                  .label=${this.hass.localize("ui.common.refresh")}
+                  .label=${this.hass!.localize("ui.common.refresh")}
                ></ha-icon-button>
                <div class="card-content error-log">${this._errorHTML}</div>
              </ha-card>
@@ -38,7 +38,6 @@ class ErrorLogCard extends LitElement {
    super.firstUpdated(changedProps);

    if (this.hass?.config.safe_mode) {
-      this.hass.loadFragmentTranslation("config");
      this._refreshErrorLog();
    }
  }
--- a/src/panels/config/person/dialog-person-detail.ts
+++ b/src/panels/config/person/dialog-person-detail.ts
@@ -51,8 +51,6 @@ class DialogPersonDetail extends LitElement {

  @state() private _isAdmin?: boolean;

-  @state() private _localOnly?: boolean;
-
  @state() private _deviceTrackers!: string[];

  @state() private _picture!: string | null;
@@ -85,14 +83,12 @@ class DialogPersonDetail extends LitElement {
        ? this._params.users.find((user) => user.id === this._userId)
        : undefined;
      this._isAdmin = this._user?.group_ids.includes(SYSTEM_GROUP_ID_ADMIN);
-      this._localOnly = this._user?.local_only;
    } else {
      this._personExists = false;
      this._name = "";
      this._userId = undefined;
      this._user = undefined;
      this._isAdmin = undefined;
-      this._localOnly = undefined;
      this._deviceTrackers = [];
      this._picture = null;
    }
@@ -156,31 +152,19 @@ class DialogPersonDetail extends LitElement {

            ${this._user
              ? html`<ha-formfield
-                    .label=${this.hass.localize(
-                      "ui.panel.config.person.detail.local_only"
-                    )}
-                    .dir=${computeRTLDirection(this.hass)}
+                  .label=${this.hass.localize(
+                    "ui.panel.config.person.detail.admin"
+                  )}
+                  .dir=${computeRTLDirection(this.hass)}
+                >
+                  <ha-switch
+                    .disabled=${this._user.system_generated ||
+                    this._user.is_owner}
+                    .checked=${this._isAdmin}
+                    @change=${this._adminChanged}
                  >
-                    <ha-switch
-                      .checked=${this._localOnly}
-                      @change=${this._localOnlyChanged}
-                    >
-                    </ha-switch>
-                  </ha-formfield>
-                  <ha-formfield
-                    .label=${this.hass.localize(
-                      "ui.panel.config.person.detail.admin"
-                    )}
-                    .dir=${computeRTLDirection(this.hass)}
-                  >
-                    <ha-switch
-                      .disabled=${this._user.system_generated ||
-                      this._user.is_owner}
-                      .checked=${this._isAdmin}
-                      @change=${this._adminChanged}
-                    >
-                    </ha-switch>
-                  </ha-formfield>`
+                  </ha-switch>
+                </ha-formfield>`
              : ""}
            ${this._deviceTrackersAvailable(this.hass)
              ? html`
@@ -282,14 +266,10 @@ class DialogPersonDetail extends LitElement {
    this._name = ev.detail.value;
  }

-  private _adminChanged(ev): void {
+  private async _adminChanged(ev): Promise<void> {
    this._isAdmin = ev.target.checked;
  }

-  private _localOnlyChanged(ev): void {
-    this._localOnly = ev.target.checked;
-  }
-
  private async _allowLoginChanged(ev): Promise<void> {
    const target = ev.target;
    if (target.checked) {
@@ -301,7 +281,6 @@ class DialogPersonDetail extends LitElement {
            this._user = user;
            this._userId = user.id;
            this._isAdmin = user.group_ids.includes(SYSTEM_GROUP_ID_ADMIN);
-            this._localOnly = user.local_only;
            this._params?.refreshUsers();
          }
        },
@@ -394,16 +373,13 @@ class DialogPersonDetail extends LitElement {
    try {
      if (
        (this._userId && this._name !== this._params!.entry?.name) ||
-        this._isAdmin !==
-          this._user?.group_ids.includes(SYSTEM_GROUP_ID_ADMIN) ||
-        this._localOnly !== this._user?.local_only
+        this._isAdmin !== this._user?.group_ids.includes(SYSTEM_GROUP_ID_ADMIN)
      ) {
        await updateUser(this.hass!, this._userId!, {
          name: this._name.trim(),
          group_ids: [
            this._isAdmin ? SYSTEM_GROUP_ID_ADMIN : SYSTEM_GROUP_ID_USER,
          ],
-          local_only: this._localOnly,
        });
        this._params?.refreshUsers();
      }
--- a/src/panels/config/scene/ha-scene-editor.ts
+++ b/src/panels/config/scene/ha-scene-editor.ts
@@ -32,7 +32,6 @@ import "../../../components/ha-card";
 import "../../../components/ha-fab";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-icon-picker";
-import "../../../components/ha-area-picker";
 import "../../../components/ha-svg-icon";
 import {
  computeDeviceName,
@@ -42,7 +41,6 @@ import {
 import {
  EntityRegistryEntry,
  subscribeEntityRegistry,
-  updateEntityRegistryEntry,
 } from "../../../data/entity_registry";
 import {
  activateScene,
@@ -123,22 +121,6 @@ export class HaSceneEditor extends SubscribeMixin(

  private _activateContextId?: string;

-  @state() private _saving = false;
-
-  // undefined means not set in this session
-  // null means picked nothing.
-  @state() private _updatedAreaId?: string | null;
-
-  // Callback to be called when scene is set.
-  private _scenesSet?: () => void;
-
-  private _getRegistryAreaId = memoizeOne(
-    (entries: EntityRegistryEntry[], entity_id: string) => {
-      const entry = entries.find((ent) => ent.entity_id === entity_id);
-      return entry ? entry.area_id : null;
-    }
-  );
-
  private _getEntitiesDevices = memoizeOne(
    (
      entities: string[],
@@ -305,16 +287,6 @@ export class HaSceneEditor extends SubscribeMixin(
                        @value-changed=${this._valueChanged}
                      >
                      </ha-icon-picker>
-                      <ha-area-picker
-                        .hass=${this.hass}
-                        .label=${this.hass.localize(
-                          "ui.panel.config.scene.editor.area"
-                        )}
-                        .name=${"area"}
-                        .value=${this._sceneAreaIdWithUpdates || ""}
-                        @value-changed=${this._areaChanged}
-                      >
-                      </ha-area-picker>
                    </div>
                  </ha-card>
                </ha-config-section>
@@ -472,9 +444,8 @@ export class HaSceneEditor extends SubscribeMixin(
          slot="fab"
          .label=${this.hass.localize("ui.panel.config.scene.editor.save")}
          extended
-          .disabled=${this._saving}
          @click=${this._saveScene}
-          class=${classMap({ dirty: this._dirty, saving: this._saving })}
+          class=${classMap({ dirty: this._dirty })}
        >
          <ha-svg-icon slot="icon" .path=${mdiContentSave}></ha-svg-icon>
        </ha-fab>
@@ -503,15 +474,12 @@ export class HaSceneEditor extends SubscribeMixin(
      this._config = {
        name: this.hass.localize("ui.panel.config.scene.editor.default_name"),
        entities: {},
-        ...initData?.config,
+        ...initData,
      };
      this._initEntities(this._config);
-      if (initData?.areaId) {
-        this._updatedAreaId = initData.areaId;
+      if (initData) {
+        this._dirty = true;
      }
-      this._dirty =
-        initData !== undefined &&
-        (initData.areaId !== undefined || initData.config !== undefined);
    }

    if (changedProps.has("_entityRegistryEntries")) {
@@ -546,9 +514,6 @@ export class HaSceneEditor extends SubscribeMixin(
    ) {
      this._setScene();
    }
-    if (this._scenesSet && changedProps.has("scenes")) {
-      this._scenesSet();
-    }
  }

  private async _handleMenuAction(ev: CustomEvent<ActionDetail>) {
@@ -724,21 +689,6 @@ export class HaSceneEditor extends SubscribeMixin(
    this._dirty = true;
  }

-  private _areaChanged(ev: CustomEvent) {
-    const newValue = ev.detail.value === "" ? null : ev.detail.value;
-
-    if (newValue === (this._sceneAreaIdWithUpdates || "")) {
-      return;
-    }
-
-    if (newValue === this._sceneAreaIdCurrent) {
-      this._updatedAreaId = undefined;
-    } else {
-      this._updatedAreaId = newValue;
-      this._dirty = true;
-    }
-  }
-
  private _stateChanged(event: HassEvent) {
    if (
      event.context.id !== this._activateContextId &&
@@ -799,16 +749,13 @@ export class HaSceneEditor extends SubscribeMixin(
      // Wait for dialog to complete closing
      await new Promise((resolve) => setTimeout(resolve, 0));
    }
-    showSceneEditor(
-      {
-        ...this._config,
-        id: undefined,
-        name: `${this._config?.name} (${this.hass.localize(
-          "ui.panel.config.scene.picker.duplicate"
-        )})`,
-      },
-      this._sceneAreaIdCurrent || undefined
-    );
+    showSceneEditor({
+      ...this._config,
+      id: undefined,
+      name: `${this._config?.name} (${this.hass.localize(
+        "ui.panel.config.scene.picker.duplicate"
+      )})`,
+    });
  }

  private _calculateStates(): SceneEntities {
@@ -845,41 +792,7 @@ export class HaSceneEditor extends SubscribeMixin(
    const id = !this.sceneId ? "" + Date.now() : this.sceneId!;
    this._config = { ...this._config!, entities: this._calculateStates() };
    try {
-      this._saving = true;
      await saveScene(this.hass, id, this._config);
-
-      if (this._updatedAreaId !== undefined) {
-        let scene =
-          this._scene ||
-          this.scenes.find(
-            (entity: SceneEntity) => entity.attributes.id === id
-          );
-
-        if (!scene) {
-          try {
-            await new Promise<void>((resolve, reject) => {
-              setTimeout(reject, 3000);
-              this._scenesSet = resolve;
-            });
-            scene = this.scenes.find(
-              (entity: SceneEntity) => entity.attributes.id === id
-            );
-          } catch (err) {
-            // We do nothing.
-          } finally {
-            this._scenesSet = undefined;
-          }
-        }
-
-        if (scene) {
-          await updateEntityRegistryEntry(this.hass, scene.entity_id, {
-            area_id: this._updatedAreaId,
-          });
-        }
-
-        this._updatedAreaId = undefined;
-      }
-
      this._dirty = false;

      if (!this.sceneId) {
@@ -891,8 +804,6 @@ export class HaSceneEditor extends SubscribeMixin(
        message: err.body.message || err.message,
      });
      throw err;
-    } finally {
-      this._saving = false;
    }
  }

@@ -900,21 +811,6 @@ export class HaSceneEditor extends SubscribeMixin(
    this._saveScene();
  }

-  private get _sceneAreaIdWithUpdates(): string | undefined | null {
-    return this._updatedAreaId !== undefined
-      ? this._updatedAreaId
-      : this._sceneAreaIdCurrent;
-  }
-
-  private get _sceneAreaIdCurrent(): string | undefined | null {
-    return this._scene
-      ? this._getRegistryAreaId(
-          this._entityRegistryEntries,
-          this._scene.entity_id
-        )
-      : undefined;
-  }
-
  static get styles(): CSSResultGroup {
    return [
      haStyle,
@@ -981,9 +877,6 @@ export class HaSceneEditor extends SubscribeMixin(
        ha-fab.dirty {
          bottom: 0;
        }
-        ha-fab.saving {
-          opacity: var(--light-disabled-opacity);
-        }
      `,
    ];
  }
--- a/src/panels/config/users/dialog-add-user.ts
+++ b/src/panels/config/users/dialog-add-user.ts
@@ -48,8 +48,6 @@ export class DialogAddUser extends LitElement {

  @state() private _isAdmin?: boolean;

-  @state() private _localOnly?: boolean;
-
  @state() private _allowChangeName = true;

  public showDialog(params: AddUserDialogParams) {
@@ -59,7 +57,6 @@ export class DialogAddUser extends LitElement {
    this._password = "";
    this._passwordConfirm = "";
    this._isAdmin = false;
-    this._localOnly = false;
    this._error = undefined;
    this._loading = false;

@@ -156,32 +153,14 @@ export class DialogAddUser extends LitElement {
              "ui.panel.config.users.add_user.password_not_match"
            )}
          ></paper-input>
-          <div class="row">
-            <ha-formfield
-              .label=${this.hass.localize(
-                "ui.panel.config.users.editor.local_only"
-              )}
-              .dir=${computeRTLDirection(this.hass)}
-            >
-              <ha-switch
-                .checked=${this._localOnly}
-                @change=${this._localOnlyChanged}
-              >
-              </ha-switch>
-            </ha-formfield>
-          </div>
-          <div class="row">
-            <ha-formfield
-              .label=${this.hass.localize("ui.panel.config.users.editor.admin")}
-              .dir=${computeRTLDirection(this.hass)}
-            >
-              <ha-switch
-                .checked=${this._isAdmin}
-                @change=${this._adminChanged}
-              >
-              </ha-switch>
-            </ha-formfield>
-          </div>
+
+          <ha-formfield
+            .label=${this.hass.localize("ui.panel.config.users.editor.admin")}
+            .dir=${computeRTLDirection(this.hass)}
+          >
+            <ha-switch .checked=${this._isAdmin} @change=${this._adminChanged}>
+            </ha-switch>
+          </ha-formfield>
          ${!this._isAdmin
            ? html`
                <br />
@@ -239,10 +218,6 @@ export class DialogAddUser extends LitElement {
    this._isAdmin = ev.target.checked;
  }

-  private _localOnlyChanged(ev): void {
-    this._localOnly = ev.target.checked;
-  }
-
  private async _createUser(ev) {
    ev.preventDefault();
    if (!this._name || !this._username || !this._password) {
@@ -254,12 +229,9 @@ export class DialogAddUser extends LitElement {

    let user: User;
    try {
-      const userResponse = await createUser(
-        this.hass,
-        this._name,
-        [this._isAdmin ? SYSTEM_GROUP_ID_ADMIN : SYSTEM_GROUP_ID_USER],
-        this._localOnly
-      );
+      const userResponse = await createUser(this.hass, this._name, [
+        this._isAdmin ? SYSTEM_GROUP_ID_ADMIN : SYSTEM_GROUP_ID_USER,
+      ]);
      user = userResponse.user;
    } catch (err: any) {
      this._loading = false;
@@ -294,9 +266,8 @@ export class DialogAddUser extends LitElement {
          --mdc-dialog-max-width: 500px;
          --dialog-z-index: 10;
        }
-        .row {
-          display: flex;
-          padding: 8px 0;
+        ha-switch {
+          margin-top: 8px;
        }
      `,
    ];
--- a/src/panels/config/users/dialog-user-detail.ts
+++ b/src/panels/config/users/dialog-user-detail.ts
@@ -30,8 +30,6 @@ class DialogUserDetail extends LitElement {

  @state() private _isAdmin?: boolean;

-  @state() private _localOnly?: boolean;
-
  @state() private _isActive?: boolean;

  @state() private _error?: string;
@@ -45,7 +43,6 @@ class DialogUserDetail extends LitElement {
    this._error = undefined;
    this._name = params.entry.name || "";
    this._isAdmin = params.entry.group_ids.includes(SYSTEM_GROUP_ID_ADMIN);
-    this._localOnly = params.entry.local_only;
    this._isActive = params.entry.is_active;
    await this.updateComplete;
  }
@@ -98,20 +95,6 @@ class DialogUserDetail extends LitElement {
              @value-changed=${this._nameChanged}
              label=${this.hass!.localize("ui.panel.config.users.editor.name")}
            ></paper-input>
-            <div class="row">
-              <ha-formfield
-                .label=${this.hass.localize(
-                  "ui.panel.config.users.editor.local_only"
-                )}
-                .dir=${computeRTLDirection(this.hass)}
-              >
-                <ha-switch
-                  .checked=${this._localOnly}
-                  @change=${this._localOnlyChanged}
-                >
-                </ha-switch>
-              </ha-formfield>
-            </div>
            <div class="row">
              <ha-formfield
                .label=${this.hass.localize(
@@ -215,15 +198,11 @@ class DialogUserDetail extends LitElement {
    this._name = ev.detail.value;
  }

-  private _adminChanged(ev): void {
+  private async _adminChanged(ev): Promise<void> {
    this._isAdmin = ev.target.checked;
  }

-  private _localOnlyChanged(ev): void {
-    this._localOnly = ev.target.checked;
-  }
-
-  private _activeChanged(ev): void {
+  private async _activeChanged(ev): Promise<void> {
    this._isActive = ev.target.checked;
  }

@@ -236,7 +215,6 @@ class DialogUserDetail extends LitElement {
        group_ids: [
          this._isAdmin ? SYSTEM_GROUP_ID_ADMIN : SYSTEM_GROUP_ID_USER,
        ],
-        local_only: this._localOnly,
      });
      this._close();
    } catch (err: any) {
--- a/src/panels/config/users/ha-config-users.ts
+++ b/src/panels/config/users/ha-config-users.ts
@@ -90,7 +90,7 @@ export class HaConfigUsers extends LitElement {
          width: "80px",
          template: (is_active) =>
            is_active
-              ? html`<ha-svg-icon .path=${mdiCheck}></ha-svg-icon>`
+              ? html`<ha-svg-icon .path=${mdiCheck}> </ha-svg-icon>`
              : "",
        },
        system_generated: {
@@ -103,20 +103,9 @@ export class HaConfigUsers extends LitElement {
          width: "160px",
          template: (generated) =>
            generated
-              ? html`<ha-svg-icon .path=${mdiCheck}></ha-svg-icon>`
+              ? html`<ha-svg-icon .path=${mdiCheck}> </ha-svg-icon>`
              : "",
        },
-        local_only: {
-          title: this.hass.localize(
-            "ui.panel.config.users.picker.headers.local"
-          ),
-          type: "icon",
-          sortable: true,
-          filterable: true,
-          width: "160px",
-          template: (local) =>
-            local ? html`<ha-svg-icon .path=${mdiCheck}></ha-svg-icon>` : "",
-        },
      };

      return columns;
--- a/src/panels/developer-tools/statistics/developer-tools-statistics.ts
+++ b/src/panels/developer-tools/statistics/developer-tools-statistics.ts
@@ -1,5 +1,5 @@
 import "@material/mwc-button/mwc-button";
-import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
+import { HassEntity } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -7,7 +7,6 @@ import { fireEvent } from "../../../common/dom/fire_event";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/data-table/ha-data-table";
 import type { DataTableColumnContainer } from "../../../components/data-table/ha-data-table";
-import { subscribeEntityRegistry } from "../../../data/entity_registry";
 import {
  clearStatistics,
  getStatisticIds,
@@ -19,7 +18,6 @@ import {
  showAlertDialog,
  showConfirmationDialog,
 } from "../../../dialogs/generic/show-dialog-box";
-import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import { showFixStatisticsUnitsChangedDialog } from "./show-dialog-statistics-fix-units-changed";
@@ -35,7 +33,7 @@ const FIX_ISSUES_ORDER = {
  unsupported_unit_metadata: 5,
 };
@customElement("developer-tools-statistics")
-class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
+class HaPanelDevStatistics extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ type: Boolean }) public narrow!: boolean;
@@ -45,8 +43,6 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
    state?: HassEntity;
  })[] = [] as StatisticsMetaData[];

-  private _disabledEntities = new Set<string>();
-
  protected firstUpdated() {
    this._validateStatistics();
  }
@@ -134,25 +130,6 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
    }
  }

-  public hassSubscribe(): UnsubscribeFunc[] {
-    return [
-      subscribeEntityRegistry(this.hass.connection!, (entities) => {
-        const disabledEntities = new Set<string>();
-        for (const confEnt of entities) {
-          if (!confEnt.disabled_by) {
-            continue;
-          }
-          disabledEntities.add(confEnt.entity_id);
-        }
-        // If the disabled entities changed, re-validate the statistics
-        if (disabledEntities !== this._disabledEntities) {
-          this._disabledEntities = disabledEntities;
-          this._validateStatistics();
-        }
-      }),
-    ];
-  }
-
  private async _validateStatistics() {
    const [statisticIds, issues] = await Promise.all([
      getStatisticIds(this.hass),
@@ -161,24 +138,17 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {

    const statsIds = new Set();

-    this._data = statisticIds
-      .filter(
-        (statistic) => !this._disabledEntities.has(statistic.statistic_id)
-      )
-      .map((statistic) => {
-        statsIds.add(statistic.statistic_id);
-        return {
-          ...statistic,
-          state: this.hass.states[statistic.statistic_id],
-          issues: issues[statistic.statistic_id],
-        };
-      });
+    this._data = statisticIds.map((statistic) => {
+      statsIds.add(statistic.statistic_id);
+      return {
+        ...statistic,
+        state: this.hass.states[statistic.statistic_id],
+        issues: issues[statistic.statistic_id],
+      };
+    });

    Object.keys(issues).forEach((statisticId) => {
-      if (
-        !statsIds.has(statisticId) &&
-        !this._disabledEntities.has(statisticId)
-      ) {
+      if (!statsIds.has(statisticId)) {
        this._data.push({
          statistic_id: statisticId,
          unit_of_measurement: "",
--- a/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
@@ -13,7 +13,10 @@ import {
  energySourcesByType,
  getEnergyDataCollection,
 } from "../../../../data/energy";
-import { calculateStatisticsSumGrowth } from "../../../../data/history";
+import {
+  calculateStatisticsSumGrowth,
+  calculateStatisticsSumGrowthWithPercentage,
+} from "../../../../data/history";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../../../../types";
 import { createEntityNotFoundWarning } from "../../components/hui-warning";
@@ -87,13 +90,19 @@ class HuiEnergyCarbonGaugeCard
      value = 100;
    }

-    if (this._data.fossilEnergyConsumption && totalGridConsumption) {
-      const highCarbonEnergy = this._data.fossilEnergyConsumption
-        ? Object.values(this._data.fossilEnergyConsumption).reduce(
-            (sum, a) => sum + a,
-            0
-          )
-        : 0;
+    if (
+      this._data.co2SignalEntity in this._data.stats &&
+      totalGridConsumption
+    ) {
+      const highCarbonEnergy =
+        calculateStatisticsSumGrowthWithPercentage(
+          this._data.stats[this._data.co2SignalEntity],
+          types
+            .grid![0].flow_from.map(
+              (flow) => this._data!.stats![flow.stat_energy_from]
+            )
+            .filter(Boolean)
+        ) || 0;

      const totalSolarProduction = types.solar
        ? calculateStatisticsSumGrowth(
--- a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts
@@ -6,7 +6,7 @@ import {
  ScatterDataPoint,
 } from "chart.js";
 import { getRelativePosition } from "chart.js/helpers";
-import { addHours, differenceInDays } from "date-fns";
+import { addHours } from "date-fns";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
@@ -155,19 +155,13 @@ export class HuiEnergyDevicesGraphCard
  );

  private async _getStatistics(energyData: EnergyData): Promise<void> {
-    const dayDifference = differenceInDays(
-      energyData.end || new Date(),
-      energyData.start
-    );
-
    this._data = await fetchStatistics(
      this.hass,
      addHours(energyData.start, -1),
      energyData.end,
      energyData.prefs.device_consumption.map(
        (device) => device.stat_consumption
-      ),
-      dayDifference > 35 ? "month" : dayDifference > 2 ? "day" : "hour"
+      )
    );

    const data: Array<ChartDataset<"bar", ParsedDataType<"bar">>["data"]> = [];
--- a/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
@@ -24,7 +24,10 @@ import {
  getEnergyDataCollection,
  getEnergyGasUnit,
 } from "../../../../data/energy";
-import { calculateStatisticsSumGrowth } from "../../../../data/history";
+import {
+  calculateStatisticsSumGrowth,
+  calculateStatisticsSumGrowthWithPercentage,
+} from "../../../../data/history";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../../../types";
 import { LovelaceCard } from "../../types";
@@ -206,11 +209,19 @@ class HuiEnergyDistrubutionCard
    // This fallback is used in the demo
    let electricityMapUrl = "https://www.electricitymap.org";

-    if (this._data.co2SignalEntity && this._data.fossilEnergyConsumption) {
+    if (
+      this._data.co2SignalEntity &&
+      this._data.co2SignalEntity in this._data.stats
+    ) {
      // Calculate high carbon consumption
-      const highCarbonEnergy = Object.values(
-        this._data.fossilEnergyConsumption
-      ).reduce((sum, a) => sum + a, 0);
+      const highCarbonEnergy = calculateStatisticsSumGrowthWithPercentage(
+        this._data.stats[this._data.co2SignalEntity],
+        types
+          .grid![0].flow_from.map(
+            (flow) => this._data!.stats[flow.stat_energy_from]
+          )
+          .filter(Boolean)
+      );

      const co2State = this.hass.states[this._data.co2SignalEntity];

--- a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
@@ -41,6 +41,10 @@ import {
 } from "../../../../common/number/format_number";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { FrontendLocaleData } from "../../../../data/translation";
+import {
+  reduceSumStatisticsByMonth,
+  reduceSumStatisticsByDay,
+} from "../../../../data/history";
 import { formatTime } from "../../../../common/datetime/format_time";

@customElement("hui-energy-gas-graph-card")
@@ -243,6 +247,11 @@ export class HuiEnergyGasGraphCard
      .getPropertyValue("--energy-gas-color")
      .trim();

+    const dayDifference = differenceInDays(
+      energyData.end || new Date(),
+      energyData.start
+    );
+
    gasSources.forEach((source, idx) => {
      const data: ChartDataset<"bar" | "line">[] = [];
      const entity = this.hass.states[source.stat_energy_from];
@@ -259,7 +268,16 @@ export class HuiEnergyGasGraphCard

      // Process gas consumption data.
      if (source.stat_energy_from in energyData.stats) {
-        const stats = energyData.stats[source.stat_energy_from];
+        const stats =
+          dayDifference > 35
+            ? reduceSumStatisticsByMonth(
+                energyData.stats[source.stat_energy_from]
+              )
+            : dayDifference > 2
+            ? reduceSumStatisticsByDay(
+                energyData.stats[source.stat_energy_from]
+              )
+            : energyData.stats[source.stat_energy_from];

        for (const point of stats) {
          if (point.sum === null) {
--- a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
@@ -42,6 +42,10 @@ import {
 } from "../../../../common/number/format_number";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { FrontendLocaleData } from "../../../../data/translation";
+import {
+  reduceSumStatisticsByMonth,
+  reduceSumStatisticsByDay,
+} from "../../../../data/history";
 import { formatTime } from "../../../../common/datetime/format_time";

@customElement("hui-energy-solar-graph-card")
@@ -270,7 +274,16 @@ export class HuiEnergySolarGraphCard

      // Process solar production data.
      if (source.stat_energy_from in energyData.stats) {
-        const stats = energyData.stats[source.stat_energy_from];
+        const stats =
+          dayDifference > 35
+            ? reduceSumStatisticsByMonth(
+                energyData.stats[source.stat_energy_from]
+              )
+            : dayDifference > 2
+            ? reduceSumStatisticsByDay(
+                energyData.stats[source.stat_energy_from]
+              )
+            : energyData.stats[source.stat_energy_from];

        for (const point of stats) {
          if (point.sum === null) {
--- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
@@ -27,6 +27,10 @@ import {
 import "../../../../components/chart/ha-chart-base";
 import "../../../../components/ha-card";
 import { EnergyData, getEnergyDataCollection } from "../../../../data/energy";
+import {
+  reduceSumStatisticsByDay,
+  reduceSumStatisticsByMonth,
+} from "../../../../data/history";
 import { FrontendLocaleData } from "../../../../data/translation";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../../../types";
@@ -294,6 +298,11 @@ export class HuiEnergyUsageGraphCard
      }
    }

+    const dayDifference = differenceInDays(
+      energyData.end || new Date(),
+      energyData.start
+    );
+
    this._start = energyData.start;
    this._end = energyData.end || endOfToday();

@@ -359,7 +368,12 @@ export class HuiEnergyUsageGraphCard
      const totalStats: { [start: string]: number } = {};
      const sets: { [statId: string]: { [start: string]: number } } = {};
      statIds!.forEach((id) => {
-        const stats = energyData.stats[id];
+        const stats =
+          dayDifference > 35
+            ? reduceSumStatisticsByMonth(energyData.stats[id])
+            : dayDifference > 2
+            ? reduceSumStatisticsByDay(energyData.stats[id])
+            : energyData.stats[id];
        if (!stats) {
          return;
        }
--- a/Show More
+++ b/Show More