Hide stop if "hassio" is loaded

Enable filtering on hidden columns (#6717 )
Add generic/generic_thermostat/homekit/min_max/history_stats/trend/ping/filesize to the list of reloadables (#6721 )
2026-05-18 23:27:09 +00:00 · 2020-08-28 19:06:03 +00:00 · 2020-08-28 15:50:32 +02:00 · 2020-08-28 08:31:54 -05:00 · 2020-08-28 14:30:42 +02:00 · 2020-08-28 14:16:55 +02:00
570 changed files with 22843 additions and 7136 deletions
@@ -1,7 +1,7 @@
 {
  "extends": [
-    "plugin:@typescript-eslint/recommended",
    "airbnb-typescript/base",
+    "plugin:@typescript-eslint/recommended",
    "plugin:wc/recommended",
    "plugin:lit/recommended",
    "prettier",
@@ -45,16 +45,16 @@
    "func-names": 0,
    "prefer-arrow-callback": 0,
    "no-underscore-dangle": 0,
-    "no-var": 0,
    "strict": 0,
    "prefer-spread": 0,
    "no-plusplus": 0,
-    "no-bitwise": 0,
+    "no-bitwise": 2,
    "comma-dangle": 0,
    "vars-on-top": 0,
    "no-continue": 0,
    "no-param-reassign": 0,
    "no-multi-assign": 0,
+    "no-console": 2,
    "radix": 0,
    "no-alert": 0,
    "no-return-await": 0,
@@ -147,6 +147,10 @@
    "path": "M21.11,18.5C20.97,18.5 20.83,18.44 20.71,18.36C20.37,18.13 20.28,17.68 20.5,17.34C21.18,16.34 21.54,15.16 21.54,13.93C21.54,12.71 21.18,11.53 20.5,10.5C20.28,10.18 20.37,9.73 20.71,9.5C21.04,9.28 21.5,9.37 21.72,9.7C22.56,10.95 23,12.41 23,13.93C23,15.45 22.56,16.91 21.72,18.16C21.58,18.37 21.35,18.5 21.11,18.5M19,17.29C18.88,17.29 18.74,17.25 18.61,17.17C18.28,16.94 18.19,16.5 18.42,16.15C18.86,15.5 19.1,14.73 19.1,13.93C19.1,13.14 18.86,12.37 18.42,11.71C18.19,11.37 18.28,10.92 18.61,10.69C18.95,10.47 19.4,10.55 19.63,10.89C20.24,11.79 20.56,12.84 20.56,13.93C20.56,15 20.24,16.07 19.63,16.97C19.5,17.18 19.25,17.29 19,17.29M14.9,15.73C15.89,15.73 16.7,14.92 16.7,13.93C16.7,13.17 16.22,12.5 15.55,12.25C15.5,12.55 15.43,12.85 15.34,13.14C15.23,13.44 14.95,13.64 14.64,13.64C14.57,13.64 14.5,13.62 14.41,13.6C14.03,13.47 13.82,13.06 13.95,12.67C14.09,12.24 14.17,11.78 14.17,11.32C14.17,8.93 12.22,7 9.82,7C8.1,7 6.56,8 5.87,9.5C6.54,9.7 7.16,10.04 7.66,10.54C7.95,10.83 7.95,11.29 7.66,11.58C7.38,11.86 6.91,11.86 6.63,11.58C6.17,11.12 5.56,10.86 4.9,10.86C3.56,10.86 2.46,11.96 2.46,13.3C2.46,14.64 3.56,15.73 4.9,15.73H14.9M15.6,10.75C17.06,11.07 18.17,12.37 18.17,13.93C18.17,15.73 16.7,17.19 14.9,17.19H4.9C2.75,17.19 1,15.45 1,13.3C1,11.34 2.45,9.73 4.33,9.45C5.12,7.12 7.33,5.5 9.82,5.5C12.83,5.5 15.31,7.82 15.6,10.75Z",
    "name": "mixcloud"
  },
+  {
+    "path": "M5.68,3.96L11.41,11.65C11.55,11.84 11.55,12.1 11.41,12.29L5.65,20L5.5,20.18C4.76,21 3.47,21.07 2.64,20.31C1.85,19.59 1.79,18.37 2.43,17.5L6.56,11.97L2.46,6.47C1.83,5.62 1.88,4.39 2.67,3.67L2.82,3.54C3.73,2.87 5,3.05 5.68,3.96M18.32,3.96C19,3.05 20.27,2.87 21.18,3.54L21.33,3.67C22.12,4.39 22.17,5.61 21.54,6.47L17.44,11.97L21.57,17.5C22.21,18.36 22.15,19.59 21.36,20.31C20.53,21.07 19.24,21 18.5,20.18L18.35,20L12.59,12.29C12.45,12.1 12.45,11.84 12.59,11.65L18.32,3.96Z",
+    "name": "mixer"
+  },
  {
    "path": "M3.25,4.03L19.95,20.73L18.7,22L14.86,18.13C14.77,18.12 14.68,18.09 14.59,18.05C14.26,17.89 14.14,17.62 14.11,17.38L12.18,15.45C12.14,15.53 12.09,15.6 12.05,15.66C11.62,16.26 11.19,16.26 10.86,16.04C10.54,15.83 5.5,12 5.23,11.87C4.95,11.76 4.85,12.03 5.12,13.5C5.39,15 4.95,15.39 4.57,15.45C4.2,15.5 3.06,15.18 3,12.14C2.95,9.11 3.76,8.62 4.14,8.62C4.6,8.62 7.08,10.69 8.84,12.12L2,5.28L3.25,4.03M18.38,16.56C18.75,15.4 19.12,13.8 19.1,12.03V12C19.14,8.5 17.66,5.58 17.66,5.58C17.66,5.58 17.42,4.72 18.12,4.39C18.83,4.06 19.3,4.61 19.3,4.61C21.12,8.22 21,11.64 21,12C21,12.27 21.09,14.96 19.88,18.05L18.38,16.56M15.14,13.31C15.19,12.92 15.22,12.5 15.24,12.03V12C15.14,8.5 14.13,7.21 14.13,7.21C14.13,7.21 13.89,6.34 14.59,6C15.3,5.69 15.77,6.23 15.77,6.23C17.26,8.94 17.16,11.64 17.14,12C17.15,12.2 17.2,13.38 16.82,15L15.14,13.31M10.2,8.38C10.23,7.77 10.59,7.64 10.59,7.64C10.59,7.64 11.19,7.37 11.57,7.8C11.91,8.19 12.72,9.57 12.89,11.07L10.2,8.38Z",
    "name": "nfc-off"
@@ -8,6 +8,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import { CastManager } from "../../../../src/cast/cast_manager";
@@ -41,9 +42,9 @@ class HcCast extends LitElement {

  @property() public castManager!: CastManager;

-  @property() private askWrite = false;
+  @internalProperty() private askWrite = false;

-  @property() private lovelaceConfig?: LovelaceConfig | null;
+  @internalProperty() private lovelaceConfig?: LovelaceConfig | null;

  protected render(): TemplateResult {
    if (this.lovelaceConfig === undefined) {
@@ -17,8 +17,8 @@ import {
  customElement,
  html,
  LitElement,
-  property,
  TemplateResult,
+  internalProperty,
 } from "lit-element";
 import { CastManager, getCastManager } from "../../../../src/cast/cast_manager";
 import { castSendShowDemo } from "../../../../src/cast/receiver_messages";
@@ -60,19 +60,19 @@ const INTRO = html`

@customElement("hc-connect")
 export class HcConnect extends LitElement {
-  @property() private loading = false;
+  @internalProperty() private loading = false;

  // If we had stored credentials but we cannot connect,
  // show a screen asking retry or logout.
-  @property() private cannotConnect = false;
+  @internalProperty() private cannotConnect = false;

-  @property() private error?: string | TemplateResult;
+  @internalProperty() private error?: string | TemplateResult;

-  @property() private auth?: Auth;
+  @internalProperty() private auth?: Auth;

-  @property() private connection?: Connection;
+  @internalProperty() private connection?: Connection;

-  @property() private castManager?: CastManager | null;
+  @internalProperty() private castManager?: CastManager | null;

  private openDemo = false;

@@ -1,4 +1,10 @@
-import { customElement, html, property, TemplateResult } from "lit-element";
+import {
+  customElement,
+  html,
+  property,
+  internalProperty,
+  TemplateResult,
+} from "lit-element";
 import { mockHistory } from "../../../../demo/src/stubs/history";
 import { LovelaceConfig } from "../../../../src/data/lovelace";
 import {
@@ -13,9 +19,9 @@ import "./hc-lovelace";

@customElement("hc-demo")
 class HcDemo extends HassElement {
-  @property() public lovelacePath!: string;
+  @property({ attribute: false }) public lovelacePath!: string;

-  @property() private _lovelaceConfig?: LovelaceConfig;
+  @internalProperty() private _lovelaceConfig?: LovelaceConfig;

  protected render(): TemplateResult {
    if (!this._lovelaceConfig) {
@@ -11,7 +11,7 @@ import { HomeAssistant } from "../../../../src/types";

@customElement("hc-launch-screen")
 class HcLaunchScreen extends LitElement {
-  @property() public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property() public error?: string;

@@ -16,12 +16,14 @@ import "./hc-launch-screen";

@customElement("hc-lovelace")
 class HcLovelace extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property() public lovelaceConfig!: LovelaceConfig;
+  @property({ attribute: false }) public lovelaceConfig!: LovelaceConfig;

  @property() public viewPath?: string | number;

+  public urlPath?: string | null;
+
  protected render(): TemplateResult {
    const index = this._viewIndex;
    if (index === undefined) {
@@ -35,6 +37,7 @@ class HcLovelace extends LitElement {
    const lovelace: Lovelace = {
      config: this.lovelaceConfig,
      editMode: false,
+      urlPath: this.urlPath!,
      enableFullEditMode: () => undefined,
      mode: "storage",
      language: "en",
@@ -3,7 +3,12 @@ import {
  getAuth,
  UnsubscribeFunc,
 } from "home-assistant-js-websocket";
-import { customElement, html, property, TemplateResult } from "lit-element";
+import {
+  customElement,
+  html,
+  internalProperty,
+  TemplateResult,
+} from "lit-element";
 import { CAST_NS } from "../../../../src/cast/const";
 import {
  ConnectMessage,
@@ -31,13 +36,13 @@ let resourcesLoaded = false;

@customElement("hc-main")
 export class HcMain extends HassElement {
-  @property() private _showDemo = false;
+  @internalProperty() private _showDemo = false;

-  @property() private _lovelaceConfig?: LovelaceConfig;
+  @internalProperty() private _lovelaceConfig?: LovelaceConfig;

-  @property() private _lovelacePath: string | number | null = null;
+  @internalProperty() private _lovelacePath: string | number | null = null;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

  private _unsubLovelace?: UnsubscribeFunc;

@@ -82,6 +87,7 @@ export class HcMain extends HassElement {
        .hass=${this.hass}
        .lovelaceConfig=${this._lovelaceConfig}
        .viewPath=${this._lovelacePath}
+        .urlPath=${this._urlPath}
        @config-refresh=${this._generateLovelaceConfig}
      ></hc-lovelace>
    `;
@@ -4,7 +4,7 @@ import {
  customElement,
  html,
  LitElement,
-  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import { CastManager } from "../../../src/cast/cast_manager";
@@ -20,7 +20,7 @@ import { HomeAssistant } from "../../../src/types";
 class CastDemoRow extends LitElement implements LovelaceRow {
  public hass!: HomeAssistant;

-  @property() private _castManager?: CastManager | null;
+  @internalProperty() private _castManager?: CastManager | null;

  public setConfig(_config: CastConfig): void {
    // No config possible.
@@ -52,7 +52,6 @@ class CastDemoRow extends LitElement implements LovelaceRow {
        });
        mgr.castContext.addEventListener(
          // eslint-disable-next-line no-undef
-          // @ts-ignore
          cast.framework.CastContextEventType.SESSION_STATE_CHANGED,
          (ev) => {
            // On Android, opening a new session always results in SESSION_RESUMED.
@@ -5,6 +5,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import { until } from "lit-html/directives/until";
@@ -21,11 +22,11 @@ import {
 } from "../configs/demo-configs";

 export class HADemoCard extends LitElement implements LovelaceCard {
-  @property() public lovelace?: Lovelace;
+  @property({ attribute: false }) public lovelace?: Lovelace;

-  @property() public hass!: MockHomeAssistant;
+  @property({ attribute: false }) public hass!: MockHomeAssistant;

-  @property() private _switching?: boolean;
+  @internalProperty() private _switching?: boolean;

  private _hidden = localStorage.hide_demo_card;

@@ -21,7 +21,7 @@ import { filterAndSort } from "../components/hassio-filter-addons";
 import { hassioStyle } from "../resources/hassio-style";

 class HassioAddonRepositoryEl extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public repo!: HassioAddonRepository;

@@ -6,6 +6,7 @@ import {
  CSSResult,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
 } from "lit-element";
 import { html, TemplateResult } from "lit-html";
@@ -24,6 +25,7 @@ import { HomeAssistant, Route } from "../../../src/types";
 import { showRepositoriesDialog } from "../dialogs/repositories/show-dialog-repositories";
 import { supervisorTabs } from "../hassio-tabs";
 import "./hassio-addon-repository";
+import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";

 const sortRepos = (a: HassioAddonRepository, b: HassioAddonRepository) => {
  if (a.slug === "local") {
@@ -52,7 +54,7 @@ class HassioAddonStore extends LitElement {

  @property({ attribute: false }) private _repos?: HassioAddonRepository[];

-  @property() private _filter?: string;
+  @internalProperty() private _filter?: string;

  public async refreshData() {
    this._repos = undefined;
@@ -96,14 +98,18 @@ class HassioAddonStore extends LitElement {
        .tabs=${supervisorTabs}
      >
        <span slot="header">Add-on store</span>
-        <ha-button-menu corner="BOTTOM_START" slot="toolbar-icon">
+        <ha-button-menu
+          corner="BOTTOM_START"
+          slot="toolbar-icon"
+          @action=${this._handleAction}
+        >
          <mwc-icon-button slot="trigger" alt="menu">
            <ha-svg-icon path=${mdiDotsVertical}></ha-svg-icon>
          </mwc-icon-button>
-          <mwc-list-item @tap=${this._manageRepositories}>
+          <mwc-list-item>
            Repositories
          </mwc-list-item>
-          <mwc-list-item @tap=${this.refreshData}>
+          <mwc-list-item>
            Reload
          </mwc-list-item>
        </ha-button-menu>
@@ -142,6 +148,17 @@ class HassioAddonStore extends LitElement {
    this._loadData();
  }

+  private _handleAction(ev: CustomEvent<ActionDetail>) {
+    switch (ev.detail.index) {
+      case 0:
+        this._manageRepositories();
+        break;
+      case 1:
+        this.refreshData();
+        break;
+    }
+  }
+
  private apiCalled(ev) {
    if (ev.detail.success) {
      this._loadData();
@@ -9,6 +9,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -34,15 +35,15 @@ class HassioAddonAudio extends LitElement {

  @property({ attribute: false }) public addon!: HassioAddonDetails;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

-  @property() private _inputDevices?: HassioHardwareAudioDevice[];
+  @internalProperty() private _inputDevices?: HassioHardwareAudioDevice[];

-  @property() private _outputDevices?: HassioHardwareAudioDevice[];
+  @internalProperty() private _outputDevices?: HassioHardwareAudioDevice[];

-  @property() private _selectedInput!: null | string;
+  @internalProperty() private _selectedInput!: null | string;

-  @property() private _selectedOutput!: null | string;
+  @internalProperty() private _selectedOutput!: null | string;

  protected render(): TemplateResult {
    return html`
@@ -7,6 +7,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  query,
  TemplateResult,
@@ -32,7 +33,7 @@ class HassioAddonConfig extends LitElement {

  @property({ attribute: false }) public addon!: HassioAddonDetails;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

  @property({ type: Boolean }) private _configHasChanged = false;

@@ -6,6 +6,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -37,9 +38,9 @@ class HassioAddonNetwork extends LitElement {

  @property({ attribute: false }) public addon!: HassioAddonDetails;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

-  @property() private _config?: NetworkItem[];
+  @internalProperty() private _config?: NetworkItem[];

  public connectedCallback(): void {
    super.connectedCallback();
@@ -5,6 +5,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import "../../../../src/components/ha-markdown";
@@ -24,9 +25,9 @@ class HassioAddonDocumentationDashboard extends LitElement {

  @property({ attribute: false }) public addon?: HassioAddonDetails;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

-  @property() private _content?: string;
+  @internalProperty() private _content?: string;

  public async connectedCallback(): Promise<void> {
    super.connectedCallback();
@@ -9,7 +9,6 @@ import {
  mdiExclamationThick,
  mdiFlask,
  mdiHomeAssistant,
-  mdiInformation,
  mdiKey,
  mdiNetwork,
  mdiPound,
@@ -23,6 +22,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
@@ -52,6 +52,7 @@ import { HomeAssistant } from "../../../../src/types";
 import "../../components/hassio-card-content";
 import { showHassioMarkdownDialog } from "../../dialogs/markdown/show-dialog-hassio-markdown";
 import { hassioStyle } from "../../resources/hassio-style";
+import "../../../../src/components/ha-settings-row";

 const STAGE_ICON = {
  stable: mdiCheckCircle,
@@ -124,7 +125,7 @@ class HassioAddonInfo extends LitElement {

  @property({ attribute: false }) public addon!: HassioAddonDetails;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

  @property({ type: Boolean }) private _installing = false;

@@ -241,19 +242,23 @@ class HassioAddonInfo extends LitElement {
              `
            : ""}
          <div class="security">
-            <ha-label-badge
-              class=${classMap({
-                green: this.addon.stage === "stable",
-                yellow: this.addon.stage === "experimental",
-                red: this.addon.stage === "deprecated",
-              })}
-              @click=${this._showMoreInfo}
-              id="stage"
-              label="stage"
-              description=""
-            >
-              <ha-svg-icon .path=${STAGE_ICON[this.addon.stage]}></ha-svg-icon>
-            </ha-label-badge>
+            ${this.addon.stage !== "stable"
+              ? html` <ha-label-badge
+                  class=${classMap({
+                    yellow: this.addon.stage === "experimental",
+                    red: this.addon.stage === "deprecated",
+                  })}
+                  @click=${this._showMoreInfo}
+                  id="stage"
+                  label="stage"
+                  description=""
+                >
+                  <ha-svg-icon
+                    .path=${STAGE_ICON[this.addon.stage]}
+                  ></ha-svg-icon>
+                </ha-label-badge>`
+              : ""}
+
            <ha-label-badge
              class=${classMap({
                green: [5, 6].includes(Number(this.addon.rating)),
@@ -381,67 +386,94 @@ class HassioAddonInfo extends LitElement {

          ${this.addon.version
            ? html`
-                <div class="state">
-                  <div>Start on boot</div>
-                  <ha-switch
-                    @change=${this._startOnBootToggled}
-                    .checked=${this.addon.boot === "auto"}
-                    haptic
-                  ></ha-switch>
-                </div>
-                ${this.addon.auto_update || this.hass.userData?.showAdvanced
-                  ? html`
-                      <div class="state">
-                        <div>Auto update</div>
-                        <ha-switch
-                          @change=${this._autoUpdateToggled}
-                          .checked=${this.addon.auto_update}
-                          haptic
-                        ></ha-switch>
-                      </div>
-                    `
-                  : ""}
-                ${this.addon.ingress
-                  ? html`
-                      <div class="state">
-                        <div>Show in sidebar</div>
-                        <ha-switch
-                          @change=${this._panelToggled}
-                          .checked=${this.addon.ingress_panel}
-                          .disabled=${this._computeCannotIngressSidebar}
-                          haptic
-                        ></ha-switch>
-                        ${this._computeCannotIngressSidebar
-                          ? html`
-                              <span>
-                                This option requires Home Assistant 0.92 or
-                                later.
-                              </span>
-                            `
-                          : ""}
-                      </div>
-                    `
-                  : ""}
-                ${this._computeUsesProtectedOptions
-                  ? html`
-                      <div class="state">
-                        <div>
-                          Protection mode
-                          <span>
-                            <ha-svg-icon path=${mdiInformation}></ha-svg-icon>
-                            <paper-tooltip>
-                              Grant the add-on elevated system access.
-                            </paper-tooltip>
+                <div class="addon-options">
+                  <ha-settings-row ?three-line=${this.narrow}>
+                    <span slot="heading">
+                      Start on boot
+                    </span>
+                    <span slot="description">
+                      Make the add-on start during a system boot
+                    </span>
+                    <ha-switch
+                      @change=${this._startOnBootToggled}
+                      .checked=${this.addon.boot === "auto"}
+                      haptic
+                    ></ha-switch>
+                  </ha-settings-row>
+
+                  ${this.hass.userData?.showAdvanced
+                    ? html`
+                        <ha-settings-row ?three-line=${this.narrow}>
+                          <span slot="heading">
+                            Watchdog
                          </span>
-                        </div>
-                        <ha-switch
-                          @change=${this._protectionToggled}
-                          .checked=${this.addon.protected}
-                          haptic
-                        ></ha-switch>
-                      </div>
-                    `
-                  : ""}
+                          <span slot="description">
+                            This will start the add-on if it crashes
+                          </span>
+                          <ha-switch
+                            @change=${this._watchdogToggled}
+                            .checked=${this.addon.watchdog}
+                            haptic
+                          ></ha-switch>
+                        </ha-settings-row>
+                      `
+                    : ""}
+                  ${this.addon.auto_update || this.hass.userData?.showAdvanced
+                    ? html`
+                        <ha-settings-row ?three-line=${this.narrow}>
+                          <span slot="heading">
+                            Auto update
+                          </span>
+                          <span slot="description">
+                            Auto update the add-on when there is a new version
+                            available
+                          </span>
+                          <ha-switch
+                            @change=${this._autoUpdateToggled}
+                            .checked=${this.addon.auto_update}
+                            haptic
+                          ></ha-switch>
+                        </ha-settings-row>
+                      `
+                    : ""}
+                  ${this.addon.ingress
+                    ? html`
+                        <ha-settings-row ?three-line=${this.narrow}>
+                          <span slot="heading">
+                            Show in sidebar
+                          </span>
+                          <span slot="description">
+                            ${this._computeCannotIngressSidebar
+                              ? "This option requires Home Assistant 0.92 or later."
+                              : "Add this add-on to your sidebar"}
+                          </span>
+                          <ha-switch
+                            @change=${this._panelToggled}
+                            .checked=${this.addon.ingress_panel}
+                            .disabled=${this._computeCannotIngressSidebar}
+                            haptic
+                          ></ha-switch>
+                        </ha-settings-row>
+                      `
+                    : ""}
+                  ${this._computeUsesProtectedOptions
+                    ? html`
+                        <ha-settings-row ?three-line=${this.narrow}>
+                          <span slot="heading">
+                            Protection mode
+                          </span>
+                          <span slot="description">
+                            Blocks elevated system access from the add-on
+                          </span>
+                          <ha-switch
+                            @change=${this._protectionToggled}
+                            .checked=${this.addon.protected}
+                            haptic
+                          ></ha-switch>
+                        </ha-settings-row>
+                      `
+                    : ""}
+                </div>
              `
            : ""}
          ${this._error ? html` <div class="errors">${this._error}</div> ` : ""}
@@ -547,137 +579,6 @@ class HassioAddonInfo extends LitElement {
    `;
  }

-  static get styles(): CSSResult[] {
-    return [
-      haStyle,
-      hassioStyle,
-      css`
-        :host {
-          display: block;
-        }
-        ha-card {
-          display: block;
-          margin-bottom: 16px;
-        }
-        ha-card.warning {
-          background-color: var(--error-color);
-          color: white;
-        }
-        ha-card.warning .card-header {
-          color: white;
-        }
-        ha-card.warning .card-content {
-          color: white;
-        }
-        ha-card.warning mwc-button {
-          --mdc-theme-primary: white !important;
-        }
-        .warning {
-          color: var(--error-color);
-          --mdc-theme-primary: var(--error-color);
-        }
-        .light-color {
-          color: var(--secondary-text-color);
-        }
-        .addon-header {
-          padding-left: 8px;
-          font-size: 24px;
-          color: var(--ha-card-header-color, --primary-text-color);
-        }
-        .addon-version {
-          float: right;
-          font-size: 15px;
-          vertical-align: middle;
-        }
-        .errors {
-          color: var(--error-color);
-          margin-bottom: 16px;
-        }
-        .description {
-          margin-bottom: 16px;
-        }
-        img.logo {
-          max-height: 60px;
-          margin: 16px 0;
-          display: block;
-        }
-        .state {
-          display: flex;
-          margin: 33px 0;
-        }
-        .state div {
-          width: 180px;
-          display: inline-block;
-        }
-        .state ha-svg-icon {
-          width: 16px;
-          height: 16px;
-          color: var(--secondary-text-color);
-        }
-        ha-switch {
-          display: flex;
-        }
-        ha-svg-icon.running {
-          color: var(--paper-green-400);
-        }
-        ha-svg-icon.stopped {
-          color: var(--google-red-300);
-        }
-        ha-call-api-button {
-          font-weight: 500;
-          color: var(--primary-color);
-        }
-        .right {
-          float: right;
-        }
-        protection-enable mwc-button {
-          --mdc-theme-primary: white;
-        }
-        .description a {
-          color: var(--primary-color);
-        }
-        .red {
-          --ha-label-badge-color: var(--label-badge-red, #df4c1e);
-        }
-        .blue {
-          --ha-label-badge-color: var(--label-badge-blue, #039be5);
-        }
-        .green {
-          --ha-label-badge-color: var(--label-badge-green, #0da035);
-        }
-        .yellow {
-          --ha-label-badge-color: var(--label-badge-yellow, #f4b400);
-        }
-        .security {
-          margin-bottom: 16px;
-        }
-        .card-actions {
-          display: flow-root;
-        }
-        .security h3 {
-          margin-bottom: 8px;
-          font-weight: normal;
-        }
-        .security ha-label-badge {
-          cursor: pointer;
-          margin-right: 4px;
-          --ha-label-badge-padding: 8px 0 0 0;
-        }
-        .changelog {
-          display: contents;
-        }
-        .changelog-link {
-          color: var(--primary-color);
-          text-decoration: underline;
-          cursor: pointer;
-        }
-        ha-markdown {
-          padding: 16px;
-        }
-      `,
-    ];
-  }
-
  private get _computeHassioApi(): boolean {
    return (
      this.addon.hassio_api &&
@@ -766,6 +667,24 @@ class HassioAddonInfo extends LitElement {
    }
  }

+  private async _watchdogToggled(): Promise<void> {
+    this._error = undefined;
+    const data: HassioAddonSetOptionParams = {
+      watchdog: !this.addon.watchdog,
+    };
+    try {
+      await setHassioAddonOption(this.hass, this.addon.slug, data);
+      const eventdata = {
+        success: true,
+        response: undefined,
+        path: "option",
+      };
+      fireEvent(this, "hass-api-called", eventdata);
+    } catch (err) {
+      this._error = `Failed to set addon option, ${err.body?.message || err}`;
+    }
+  }
+
  private async _autoUpdateToggled(): Promise<void> {
    this._error = undefined;
    const data: HassioAddonSetOptionParams = {
@@ -882,6 +801,146 @@ class HassioAddonInfo extends LitElement {
      this._error = `Failed to uninstall addon, ${err.body?.message || err}`;
    }
  }
+
+  static get styles(): CSSResult[] {
+    return [
+      haStyle,
+      hassioStyle,
+      css`
+        :host {
+          display: block;
+        }
+        ha-card {
+          display: block;
+          margin-bottom: 16px;
+        }
+        ha-card.warning {
+          background-color: var(--error-color);
+          color: white;
+        }
+        ha-card.warning .card-header {
+          color: white;
+        }
+        ha-card.warning .card-content {
+          color: white;
+        }
+        ha-card.warning mwc-button {
+          --mdc-theme-primary: white !important;
+        }
+        .warning {
+          color: var(--error-color);
+          --mdc-theme-primary: var(--error-color);
+        }
+        .light-color {
+          color: var(--secondary-text-color);
+        }
+        .addon-header {
+          padding-left: 8px;
+          font-size: 24px;
+          color: var(--ha-card-header-color, --primary-text-color);
+        }
+        .addon-version {
+          float: right;
+          font-size: 15px;
+          vertical-align: middle;
+        }
+        .errors {
+          color: var(--error-color);
+          margin-bottom: 16px;
+        }
+        .description {
+          margin-bottom: 16px;
+        }
+        img.logo {
+          max-height: 60px;
+          margin: 16px 0;
+          display: block;
+        }
+
+        ha-switch {
+          display: flex;
+        }
+        ha-svg-icon.running {
+          color: var(--paper-green-400);
+        }
+        ha-svg-icon.stopped {
+          color: var(--google-red-300);
+        }
+        ha-call-api-button {
+          font-weight: 500;
+          color: var(--primary-color);
+        }
+        .right {
+          float: right;
+        }
+        protection-enable mwc-button {
+          --mdc-theme-primary: white;
+        }
+        .description a {
+          color: var(--primary-color);
+        }
+        .red {
+          --ha-label-badge-color: var(--label-badge-red, #df4c1e);
+        }
+        .blue {
+          --ha-label-badge-color: var(--label-badge-blue, #039be5);
+        }
+        .green {
+          --ha-label-badge-color: var(--label-badge-green, #0da035);
+        }
+        .yellow {
+          --ha-label-badge-color: var(--label-badge-yellow, #f4b400);
+        }
+        .security {
+          margin-bottom: 16px;
+        }
+        .card-actions {
+          display: flow-root;
+        }
+        .security h3 {
+          margin-bottom: 8px;
+          font-weight: normal;
+        }
+        .security ha-label-badge {
+          cursor: pointer;
+          margin-right: 4px;
+          --ha-label-badge-padding: 8px 0 0 0;
+        }
+        .changelog {
+          display: contents;
+        }
+        .changelog-link {
+          color: var(--primary-color);
+          text-decoration: underline;
+          cursor: pointer;
+        }
+        ha-markdown {
+          padding: 16px;
+        }
+        ha-settings-row {
+          padding: 0;
+          height: 54px;
+          width: 100%;
+        }
+        ha-settings-row > span[slot="description"] {
+          white-space: normal;
+          color: var(--secondary-text-color);
+        }
+        ha-settings-row[three-line] {
+          height: 74px;
+        }
+
+        .addon-options {
+          max-width: 50%;
+        }
+        @media (max-width: 720px) {
+          .addon-options {
+            max-width: 100%;
+          }
+        }
+      `,
+    ];
+  }
 }
 declare global {
  interface HTMLElementTagNameMap {
@@ -6,6 +6,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import "../../../../src/components/ha-card";
@@ -24,9 +25,9 @@ class HassioAddonLogs extends LitElement {

  @property({ attribute: false }) public addon!: HassioAddonDetails;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

-  @property() private _content?: string;
+  @internalProperty() private _content?: string;

  public async connectedCallback(): Promise<void> {
    super.connectedCallback();
@@ -14,7 +14,7 @@ import { HomeAssistant } from "../../../src/types";

@customElement("hassio-card-content")
 class HassioCardContent extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public title!: string;

@@ -19,7 +19,7 @@ import { hassioStyle } from "../resources/hassio-style";

@customElement("hassio-addons")
 class HassioAddons extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public addons?: HassioAddonInfo[];

@@ -7,9 +7,10 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
-import "../../../src/components/buttons/ha-call-api-button";
+import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-card";
 import "../../../src/components/ha-svg-icon";
 import { HassioHassOSInfo } from "../../../src/data/hassio/host";
@@ -20,18 +21,23 @@ import {
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
 import { hassioStyle } from "../resources/hassio-style";
+import {
+  showConfirmationDialog,
+  showAlertDialog,
+} from "../../../src/dialogs/generic/show-dialog-box";
+import { HassioResponse } from "../../../src/data/hassio/common";

@customElement("hassio-update")
 export class HassioUpdate extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property() public hassInfo: HassioHomeAssistantInfo;
+  @property({ attribute: false }) public hassInfo: HassioHomeAssistantInfo;

-  @property() public hassOsInfo?: HassioHassOSInfo;
+  @property({ attribute: false }) public hassOsInfo?: HassioHassOSInfo;

  @property() public supervisorInfo: HassioSupervisorInfo;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

  protected render(): TemplateResult {
    const updatesAvailable: number = [
@@ -125,31 +131,43 @@ export class HassioUpdate extends LitElement {
          <a href="${releaseNotesUrl}" target="_blank" rel="noreferrer">
            <mwc-button>Release notes</mwc-button>
          </a>
-          <ha-call-api-button
-            .hass=${this.hass}
-            .path=${apiPath}
-            @hass-api-called=${this._apiCalled}
+          <ha-progress-button
+            .apiPath=${apiPath}
+            .name=${name}
+            .version=${lastVersion}
+            @click=${this._confirmUpdate}
          >
            Update
-          </ha-call-api-button>
+          </ha-progress-button>
        </div>
      </ha-card>
    `;
  }

-  private _apiCalled(ev): void {
-    if (ev.detail.success) {
-      this._error = "";
+  private async _confirmUpdate(ev): Promise<void> {
+    const item = ev.target;
+    item.progress = true;
+    const confirmed = await showConfirmationDialog(this, {
+      title: `Update ${item.name}`,
+      text: `Are you sure you want to upgrade ${item.name} to version ${item.version}?`,
+      confirmText: "update",
+      dismissText: "cancel",
+    });
+
+    if (!confirmed) {
+      item.progress = false;
      return;
    }
-
-    const response = ev.detail.response;
-
-    if (typeof response.body === "object") {
-      this._error = response.body.message || "Unknown error";
-    } else {
-      this._error = response.body;
+    try {
+      await this.hass.callApi<HassioResponse<void>>("POST", item.apiPath);
+    } catch (err) {
+      showAlertDialog(this, {
+        title: "Update failed",
+        text:
+          typeof err === "object" ? err.body?.message || "Unkown error" : err,
+      });
    }
+    item.progress = false;
  }

  static get styles(): CSSResult[] {
@@ -5,6 +5,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import { createCloseHeading } from "../../../../src/components/ha-dialog";
@@ -16,13 +17,13 @@ import { HassioMarkdownDialogParams } from "./show-dialog-hassio-markdown";

@customElement("dialog-hassio-markdown")
 class HassioMarkdownDialog extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public title!: string;

  @property() public content!: string;

-  @property() private _opened = false;
+  @internalProperty() private _opened = false;

  public showDialog(params: HassioMarkdownDialogParams) {
    this.title = params.title;
@@ -30,6 +31,10 @@ class HassioMarkdownDialog extends LitElement {
    this._opened = true;
  }

+  public closeDialog() {
+    this._opened = false;
+  }
+
  protected render(): TemplateResult {
    if (!this._opened) {
      return html``;
@@ -37,7 +42,7 @@ class HassioMarkdownDialog extends LitElement {
    return html`
      <ha-dialog
        open
-        @closing=${this._closeDialog}
+        @closed=${this.closeDialog}
        .heading=${createCloseHeading(this.hass, this.title)}
      >
        <ha-markdown .content=${this.content || ""}></ha-markdown>
@@ -45,10 +50,6 @@ class HassioMarkdownDialog extends LitElement {
    `;
  }

-  private _closeDialog(): void {
-    this._opened = false;
-  }
-
  static get styles(): CSSResult[] {
    return [
      haStyleDialog,
@@ -0,0 +1,328 @@
+import "@material/mwc-button/mwc-button";
+import "@material/mwc-icon-button";
+import "@material/mwc-tab-bar";
+import "@material/mwc-tab";
+import { PaperInputElement } from "@polymer/paper-input/paper-input";
+import { mdiClose } from "@mdi/js";
+import {
+  css,
+  CSSResult,
+  customElement,
+  html,
+  LitElement,
+  property,
+  internalProperty,
+  TemplateResult,
+} from "lit-element";
+import { cache } from "lit-html/directives/cache";
+
+import {
+  updateNetworkInterface,
+  NetworkInterface,
+} from "../../../../src/data/hassio/network";
+import { fireEvent } from "../../../../src/common/dom/fire_event";
+import { HassioNetworkDialogParams } from "./show-dialog-network";
+import { haStyleDialog } from "../../../../src/resources/styles";
+import {
+  showAlertDialog,
+  showConfirmationDialog,
+} from "../../../../src/dialogs/generic/show-dialog-box";
+import type { HomeAssistant } from "../../../../src/types";
+import type { HaRadio } from "../../../../src/components/ha-radio";
+import { HassDialog } from "../../../../src/dialogs/make-dialog-manager";
+
+import "../../../../src/components/ha-circular-progress";
+import "../../../../src/components/ha-dialog";
+import "../../../../src/components/ha-formfield";
+import "../../../../src/components/ha-header-bar";
+import "../../../../src/components/ha-radio";
+import "../../../../src/components/ha-related-items";
+import "../../../../src/components/ha-svg-icon";
+
+@customElement("dialog-hassio-network")
+export class DialogHassioNetwork extends LitElement implements HassDialog {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @internalProperty() private _prosessing = false;
+
+  @internalProperty() private _params?: HassioNetworkDialogParams;
+
+  @internalProperty() private _network!: {
+    interface: string;
+    data: NetworkInterface;
+  }[];
+
+  @internalProperty() private _curTabIndex = 0;
+
+  @internalProperty() private _device?: {
+    interface: string;
+    data: NetworkInterface;
+  };
+
+  @internalProperty() private _dirty = false;
+
+  public async showDialog(params: HassioNetworkDialogParams): Promise<void> {
+    this._params = params;
+    this._dirty = false;
+    this._curTabIndex = 0;
+    this._network = Object.keys(params.network?.interfaces)
+      .map((device) => ({
+        interface: device,
+        data: params.network.interfaces[device],
+      }))
+      .sort((a, b) => {
+        return a.data.primary > b.data.primary ? -1 : 1;
+      });
+    this._device = this._network[this._curTabIndex];
+    this._device.data.nameservers = String(this._device.data.nameservers);
+    await this.updateComplete;
+  }
+
+  public closeDialog(): void {
+    this._params = undefined;
+    this._prosessing = false;
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
+  }
+
+  protected render(): TemplateResult {
+    if (!this._params || !this._network) {
+      return html``;
+    }
+
+    return html`
+      <ha-dialog open .heading=${true} hideActions @closed=${this.closeDialog}>
+        <div slot="heading">
+          <ha-header-bar>
+            <span slot="title">
+              Network settings
+            </span>
+            <mwc-icon-button slot="actionItems" dialogAction="cancel">
+              <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
+            </mwc-icon-button>
+          </ha-header-bar>
+          ${this._network.length > 1
+            ? html` <mwc-tab-bar
+                .activeIndex=${this._curTabIndex}
+                @MDCTabBar:activated=${this._handleTabActivated}
+                >${this._network.map(
+                  (device) =>
+                    html`<mwc-tab
+                      .id=${device.interface}
+                      .label=${device.interface}
+                    >
+                    </mwc-tab>`
+                )}
+              </mwc-tab-bar>`
+            : ""}
+        </div>
+        ${cache(this._renderTab())}
+      </ha-dialog>
+    `;
+  }
+
+  private _renderTab() {
+    return html` <div class="form container">
+        <ha-formfield label="DHCP">
+          <ha-radio
+            @change=${this._handleRadioValueChanged}
+            value="dhcp"
+            name="method"
+            ?checked=${this._device!.data.method === "dhcp"}
+          >
+          </ha-radio>
+        </ha-formfield>
+        <ha-formfield label="Static">
+          <ha-radio
+            @change=${this._handleRadioValueChanged}
+            value="static"
+            name="method"
+            ?checked=${this._device!.data.method === "static"}
+          >
+          </ha-radio>
+        </ha-formfield>
+        ${this._device!.data.method !== "dhcp"
+          ? html` <paper-input
+                class="flex-auto"
+                id="ip_address"
+                label="IP address/Netmask"
+                .value="${this._device!.data.ip_address}"
+                @value-changed=${this._handleInputValueChanged}
+              ></paper-input>
+              <paper-input
+                class="flex-auto"
+                id="gateway"
+                label="Gateway address"
+                .value="${this._device!.data.gateway}"
+                @value-changed=${this._handleInputValueChanged}
+              ></paper-input>
+              <paper-input
+                class="flex-auto"
+                id="nameservers"
+                label="DNS servers"
+                .value="${this._device!.data.nameservers as string}"
+                @value-changed=${this._handleInputValueChanged}
+              ></paper-input>
+              NB!: If you are changing IP or gateway addresses, you might lose
+              the connection.`
+          : ""}
+      </div>
+      <div class="buttons">
+        <mwc-button label="close" @click=${this.closeDialog}> </mwc-button>
+        <mwc-button @click=${this._updateNetwork} ?disabled=${!this._dirty}>
+          ${this._prosessing
+            ? html`<ha-circular-progress active></ha-circular-progress>`
+            : "Update"}
+        </mwc-button>
+      </div>`;
+  }
+
+  private async _updateNetwork() {
+    this._prosessing = true;
+    let options: Partial<NetworkInterface> = {
+      method: this._device!.data.method,
+    };
+    if (options.method !== "dhcp") {
+      options = {
+        ...options,
+        address: this._device!.data.ip_address,
+        gateway: this._device!.data.gateway,
+        dns: String(this._device!.data.nameservers).split(","),
+      };
+    }
+    try {
+      await updateNetworkInterface(this.hass, this._device!.interface, options);
+    } catch (err) {
+      showAlertDialog(this, {
+        title: "Failed to change network settings",
+        text:
+          typeof err === "object" ? err.body.message || "Unkown error" : err,
+      });
+      this._prosessing = false;
+      return;
+    }
+    this._params?.loadData();
+    this.closeDialog();
+  }
+
+  private async _handleTabActivated(ev: CustomEvent): Promise<void> {
+    if (this._dirty) {
+      const confirm = await showConfirmationDialog(this, {
+        text:
+          "You have unsaved changes, these will get lost if you change tabs, do you want to continue?",
+        confirmText: "yes",
+        dismissText: "no",
+      });
+      if (!confirm) {
+        this.requestUpdate("_device");
+        return;
+      }
+    }
+    this._curTabIndex = ev.detail.index;
+    this._device = this._network[ev.detail.index];
+    this._device.data.nameservers = String(this._device.data.nameservers);
+  }
+
+  private _handleRadioValueChanged(ev: CustomEvent): void {
+    const value = (ev.target as HaRadio).value as "dhcp" | "static";
+
+    if (!value || !this._device || this._device!.data.method === value) {
+      return;
+    }
+
+    this._dirty = true;
+
+    this._device!.data.method = value;
+    this.requestUpdate("_device");
+  }
+
+  private _handleInputValueChanged(ev: CustomEvent): void {
+    const value: string | null | undefined = (ev.target as PaperInputElement)
+      .value;
+    const id = (ev.target as PaperInputElement).id;
+
+    if (!value || !this._device || this._device.data[id] === value) {
+      return;
+    }
+
+    this._dirty = true;
+
+    this._device.data[id] = value;
+  }
+
+  static get styles(): CSSResult[] {
+    return [
+      haStyleDialog,
+      css`
+        ha-header-bar {
+          --mdc-theme-on-primary: var(--primary-text-color);
+          --mdc-theme-primary: var(--mdc-theme-surface);
+          flex-shrink: 0;
+        }
+
+        mwc-tab-bar {
+          border-bottom: 1px solid
+            var(--mdc-dialog-scroll-divider-color, rgba(0, 0, 0, 0.12));
+        }
+
+        ha-dialog {
+          --dialog-content-position: static;
+          --dialog-content-padding: 0;
+          --dialog-z-index: 6;
+        }
+
+        @media all and (min-width: 451px) and (min-height: 501px) {
+          .container {
+            width: 400px;
+          }
+        }
+
+        .content {
+          display: block;
+          padding: 20px 24px;
+        }
+
+        /* overrule the ha-style-dialog max-height on small screens */
+        @media all and (max-width: 450px), all and (max-height: 500px) {
+          ha-header-bar {
+            --mdc-theme-primary: var(--app-header-background-color);
+            --mdc-theme-on-primary: var(--app-header-text-color, white);
+          }
+        }
+
+        mwc-button.warning {
+          --mdc-theme-primary: var(--error-color);
+        }
+
+        :host([rtl]) app-toolbar {
+          direction: rtl;
+          text-align: right;
+        }
+        .container {
+          padding: 20px 24px;
+        }
+        .form {
+          margin-bottom: 53px;
+        }
+        .buttons {
+          position: absolute;
+          bottom: 0;
+          width: 100%;
+          box-sizing: border-box;
+          border-top: 1px solid
+            var(--mdc-dialog-scroll-divider-color, rgba(0, 0, 0, 0.12));
+          display: flex;
+          justify-content: space-between;
+          padding: 8px;
+          padding-bottom: max(env(safe-area-inset-bottom), 8px);
+          background-color: var(--mdc-theme-surface, #fff);
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "dialog-hassio-network": DialogHassioNetwork;
+  }
+}
@@ -0,0 +1,22 @@
+import { fireEvent } from "../../../../src/common/dom/fire_event";
+import { NetworkInfo } from "../../../../src/data/hassio/network";
+import "./dialog-hassio-network";
+
+export interface HassioNetworkDialogParams {
+  network: NetworkInfo;
+  loadData: () => Promise<void>;
+}
+
+export const showNetworkDialog = (
+  element: HTMLElement,
+  dialogParams: HassioNetworkDialogParams
+): void => {
+  fireEvent(element, "show-dialog", {
+    dialogTag: "dialog-hassio-network",
+    dialogImport: () =>
+      import(
+        /* webpackChunkName: "dialog-hassio-network" */ "./dialog-hassio-network"
+      ),
+    dialogParams,
+  });
+};
@@ -13,6 +13,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  query,
  TemplateResult,
 } from "lit-element";
@@ -39,11 +40,11 @@ class HassioRepositoriesDialog extends LitElement {

  @query("#repository_input") private _optionInput?: PaperInputElement;

-  @property() private _opened = false;
+  @internalProperty() private _opened = false;

-  @property() private _prosessing = false;
+  @internalProperty() private _prosessing = false;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

  public async showDialog(_dialogParams: any): Promise<void> {
    this._dialogParams = _dialogParams;
@@ -7,6 +7,7 @@ import {
  CSSResult,
  customElement,
  html,
+  internalProperty,
  LitElement,
  property,
  TemplateResult,
@@ -18,6 +19,7 @@ import {
  fetchHassioSnapshotInfo,
  HassioSnapshotDetail,
 } from "../../../../src/data/hassio/snapshot";
+import { showConfirmationDialog } from "../../../../src/dialogs/generic/show-dialog-box";
 import { PolymerChangedEvent } from "../../../../src/polymer-types";
 import { haStyleDialog } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
@@ -68,21 +70,21 @@ interface FolderItem {

@customElement("dialog-hassio-snapshot")
 class HassioSnapshotDialog extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

-  @property() private _snapshot?: HassioSnapshotDetail;
+  @internalProperty() private _snapshot?: HassioSnapshotDetail;

-  @property() private _folders!: FolderItem[];
+  @internalProperty() private _folders!: FolderItem[];

-  @property() private _addons!: AddonItem[];
+  @internalProperty() private _addons!: AddonItem[];

-  @property() private _dialogParams?: HassioSnapshotDialogParams;
+  @internalProperty() private _dialogParams?: HassioSnapshotDialogParams;

-  @property() private _snapshotPassword!: string;
+  @internalProperty() private _snapshotPassword!: string;

-  @property() private _restoreHass: boolean | null | undefined = true;
+  @internalProperty() private _restoreHass: boolean | null | undefined = true;

  public async showDialog(params: HassioSnapshotDialogParams) {
    this._snapshot = await fetchHassioSnapshotInfo(this.hass, params.slug);
@@ -265,8 +267,12 @@ class HassioSnapshotDialog extends LitElement {
    this._snapshotPassword = ev.detail.value;
  }

-  private _partialRestoreClicked() {
-    if (!confirm("Are you sure you want to restore this snapshot?")) {
+  private async _partialRestoreClicked() {
+    if (
+      !(await showConfirmationDialog(this, {
+        title: "Are you sure you want partially to restore this snapshot?",
+      }))
+    ) {
      return;
    }

@@ -311,8 +317,13 @@ class HassioSnapshotDialog extends LitElement {
      );
  }

-  private _fullRestoreClicked() {
-    if (!confirm("Are you sure you want to restore this snapshot?")) {
+  private async _fullRestoreClicked() {
+    if (
+      !(await showConfirmationDialog(this, {
+        title:
+          "Are you sure you want to wipe your system and restore this snapshot?",
+      }))
+    ) {
      return;
    }

@@ -337,8 +348,12 @@ class HassioSnapshotDialog extends LitElement {
      );
  }

-  private _deleteClicked() {
-    if (!confirm("Are you sure you want to delete this snapshot?")) {
+  private async _deleteClicked() {
+    if (
+      !(await showConfirmationDialog(this, {
+        title: "Are you sure you want to delete this snapshot?",
+      }))
+    ) {
      return;
    }

@@ -1,111 +1,35 @@
-import { PolymerElement } from "@polymer/polymer";
-import { customElement, property, PropertyValues } from "lit-element";
+import {
+  html,
+  PropertyValues,
+  customElement,
+  LitElement,
+  property,
+} from "lit-element";
+import "./hassio-router";
+import { urlSyncMixin } from "../../src/state/url-sync-mixin";
+import { ProvideHassLitMixin } from "../../src/mixins/provide-hass-lit-mixin";
+import { HomeAssistant, Route } from "../../src/types";
+import { HassioPanelInfo } from "../../src/data/hassio/supervisor";
 import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
 import { fireEvent } from "../../src/common/dom/fire_event";
-import { navigate } from "../../src/common/navigate";
-import { fetchHassioAddonInfo } from "../../src/data/hassio/addon";
-import {
-  fetchHassioHassOsInfo,
-  fetchHassioHostInfo,
-  HassioHassOSInfo,
-  HassioHostInfo,
-} from "../../src/data/hassio/host";
-import {
-  createHassioSession,
-  fetchHassioHomeAssistantInfo,
-  fetchHassioSupervisorInfo,
-  fetchHassioInfo,
-  HassioHomeAssistantInfo,
-  HassioInfo,
-  HassioPanelInfo,
-  HassioSupervisorInfo,
-} from "../../src/data/hassio/supervisor";
-import {
-  AlertDialogParams,
-  showAlertDialog,
-} from "../../src/dialogs/generic/show-dialog-box";
 import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
-import {
-  HassRouterPage,
-  RouterOptions,
-} from "../../src/layouts/hass-router-page";
-import { ProvideHassLitMixin } from "../../src/mixins/provide-hass-lit-mixin";
-import "../../src/resources/ha-style";
-import { HomeAssistant } from "../../src/types";
-// Don't codesplit it, that way the dashboard always loads fast.
-import "./hassio-panel";
+import { atLeastVersion } from "../../src/common/config/version";

@customElement("hassio-main")
-class HassioMain extends ProvideHassLitMixin(HassRouterPage) {
-  @property() public hass!: HomeAssistant;
+export class HassioMain extends urlSyncMixin(ProvideHassLitMixin(LitElement)) {
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public panel!: HassioPanelInfo;

  @property() public narrow!: boolean;

-  protected routerOptions: RouterOptions = {
-    // Hass.io has a page with tabs, so we route all non-matching routes to it.
-    defaultPage: "dashboard",
-    initialLoad: () => this._fetchData(),
-    showLoading: true,
-    routes: {
-      dashboard: {
-        tag: "hassio-panel",
-        cache: true,
-      },
-      snapshots: "dashboard",
-      store: "dashboard",
-      system: "dashboard",
-      addon: {
-        tag: "hassio-addon-dashboard",
-        load: () =>
-          import(
-            /* webpackChunkName: "hassio-addon-dashboard" */ "./addon-view/hassio-addon-dashboard"
-          ),
-      },
-      ingress: {
-        tag: "hassio-ingress-view",
-        load: () =>
-          import(
-            /* webpackChunkName: "hassio-ingress-view" */ "./ingress-view/hassio-ingress-view"
-          ),
-      },
-    },
-  };
-
-  @property() private _supervisorInfo: HassioSupervisorInfo;
-
-  @property() private _hostInfo: HassioHostInfo;
-
-  @property() private _hassioInfo?: HassioInfo;
-
-  @property() private _hassOsInfo?: HassioHassOSInfo;
-
-  @property() private _hassInfo: HassioHomeAssistantInfo;
+  @property() public route?: Route;

  protected firstUpdated(changedProps: PropertyValues) {
    super.firstUpdated(changedProps);

-    applyThemesOnElement(
-      this.parentElement,
-      this.hass.themes,
-      this.hass.selectedTheme || this.hass.themes.default_theme
-    );
+    this._applyTheme();

-    this.style.setProperty(
-      "--app-header-background-color",
-      "var(--sidebar-background-color)"
-    );
-    this.style.setProperty(
-      "--app-header-text-color",
-      "var(--sidebar-text-color)"
-    );
-    this.style.setProperty(
-      "--app-header-border-bottom",
-      "1px solid var(--divider-color)"
-    );
-
-    this.addEventListener("hass-api-called", (ev) => this._apiCalled(ev));
    // Paulus - March 17, 2019
    // We went to a single hass-toggle-menu event in HA 0.90. However, the
    // supervisor UI can also run under older versions of Home Assistant.
@@ -138,152 +62,61 @@ class HassioMain extends ProvideHassLitMixin(HassRouterPage) {
      });
    });

-    makeDialogManager(this, document.body);
+    makeDialogManager(this, this.shadowRoot!);
  }

-  protected updatePageEl(el) {
-    // the tabs page does its own routing so needs full route.
-    const route = el.nodeName === "HASSIO-PANEL" ? this.route : this.routeTail;
+  protected updated(changedProps: PropertyValues) {
+    super.updated(changedProps);
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+    if (!oldHass) {
+      return;
+    }
+    if (oldHass.themes !== this.hass.themes) {
+      this._applyTheme();
+    }
+  }

-    if ("setProperties" in el) {
-      // As long as we have Polymer pages
-      (el as PolymerElement).setProperties({
-        hass: this.hass,
-        narrow: this.narrow,
-        supervisorInfo: this._supervisorInfo,
-        hassioInfo: this._hassioInfo,
-        hostInfo: this._hostInfo,
-        hassInfo: this._hassInfo,
-        hassOsInfo: this._hassOsInfo,
-        route,
-      });
+  protected render() {
+    return html`
+      <hassio-router
+        .hass=${this.hass}
+        .route=${this.route}
+        .panel=${this.panel}
+        .narrow=${this.narrow}
+      ></hassio-router>
+    `;
+  }
+
+  private _applyTheme() {
+    let themeName: string;
+    let options: Partial<HomeAssistant["selectedTheme"]> | undefined;
+
+    if (atLeastVersion(this.hass.config.version, 0, 114)) {
+      themeName =
+        this.hass.selectedTheme?.theme ||
+        (this.hass.themes.darkMode && this.hass.themes.default_dark_theme
+          ? this.hass.themes.default_dark_theme!
+          : this.hass.themes.default_theme);
+
+      options = this.hass.selectedTheme;
+      if (themeName === "default" && options?.dark === undefined) {
+        options = {
+          ...this.hass.selectedTheme,
+          dark: this.hass.themes.darkMode,
+        };
+      }
    } else {
-      el.hass = this.hass;
-      el.narrow = this.narrow;
-      el.supervisorInfo = this._supervisorInfo;
-      el.hassioInfo = this._hassioInfo;
-      el.hostInfo = this._hostInfo;
-      el.hassInfo = this._hassInfo;
-      el.hassOsInfo = this._hassOsInfo;
-      el.route = route;
-    }
-  }
-
-  private async _fetchData() {
-    if (this.panel.config && this.panel.config.ingress) {
-      await this._redirectIngress(this.panel.config.ingress);
-      return;
+      themeName =
+        ((this.hass.selectedTheme as unknown) as string) ||
+        this.hass.themes.default_theme;
    }

-    const [supervisorInfo, hostInfo, hassInfo, hassioInfo] = await Promise.all([
-      fetchHassioSupervisorInfo(this.hass),
-      fetchHassioHostInfo(this.hass),
-      fetchHassioHomeAssistantInfo(this.hass),
-      fetchHassioInfo(this.hass),
-    ]);
-    this._supervisorInfo = supervisorInfo;
-    this._hassioInfo = hassioInfo;
-    this._hostInfo = hostInfo;
-    this._hassInfo = hassInfo;
-
-    if (this._hostInfo.features && this._hostInfo.features.includes("hassos")) {
-      this._hassOsInfo = await fetchHassioHassOsInfo(this.hass);
-    }
-  }
-
-  private async _redirectIngress(addonSlug: string) {
-    // When we trigger a navigation, we sleep to make sure we don't
-    // show the hassio dashboard before navigating away.
-    const awaitAlert = async (
-      alertParams: AlertDialogParams,
-      action: () => void
-    ) => {
-      await new Promise((resolve) => {
-        alertParams.confirm = resolve;
-        showAlertDialog(this, alertParams);
-      });
-      action();
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    };
-
-    const createSessionPromise = createHassioSession(this.hass).then(
-      () => true,
-      () => false
+    applyThemesOnElement(
+      this.parentElement,
+      this.hass.themes,
+      themeName,
+      options
    );
-
-    let addon;
-
-    try {
-      addon = await fetchHassioAddonInfo(this.hass, addonSlug);
-    } catch (err) {
-      await awaitAlert(
-        {
-          text: "Unable to fetch add-on info to start Ingress",
-          title: "Supervisor",
-        },
-        () => history.back()
-      );
-
-      return;
-    }
-
-    if (!addon.ingress_url) {
-      await awaitAlert(
-        {
-          text: "Add-on does not support Ingress",
-          title: addon.name,
-        },
-        () => history.back()
-      );
-
-      return;
-    }
-
-    if (addon.state !== "started") {
-      await awaitAlert(
-        {
-          text: "Add-on is not running. Please start it first",
-          title: addon.name,
-        },
-        () => navigate(this, `/hassio/addon/${addon.slug}/info`, true)
-      );
-
-      return;
-    }
-
-    if (!(await createSessionPromise)) {
-      await awaitAlert(
-        {
-          text: "Unable to create an Ingress session",
-          title: addon.name,
-        },
-        () => history.back()
-      );
-
-      return;
-    }
-
-    location.assign(addon.ingress_url);
-    // await a promise that doesn't resolve, so we show the loading screen
-    // while we load the next page.
-    await new Promise(() => undefined);
-  }
-
-  private _apiCalled(ev) {
-    if (!ev.detail.success) {
-      return;
-    }
-
-    let tries = 1;
-
-    const tryUpdate = () => {
-      this._fetchData().catch(() => {
-        tries += 1;
-        setTimeout(tryUpdate, Math.min(tries, 5) * 1000);
-      });
-    };
-
-    tryUpdate();
  }
 }

@@ -4,6 +4,8 @@ import {
  LitElement,
  property,
  TemplateResult,
+  css,
+  CSSResult,
 } from "lit-element";
 import { HassioHassOSInfo, HassioHostInfo } from "../../src/data/hassio/host";
 import {
@@ -33,6 +35,9 @@ class HassioPanel extends LitElement {
  @property({ attribute: false }) public hassOsInfo!: HassioHassOSInfo;

  protected render(): TemplateResult {
+    if (!this.supervisorInfo) {
+      return html``;
+    }
    return html`
      <hassio-panel-router
        .route=${this.route}
@@ -46,6 +51,16 @@ class HassioPanel extends LitElement {
      ></hassio-panel-router>
    `;
  }
+
+  static get styles(): CSSResult {
+    return css`
+      :host {
+        --app-header-background-color: var(--sidebar-background-color);
+        --app-header-text-color: var(--sidebar-text-color);
+        --app-header-border-bottom: 1px solid var(--divider-color);
+      }
+    `;
+  }
 }

 declare global {
@@ -0,0 +1,150 @@
+import {
+  customElement,
+  property,
+  internalProperty,
+  PropertyValues,
+} from "lit-element";
+import {
+  fetchHassioHassOsInfo,
+  fetchHassioHostInfo,
+  HassioHassOSInfo,
+  HassioHostInfo,
+} from "../../src/data/hassio/host";
+import {
+  fetchHassioHomeAssistantInfo,
+  fetchHassioSupervisorInfo,
+  fetchHassioInfo,
+  HassioHomeAssistantInfo,
+  HassioInfo,
+  HassioPanelInfo,
+  HassioSupervisorInfo,
+} from "../../src/data/hassio/supervisor";
+import {
+  HassRouterPage,
+  RouterOptions,
+} from "../../src/layouts/hass-router-page";
+import "../../src/resources/ha-style";
+import { HomeAssistant } from "../../src/types";
+// Don't codesplit it, that way the dashboard always loads fast.
+import "./hassio-panel";
+
+@customElement("hassio-router")
+class HassioRouter extends HassRouterPage {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property() public panel!: HassioPanelInfo;
+
+  @property() public narrow!: boolean;
+
+  protected routerOptions: RouterOptions = {
+    // Hass.io has a page with tabs, so we route all non-matching routes to it.
+    defaultPage: "dashboard",
+    initialLoad: () => this._fetchData(),
+    showLoading: true,
+    routes: {
+      dashboard: {
+        tag: "hassio-panel",
+        cache: true,
+      },
+      snapshots: "dashboard",
+      store: "dashboard",
+      system: "dashboard",
+      addon: {
+        tag: "hassio-addon-dashboard",
+        load: () =>
+          import(
+            /* webpackChunkName: "hassio-addon-dashboard" */ "./addon-view/hassio-addon-dashboard"
+          ),
+      },
+      ingress: {
+        tag: "hassio-ingress-view",
+        load: () =>
+          import(
+            /* webpackChunkName: "hassio-ingress-view" */ "./ingress-view/hassio-ingress-view"
+          ),
+      },
+    },
+  };
+
+  @internalProperty() private _supervisorInfo: HassioSupervisorInfo;
+
+  @internalProperty() private _hostInfo: HassioHostInfo;
+
+  @internalProperty() private _hassioInfo?: HassioInfo;
+
+  @internalProperty() private _hassOsInfo?: HassioHassOSInfo;
+
+  @internalProperty() private _hassInfo: HassioHomeAssistantInfo;
+
+  protected firstUpdated(changedProps: PropertyValues) {
+    super.firstUpdated(changedProps);
+    this.addEventListener("hass-api-called", (ev) => this._apiCalled(ev));
+  }
+
+  protected updatePageEl(el) {
+    // the tabs page does its own routing so needs full route.
+    const route = el.nodeName === "HASSIO-PANEL" ? this.route : this.routeTail;
+
+    el.hass = this.hass;
+    el.narrow = this.narrow;
+    el.supervisorInfo = this._supervisorInfo;
+    el.hassioInfo = this._hassioInfo;
+    el.hostInfo = this._hostInfo;
+    el.hassInfo = this._hassInfo;
+    el.hassOsInfo = this._hassOsInfo;
+    el.route = route;
+
+    if (el.localName === "hassio-ingress-view") {
+      el.ingressPanel = this.panel.config && this.panel.config.ingress;
+    }
+  }
+
+  private async _fetchData() {
+    if (this.panel.config && this.panel.config.ingress) {
+      this._redirectIngress(this.panel.config.ingress);
+      return;
+    }
+
+    const [supervisorInfo, hostInfo, hassInfo, hassioInfo] = await Promise.all([
+      fetchHassioSupervisorInfo(this.hass),
+      fetchHassioHostInfo(this.hass),
+      fetchHassioHomeAssistantInfo(this.hass),
+      fetchHassioInfo(this.hass),
+    ]);
+    this._supervisorInfo = supervisorInfo;
+    this._hassioInfo = hassioInfo;
+    this._hostInfo = hostInfo;
+    this._hassInfo = hassInfo;
+
+    if (this._hostInfo.features && this._hostInfo.features.includes("hassos")) {
+      this._hassOsInfo = await fetchHassioHassOsInfo(this.hass);
+    }
+  }
+
+  private _redirectIngress(addonSlug: string) {
+    this.route = { prefix: "/hassio", path: `/ingress/${addonSlug}` };
+  }
+
+  private _apiCalled(ev) {
+    if (!ev.detail.success) {
+      return;
+    }
+
+    let tries = 1;
+
+    const tryUpdate = () => {
+      this._fetchData().catch(() => {
+        tries += 1;
+        setTimeout(tryUpdate, Math.min(tries, 5) * 1000);
+      });
+    };
+
+    tryUpdate();
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "hassio-router": HassioRouter;
+  }
+}
@@ -5,6 +5,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -16,29 +17,56 @@ import { createHassioSession } from "../../../src/data/hassio/supervisor";
 import "../../../src/layouts/hass-loading-screen";
 import "../../../src/layouts/hass-subpage";
 import { HomeAssistant, Route } from "../../../src/types";
+import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
+import { navigate } from "../../../src/common/navigate";
+import { mdiMenu } from "@mdi/js";
+import { fireEvent } from "../../../src/common/dom/fire_event";

@customElement("hassio-ingress-view")
 class HassioIngressView extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public route!: Route;

-  @property() private _addon?: HassioAddonDetails;
+  @property() public ingressPanel = false;
+
+  @internalProperty() private _addon?: HassioAddonDetails;
+
+  @property({ type: Boolean })
+  public narrow = false;

  protected render(): TemplateResult {
    if (!this._addon) {
      return html` <hass-loading-screen></hass-loading-screen> `;
    }

-    return html`
-      <hass-subpage .header=${this._addon.name} hassio>
-        <iframe src=${this._addon.ingress_url}></iframe>
-      </hass-subpage>
-    `;
+    const iframe = html`<iframe src=${this._addon.ingress_url!}></iframe>`;
+
+    if (!this.ingressPanel) {
+      return html`<hass-subpage
+        .header=${this._addon.name}
+        .narrow=${this.narrow}
+      >
+        ${iframe}
+      </hass-subpage>`;
+    }
+
+    return html`${this.narrow || this.hass.dockedSidebar === "always_hidden"
+      ? html`<div class="header">
+            <mwc-icon-button
+              aria-label=${this.hass.localize("ui.sidebar.sidebar_toggle")}
+              @click=${this._toggleMenu}
+            >
+              <ha-svg-icon path=${mdiMenu}></ha-svg-icon>
+            </mwc-icon-button>
+            <div class="main-title">${this._addon.name}</div>
+          </div>
+          ${iframe}`
+      : iframe}`;
  }

  protected updated(changedProps: PropertyValues) {
-    super.firstUpdated(changedProps);
+    super.updated(changedProps);

    if (!changedProps.has("route")) {
      return;
@@ -55,27 +83,56 @@ class HassioIngressView extends LitElement {
  }

  private async _fetchData(addonSlug: string) {
+    const createSessionPromise = createHassioSession(this.hass).then(
+      () => true,
+      () => false
+    );
+
+    let addon;
+
    try {
-      const [addon] = await Promise.all([
-        fetchHassioAddonInfo(this.hass, addonSlug).catch(() => {
-          throw new Error("Failed to fetch add-on info");
-        }),
-        createHassioSession(this.hass).catch(() => {
-          throw new Error("Failed to create an ingress session");
-        }),
-      ]);
-
-      if (!addon.ingress) {
-        throw new Error("This add-on does not support ingress");
-      }
-
-      this._addon = addon;
+      addon = await fetchHassioAddonInfo(this.hass, addonSlug);
    } catch (err) {
-      // eslint-disable-next-line
-      console.error(err);
-      alert(err.message || "Unknown error starting ingress.");
+      await showAlertDialog(this, {
+        text: "Unable to fetch add-on info to start Ingress",
+        title: "Supervisor",
+      });
      history.back();
+      return;
    }
+
+    if (!addon.ingress_url) {
+      await showAlertDialog(this, {
+        text: "Add-on does not support Ingress",
+        title: addon.name,
+      });
+      history.back();
+      return;
+    }
+
+    if (addon.state !== "started") {
+      await showAlertDialog(this, {
+        text: "Add-on is not running. Please start it first",
+        title: addon.name,
+      });
+      navigate(this, `/hassio/addon/${addon.slug}/info`, true);
+      return;
+    }
+
+    if (!(await createSessionPromise)) {
+      await showAlertDialog(this, {
+        text: "Unable to create an Ingress session",
+        title: addon.name,
+      });
+      history.back();
+      return;
+    }
+
+    this._addon = addon;
+  }
+
+  private _toggleMenu(): void {
+    fireEvent(this, "hass-toggle-menu");
  }

  static get styles(): CSSResult {
@@ -86,6 +143,41 @@ class HassioIngressView extends LitElement {
        height: 100%;
        border: 0;
      }
+
+      .header + iframe {
+        height: calc(100% - 40px);
+      }
+
+      .header {
+        display: flex;
+        align-items: center;
+        font-size: 16px;
+        height: 40px;
+        padding: 0 16px;
+        pointer-events: none;
+        background-color: var(--app-header-background-color);
+        font-weight: 400;
+        color: var(--app-header-text-color, white);
+        border-bottom: var(--app-header-border-bottom, none);
+        box-sizing: border-box;
+        --mdc-icon-size: 20px;
+      }
+
+      .main-title {
+        margin: 0 0 0 24px;
+        line-height: 20px;
+        flex-grow: 1;
+      }
+
+      mwc-icon-button {
+        pointer-events: auto;
+      }
+
+      hass-subpage {
+        --app-header-background-color: var(--sidebar-background-color);
+        --app-header-text-color: var(--sidebar-text-color);
+        --app-header-border-bottom: 1px solid var(--divider-color);
+      }
    `;
  }
 }
@@ -15,6 +15,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -56,19 +57,19 @@ class HassioSnapshots extends LitElement {

  @property({ attribute: false }) public supervisorInfo!: HassioSupervisorInfo;

-  @property() private _snapshotName = "";
+  @internalProperty() private _snapshotName = "";

-  @property() private _snapshotPassword = "";
+  @internalProperty() private _snapshotPassword = "";

-  @property() private _snapshotHasPassword = false;
+  @internalProperty() private _snapshotHasPassword = false;

-  @property() private _snapshotType: HassioSnapshot["type"] = "full";
+  @internalProperty() private _snapshotType: HassioSnapshot["type"] = "full";

-  @property() private _snapshots?: HassioSnapshot[] = [];
+  @internalProperty() private _snapshots?: HassioSnapshot[] = [];

-  @property() private _addonList: CheckboxItem[] = [];
+  @internalProperty() private _addonList: CheckboxItem[] = [];

-  @property() private _folderList: CheckboxItem[] = [
+  @internalProperty() private _folderList: CheckboxItem[] = [
    {
      slug: "homeassistant",
      name: "Home Assistant configuration",
@@ -79,9 +80,9 @@ class HassioSnapshots extends LitElement {
    { slug: "addons/local", name: "Local add-ons", checked: true },
  ];

-  @property() private _creatingSnapshot = false;
+  @internalProperty() private _creatingSnapshot = false;

-  @property() private _error = "";
+  @internalProperty() private _error = "";

  public async refreshData() {
    await reloadHassioSnapshots(this.hass);
@@ -1,17 +1,23 @@
 import "@material/mwc-button";
+import "@material/mwc-list/mwc-list-item";
+import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
+import { mdiDotsVertical } from "@mdi/js";
+import { safeDump } from "js-yaml";
+import memoizeOne from "memoize-one";
 import {
  css,
  CSSResult,
  customElement,
  html,
+  internalProperty,
  LitElement,
  property,
  TemplateResult,
 } from "lit-element";
-import "../../../src/components/buttons/ha-call-api-button";
-import { fetchHassioHardwareInfo } from "../../../src/data/hassio/hardware";
+
 import {
  changeHostOptions,
+  configSyncOS,
  fetchHassioHostInfo,
  HassioHassOSInfo,
  HassioHostInfo as HassioHostInfoType,
@@ -19,107 +25,161 @@ import {
  shutdownHost,
  updateOS,
 } from "../../../src/data/hassio/host";
+import { fetchHassioHardwareInfo } from "../../../src/data/hassio/hardware";
+import {
+  fetchNetworkInfo,
+  NetworkInfo,
+} from "../../../src/data/hassio/network";
 import { HassioInfo } from "../../../src/data/hassio/supervisor";
+import { hassioStyle } from "../resources/hassio-style";
+import { haStyle } from "../../../src/resources/styles";
+import { HomeAssistant } from "../../../src/types";
 import {
  showAlertDialog,
  showConfirmationDialog,
  showPromptDialog,
 } from "../../../src/dialogs/generic/show-dialog-box";
-import { haStyle } from "../../../src/resources/styles";
-import { HomeAssistant } from "../../../src/types";
 import { showHassioMarkdownDialog } from "../dialogs/markdown/show-dialog-hassio-markdown";
-import { hassioStyle } from "../resources/hassio-style";
+import { showNetworkDialog } from "../dialogs/network/show-dialog-network";
+
+import "../../../src/components/ha-button-menu";
+import "../../../src/components/ha-card";
+import "../../../src/components/ha-settings-row";

@customElement("hassio-host-info")
 class HassioHostInfo extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public hostInfo!: HassioHostInfoType;

  @property({ attribute: false }) public hassioInfo!: HassioInfo;

-  @property() public hassOsInfo!: HassioHassOSInfo;
+  @property({ attribute: false }) public hassOsInfo!: HassioHassOSInfo;

-  @property() private _errors?: string;
+  @internalProperty() public _networkInfo?: NetworkInfo;

  public render(): TemplateResult | void {
+    const primaryIpAddress = this.hostInfo.features.includes("network")
+      ? this._primaryIpAddress(this._networkInfo!)
+      : "";
    return html`
-      <ha-card>
+      <ha-card header="Host System">
        <div class="card-content">
-          <h2>Host system</h2>
-          <table class="info">
-            <tbody>
-              <tr>
-                <td>Hostname</td>
-                <td>${this.hostInfo.hostname}</td>
-              </tr>
-              <tr>
-                <td>System</td>
-                <td>${this.hostInfo.operating_system}</td>
-              </tr>
-              ${!this.hostInfo.features.includes("hassos")
-                ? html`<tr>
-                    <td>Docker version</td>
-                    <td>${this.hassioInfo.docker}</td>
-                  </tr>`
-                : ""}
-              ${this.hostInfo.deployment
-                ? html`
-                    <tr>
-                      <td>Deployment</td>
-                      <td>${this.hostInfo.deployment}</td>
-                    </tr>
-                  `
-                : ""}
-            </tbody>
-          </table>
-          <mwc-button raised @click=${this._showHardware} class="info">
-            Hardware
-          </mwc-button>
          ${this.hostInfo.features.includes("hostname")
-            ? html`
+            ? html`<ha-settings-row>
+                <span slot="heading">
+                  Hostname
+                </span>
+                <span slot="description">
+                  ${this.hostInfo.hostname}
+                </span>
                <mwc-button
-                  raised
+                  title="Change the hostname"
+                  label="Change"
                  @click=${this._changeHostnameClicked}
-                  class="info"
                >
-                  Change hostname
                </mwc-button>
-              `
+              </ha-settings-row>`
            : ""}
-          ${this._errors
-            ? html` <div class="errors">Error: ${this._errors}</div> `
+          ${this.hostInfo.features.includes("network")
+            ? html` <ha-settings-row>
+                <span slot="heading">
+                  IP address
+                </span>
+                <span slot="description">
+                  ${primaryIpAddress}
+                </span>
+                <mwc-button
+                  title="Change the network"
+                  label="Change"
+                  @click=${this._changeNetworkClicked}
+                >
+                </mwc-button>
+              </ha-settings-row>`
+            : ""}
+
+          <ha-settings-row>
+            <span slot="heading">
+              Operating system
+            </span>
+            <span slot="description">
+              ${this.hostInfo.operating_system}
+            </span>
+            ${this.hostInfo.version !== this.hostInfo.version_latest &&
+            this.hostInfo.features.includes("hassos")
+              ? html`
+                  <mwc-button
+                    title="Update the host OS"
+                    label="Update"
+                    @click=${this._osUpdate}
+                  >
+                  </mwc-button>
+                `
+              : ""}
+          </ha-settings-row>
+          ${!this.hostInfo.features.includes("hassos")
+            ? html`<ha-settings-row>
+                <span slot="heading">
+                  Docker version
+                </span>
+                <span slot="description">
+                  ${this.hassioInfo.docker}
+                </span>
+              </ha-settings-row>`
+            : ""}
+          ${this.hostInfo.deployment
+            ? html`<ha-settings-row>
+                <span slot="heading">
+                  Deployment
+                </span>
+                <span slot="description">
+                  ${this.hostInfo.deployment}
+                </span>
+              </ha-settings-row>`
            : ""}
        </div>
        <div class="card-actions">
          ${this.hostInfo.features.includes("reboot")
            ? html`
-                <mwc-button class="warning" @click=${this._rebootHost}
-                  >Reboot</mwc-button
+                <mwc-button
+                  title="Reboot the host OS"
+                  label="Reboot"
+                  class="warning"
+                  @click=${this._hostReboot}
                >
+                </mwc-button>
              `
            : ""}
          ${this.hostInfo.features.includes("shutdown")
            ? html`
-                <mwc-button class="warning" @click=${this._shutdownHost}
-                  >Shutdown</mwc-button
-                >
-              `
-            : ""}
-          ${this.hostInfo.features.includes("hassos")
-            ? html`
-                <ha-call-api-button
+                <mwc-button
+                  title="Shutdown the host OS"
+                  label="Shutdown"
                  class="warning"
-                  .hass=${this.hass}
-                  path="hassio/os/config/sync"
-                  title="Load HassOS configs or updates from USB"
-                  >Import from USB</ha-call-api-button
+                  @click=${this._hostShutdown}
                >
+                </mwc-button>
              `
            : ""}
-          ${this.hostInfo.version !== this.hostInfo.version_latest
-            ? html` <mwc-button @click=${this._updateOS}>Update</mwc-button> `
-            : ""}
+
+          <ha-button-menu
+            corner="BOTTOM_START"
+            @action=${this._handleMenuAction}
+          >
+            <mwc-icon-button slot="trigger">
+              <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
+            </mwc-icon-button>
+            <mwc-list-item title="Show a list of hardware">
+              Hardware
+            </mwc-list-item>
+            ${this.hostInfo.features.includes("hassos")
+              ? html`<mwc-list-item
+                  title="Load HassOS configs or updates from USB"
+                >
+                  Import from USB
+                </mwc-list-item>`
+              : ""}
+          </ha-button-menu>
        </div>
      </ha-card>
    `;
@@ -132,72 +192,96 @@ class HassioHostInfo extends LitElement {
      css`
        ha-card {
          height: 100%;
+          justify-content: space-between;
+          flex-direction: column;
+          display: flex;
+        }
+        .card-actions {
+          height: 48px;
+          border-top: none;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        }
+        ha-settings-row {
+          padding: 0;
+          height: 54px;
          width: 100%;
        }
-        .card-content {
-          color: var(--primary-text-color);
-          box-sizing: border-box;
-          height: calc(100% - 47px);
+        ha-settings-row[three-line] {
+          height: 74px;
        }
-        .info {
-          width: 100%;
-        }
-        .info td:nth-child(2) {
-          text-align: right;
-        }
-        .errors {
-          color: var(--error-color);
-          margin-top: 16px;
-        }
-        mwc-button.info {
-          max-width: calc(50% - 12px);
-        }
-        table.info {
-          margin-bottom: 10px;
+        ha-settings-row > span[slot="description"] {
+          white-space: normal;
+          color: var(--secondary-text-color);
        }
+
        .warning {
          --mdc-theme-primary: var(--error-color);
        }
+
+        ha-button-menu {
+          color: var(--secondary-text-color);
+          --mdc-menu-min-width: 200px;
+        }
+        @media (min-width: 563px) {
+          paper-listbox {
+            max-height: 150px;
+            overflow: auto;
+          }
+        }
+        paper-item {
+          cursor: pointer;
+          min-height: 35px;
+        }
+        mwc-list-item ha-svg-icon {
+          color: var(--secondary-text-color);
+        }
      `,
    ];
  }

  protected firstUpdated(): void {
-    this.addEventListener("hass-api-called", (ev) => this._apiCalled(ev));
+    this._loadData();
  }

-  private _apiCalled(ev): void {
-    if (ev.detail.success) {
-      this._errors = undefined;
-      return;
+  private _primaryIpAddress = memoizeOne((network_info: NetworkInfo) => {
+    if (!network_info) {
+      return "";
    }
+    return Object.keys(network_info?.interfaces)
+      .map((device) => network_info.interfaces[device])
+      .find((device) => device.primary)?.ip_address;
+  });

-    const response = ev.detail.response;
-
-    this._errors =
-      typeof response.body === "object"
-        ? response.body.message || "Unknown error"
-        : response.body;
+  private async _handleMenuAction(ev: CustomEvent<ActionDetail>) {
+    switch (ev.detail.index) {
+      case 0:
+        await this._showHardware();
+        break;
+      case 1:
+        await this._importFromUSB();
+        break;
+    }
  }

  private async _showHardware(): Promise<void> {
    try {
-      const content = this._objectToMarkdown(
-        await fetchHassioHardwareInfo(this.hass)
-      );
+      const content = await fetchHassioHardwareInfo(this.hass);
      showHassioMarkdownDialog(this, {
        title: "Hardware",
-        content,
+        content: `<pre>${safeDump(content, { indent: 2 })}</pre>`,
      });
    } catch (err) {
-      showHassioMarkdownDialog(this, {
-        title: "Hardware",
-        content: "Error getting hardware info",
+      showAlertDialog(this, {
+        title: "Failed to get Hardware list",
+        text:
+          typeof err === "object" ? err.body?.message || "Unkown error" : err,
      });
    }
  }

-  private async _rebootHost(): Promise<void> {
+  private async _hostReboot(): Promise<void> {
    const confirmed = await showConfirmationDialog(this, {
      title: "Reboot",
      text: "Are you sure you want to reboot the host?",
@@ -214,12 +298,13 @@ class HassioHostInfo extends LitElement {
    } catch (err) {
      showAlertDialog(this, {
        title: "Failed to reboot",
-        text: err.body.message,
+        text:
+          typeof err === "object" ? err.body?.message || "Unkown error" : err,
      });
    }
  }

-  private async _shutdownHost(): Promise<void> {
+  private async _hostShutdown(): Promise<void> {
    const confirmed = await showConfirmationDialog(this, {
      title: "Shutdown",
      text: "Are you sure you want to shutdown the host?",
@@ -236,12 +321,13 @@ class HassioHostInfo extends LitElement {
    } catch (err) {
      showAlertDialog(this, {
        title: "Failed to shutdown",
-        text: err.body.message,
+        text:
+          typeof err === "object" ? err.body?.message || "Unkown error" : err,
      });
    }
  }

-  private async _updateOS(): Promise<void> {
+  private async _osUpdate(): Promise<void> {
    const confirmed = await showConfirmationDialog(this, {
      title: "Update",
      text: "Are you sure you want to update the OS?",
@@ -258,30 +344,17 @@ class HassioHostInfo extends LitElement {
    } catch (err) {
      showAlertDialog(this, {
        title: "Failed to update",
-        text: err.body.message,
+        text:
+          typeof err === "object" ? err.body?.message || "Unkown error" : err,
      });
    }
  }

-  private _objectToMarkdown(obj, indent = ""): string {
-    let data = "";
-    Object.keys(obj).forEach((key) => {
-      if (typeof obj[key] !== "object") {
-        data += `${indent}- ${key}: ${obj[key]}\n`;
-      } else {
-        data += `${indent}- ${key}:\n`;
-        if (Array.isArray(obj[key])) {
-          if (obj[key].length) {
-            data +=
-              `${indent}    - ` + obj[key].join(`\n${indent}    - `) + "\n";
-          }
-        } else {
-          data += this._objectToMarkdown(obj[key], `    ${indent}`);
-        }
-      }
+  private async _changeNetworkClicked(): Promise<void> {
+    showNetworkDialog(this, {
+      network: this._networkInfo!,
+      loadData: () => this._loadData(),
    });
-
-    return data;
  }

  private async _changeHostnameClicked(): Promise<void> {
@@ -300,11 +373,29 @@ class HassioHostInfo extends LitElement {
      } catch (err) {
        showAlertDialog(this, {
          title: "Setting hostname failed",
-          text: err.body.message,
+          text:
+            typeof err === "object" ? err.body?.message || "Unkown error" : err,
        });
      }
    }
  }
+
+  private async _importFromUSB(): Promise<void> {
+    try {
+      await configSyncOS(this.hass);
+      this.hostInfo = await fetchHassioHostInfo(this.hass);
+    } catch (err) {
+      showAlertDialog(this, {
+        title: "Failed to import from USB",
+        text:
+          typeof err === "object" ? err.body?.message || "Unkown error" : err,
+      });
+    }
+  }
+
+  private async _loadData(): Promise<void> {
+    this._networkInfo = await fetchNetworkInfo(this.hass);
+  }
 }

 declare global {
@@ -8,89 +8,137 @@ import {
  property,
  TemplateResult,
 } from "lit-element";
-import { fireEvent } from "../../../src/common/dom/fire_event";
-import "../../../src/components/buttons/ha-call-api-button";
-import "../../../src/components/ha-card";
-import {
-  HassioSupervisorInfo as HassioSupervisorInfoType,
-  setSupervisorOption,
-  SupervisorOptions,
-} from "../../../src/data/hassio/supervisor";
-import { showConfirmationDialog } from "../../../src/dialogs/generic/show-dialog-box";
+
+import { HassioHostInfo as HassioHostInfoType } from "../../../src/data/hassio/host";
+import { hassioStyle } from "../resources/hassio-style";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
-import { hassioStyle } from "../resources/hassio-style";
+import {
+  HassioSupervisorInfo as HassioSupervisorInfoType,
+  reloadSupervisor,
+  setSupervisorOption,
+  SupervisorOptions,
+  updateSupervisor,
+} from "../../../src/data/hassio/supervisor";
+import {
+  showAlertDialog,
+  showConfirmationDialog,
+} from "../../../src/dialogs/generic/show-dialog-box";
+
+import "../../../src/components/ha-card";
+import "../../../src/components/ha-settings-row";
+import "../../../src/components/ha-switch";

@customElement("hassio-supervisor-info")
 class HassioSupervisorInfo extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public supervisorInfo!: HassioSupervisorInfoType;

-  @property() private _errors?: string;
+  @property() public hostInfo!: HassioHostInfoType;

  public render(): TemplateResult | void {
    return html`
-      <ha-card>
+      <ha-card header="Supervisor">
        <div class="card-content">
-          <h2>Supervisor</h2>
-          <table class="info">
-            <tbody>
-              <tr>
-                <td>Version</td>
-                <td>${this.supervisorInfo.version}</td>
-              </tr>
-              <tr>
-                <td>Latest version</td>
-                <td>${this.supervisorInfo.version_latest}</td>
-              </tr>
-              ${this.supervisorInfo.channel !== "stable"
-                ? html`
-                    <tr>
-                      <td>Channel</td>
-                      <td>${this.supervisorInfo.channel}</td>
-                    </tr>
-                  `
-                : ""}
-            </tbody>
-          </table>
-          ${this._errors
-            ? html` <div class="errors">Error: ${this._errors}</div> `
-            : ""}
+          <ha-settings-row>
+            <span slot="heading">
+              Version
+            </span>
+            <span slot="description">
+              ${this.supervisorInfo.version}
+            </span>
+          </ha-settings-row>
+          <ha-settings-row>
+            <span slot="heading">
+              Newest version
+            </span>
+            <span slot="description">
+              ${this.supervisorInfo.version_latest}
+            </span>
+            ${this.supervisorInfo.version !== this.supervisorInfo.version_latest
+              ? html`
+                  <mwc-button
+                    title="Update the supervisor"
+                    label="Update"
+                    @click=${this._supervisorUpdate}
+                  >
+                  </mwc-button>
+                `
+              : ""}
+          </ha-settings-row>
+          <ha-settings-row>
+            <span slot="heading">
+              Channel
+            </span>
+            <span slot="description">
+              ${this.supervisorInfo.channel}
+            </span>
+            ${this.supervisorInfo.channel === "beta"
+              ? html`
+                  <mwc-button
+                    @click=${this._toggleBeta}
+                    label="Leave beta channel"
+                    title="Get stable updates for Home Assistant, supervisor and host"
+                  >
+                  </mwc-button>
+                `
+              : this.supervisorInfo.channel === "stable"
+              ? html`
+                  <mwc-button
+                    @click=${this._toggleBeta}
+                    label="Join beta channel"
+                    title="Get beta updates for Home Assistant (RCs), supervisor and host"
+                  >
+                  </mwc-button>
+                `
+              : ""}
+          </ha-settings-row>
+
+          ${this.supervisorInfo?.supported
+            ? html` <ha-settings-row three-line>
+                <span slot="heading">
+                  Share diagnostics
+                </span>
+                <div slot="description" class="diagnostics-description">
+                  Share crash reports and diagnostic information.
+                  <button
+                    class="link"
+                    title="Show more information about this"
+                    @click=${this._diagnosticsInformationDialog}
+                  >
+                    Learn more
+                  </button>
+                </div>
+                <ha-switch
+                  haptic
+                  .checked=${this.supervisorInfo.diagnostics}
+                  @change=${this._toggleDiagnostics}
+                ></ha-switch>
+              </ha-settings-row>`
+            : html`<div class="error">
+                You are running an unsupported installation.
+                <a
+                  href="https://github.com/home-assistant/architecture/blob/master/adr/${this.hostInfo.features.includes(
+                    "hassos"
+                  )
+                    ? "0015-home-assistant-os.md"
+                    : "0014-home-assistant-supervised.md"}"
+                  target="_blank"
+                  rel="noreferrer"
+                  title="Learn more about how you can make your system compliant"
+                >
+                  Learn More
+                </a>
+              </div>`}
        </div>
        <div class="card-actions">
-          <ha-call-api-button .hass=${this.hass} path="hassio/supervisor/reload"
-            >Reload</ha-call-api-button
+          <mwc-button
+            @click=${this._supervisorReload}
+            title="Reload parts of the supervisor."
+            label="Reload"
          >
-          ${this.supervisorInfo.version !== this.supervisorInfo.version_latest
-            ? html`
-                <ha-call-api-button
-                  .hass=${this.hass}
-                  path="hassio/supervisor/update"
-                  >Update</ha-call-api-button
-                >
-              `
-            : ""}
-          ${this.supervisorInfo.channel === "beta"
-            ? html`
-                <ha-call-api-button
-                  .hass=${this.hass}
-                  path="hassio/supervisor/options"
-                  .data=${{ channel: "stable" }}
-                  >Leave beta channel</ha-call-api-button
-                >
-              `
-            : ""}
-          ${this.supervisorInfo.channel === "stable"
-            ? html`
-                <mwc-button
-                  @click=${this._joinBeta}
-                  class="warning"
-                  title="Get beta updates for Home Assistant (RCs), supervisor and host"
-                  >Join beta channel</mwc-button
-                >
-              `
-            : ""}
+          </mwc-button>
        </div>
      </ha-card>
    `;
@@ -103,81 +151,129 @@ class HassioSupervisorInfo extends LitElement {
      css`
        ha-card {
          height: 100%;
+          justify-content: space-between;
+          flex-direction: column;
+          display: flex;
+        }
+        .card-actions {
+          height: 48px;
+          border-top: none;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        }
+        button.link {
+          color: var(--primary-color);
+        }
+        ha-settings-row {
+          padding: 0;
+          height: 54px;
          width: 100%;
        }
-        .card-content {
-          color: var(--primary-text-color);
-          box-sizing: border-box;
-          height: calc(100% - 47px);
+        ha-settings-row[three-line] {
+          height: 74px;
        }
-        .info {
-          width: 100%;
-        }
-        .info td:nth-child(2) {
-          text-align: right;
-        }
-        .errors {
-          color: var(--error-color);
-          margin-top: 16px;
+        ha-settings-row > span[slot="description"] {
+          white-space: normal;
+          color: var(--secondary-text-color);
        }
      `,
    ];
  }

-  protected firstUpdated(): void {
-    this.addEventListener("hass-api-called", (ev) => this._apiCalled(ev));
-  }
+  private async _toggleBeta(): Promise<void> {
+    if (this.supervisorInfo.channel === "stable") {
+      const confirmed = await showConfirmationDialog(this, {
+        title: "WARNING",
+        text: html` Beta releases are for testers and early adopters and can
+          contain unstable code changes.
+          <br />
+          <b>
+            Make sure you have backups of your data before you activate this
+            feature.
+          </b>
+          <br /><br />
+          This includes beta releases for:
+          <li>Home Assistant Core</li>
+          <li>Home Assistant Supervisor</li>
+          <li>Home Assistant Operating System</li>
+          <br />
+          Do you want to join the beta channel?`,
+        confirmText: "join beta",
+        dismissText: "no",
+      });

-  private _apiCalled(ev): void {
-    if (ev.detail.success) {
-      this._errors = undefined;
-      return;
-    }
-
-    const response = ev.detail.response;
-
-    this._errors =
-      typeof response.body === "object"
-        ? response.body.message || "Unknown error"
-        : response.body;
-  }
-
-  private async _joinBeta() {
-    const confirmed = await showConfirmationDialog(this, {
-      title: "WARNING",
-      text: html` Beta releases are for testers and early adopters and can
-        contain unstable code changes.
-        <br />
-        <b>
-          Make sure you have backups of your data before you activate this
-          feature.
-        </b>
-        <br /><br />
-        This includes beta releases for:
-        <li>Home Assistant Core</li>
-        <li>Home Assistant Supervisor</li>
-        <li>Home Assistant Operating System</li>
-        <br />
-        Do you want to join the beta channel?`,
-      confirmText: "join beta",
-      dismissText: "no",
-    });
-
-    if (!confirmed) {
-      return;
+      if (!confirmed) {
+        return;
+      }
    }

    try {
-      const data: SupervisorOptions = { channel: "beta" };
-      await setSupervisorOption(this.hass, data);
-      const eventdata = {
-        success: true,
-        response: undefined,
-        path: "option",
+      const data: Partial<SupervisorOptions> = {
+        channel: this.supervisorInfo.channel !== "stable" ? "beta" : "stable",
      };
-      fireEvent(this, "hass-api-called", eventdata);
+      await setSupervisorOption(this.hass, data);
+      await reloadSupervisor(this.hass);
    } catch (err) {
-      this._errors = `Error joining beta channel, ${err.body?.message || err}`;
+      showAlertDialog(this, {
+        title: "Failed to set supervisor option",
+        text:
+          typeof err === "object" ? err.body?.message || "Unkown error" : err,
+      });
+    }
+  }
+
+  private async _supervisorReload(): Promise<void> {
+    try {
+      await reloadSupervisor(this.hass);
+    } catch (err) {
+      showAlertDialog(this, {
+        title: "Failed to reload the supervisor",
+        text:
+          typeof err === "object" ? err.body?.message || "Unkown error" : err,
+      });
+    }
+  }
+
+  private async _supervisorUpdate(): Promise<void> {
+    try {
+      await updateSupervisor(this.hass);
+    } catch (err) {
+      showAlertDialog(this, {
+        title: "Failed to update the supervisor",
+        text:
+          typeof err === "object" ? err.body.message || "Unkown error" : err,
+      });
+    }
+  }
+
+  private async _diagnosticsInformationDialog(): Promise<void> {
+    await showAlertDialog(this, {
+      title: "Help Improve Home Assistant",
+      text: html`Would you want to automatically share crash reports and
+        diagnostic information when the supervisor encounters unexpected errors?
+        <br /><br />
+        This will allow us to fix the problems, the information is only
+        accessible to the Home Assistant Core team and will not be shared with
+        others.
+        <br /><br />
+        The data does not include any private/sensitive information and you can
+        disable this in settings at any time you want.`,
+    });
+  }
+
+  private async _toggleDiagnostics(): Promise<void> {
+    try {
+      const data: SupervisorOptions = {
+        diagnostics: !this.supervisorInfo?.diagnostics,
+      };
+      await setSupervisorOption(this.hass, data);
+    } catch (err) {
+      showAlertDialog(this, {
+        title: "Failed to set supervisor option",
+        text:
+          typeof err === "object" ? err.body.message || "Unkown error" : err,
+      });
    }
  }
 }
@@ -7,17 +7,20 @@ import {
  CSSResult,
  customElement,
  html,
+  internalProperty,
  LitElement,
  property,
  TemplateResult,
 } from "lit-element";
-import "../../../src/components/ha-card";
+
 import { fetchHassioLogs } from "../../../src/data/hassio/supervisor";
-import "../../../src/layouts/hass-loading-screen";
+import { hassioStyle } from "../resources/hassio-style";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
+
+import "../../../src/components/ha-card";
+import "../../../src/layouts/hass-loading-screen";
 import "../components/hassio-ansi-to-html";
-import { hassioStyle } from "../resources/hassio-style";

 interface LogProvider {
  key: string;
@@ -55,11 +58,11 @@ const logProviders: LogProvider[] = [
 class HassioSupervisorLog extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property() private _error?: string;
+  @internalProperty() private _error?: string;

-  @property() private _selectedLogProvider = "supervisor";
+  @internalProperty() private _selectedLogProvider = "supervisor";

-  @property() private _content?: string;
+  @internalProperty() private _content?: string;

  public async connectedCallback(): Promise<void> {
    super.connectedCallback();
@@ -101,7 +104,7 @@ class HassioSupervisorLog extends LitElement {
            : html`<hass-loading-screen no-toolbar></hass-loading-screen>`}
        </div>
        <div class="card-actions">
-          <mwc-button @click=${this._refresh}>Refresh</mwc-button>
+          <mwc-button @click=${this._loadData}>Refresh</mwc-button>
        </div>
      </ha-card>
    `;
@@ -113,6 +116,7 @@ class HassioSupervisorLog extends LitElement {
      hassioStyle,
      css`
        ha-card {
+          margin-top: 8px;
          width: 100%;
        }
        pre {
@@ -126,9 +130,6 @@ class HassioSupervisorLog extends LitElement {
          color: var(--error-color);
          margin-bottom: 16px;
        }
-        .card-content {
-          padding-top: 0px;
-        }
      `,
    ];
  }
@@ -141,7 +142,6 @@ class HassioSupervisorLog extends LitElement {

  private async _loadData(): Promise<void> {
    this._error = undefined;
-    this._content = undefined;

    try {
      this._content = await fetchHassioLogs(
@@ -150,14 +150,10 @@ class HassioSupervisorLog extends LitElement {
      );
    } catch (err) {
      this._error = `Failed to get supervisor logs, ${
-        err.body?.message || err
+        typeof err === "object" ? err.body?.message || "Unkown error" : err
      }`;
    }
  }
-
-  private async _refresh(): Promise<void> {
-    await this._loadData();
-  }
 }

 declare global {
@@ -52,10 +52,10 @@ class HassioSystem extends LitElement {
      >
        <span slot="header">System</span>
        <div class="content">
-          <h1>Information</h1>
          <div class="card-group">
            <hassio-supervisor-info
              .hass=${this.hass}
+              .hostInfo=${this.hostInfo}
              .supervisorInfo=${this.supervisorInfo}
            ></hassio-supervisor-info>
            <hassio-host-info
@@ -65,7 +65,6 @@ class HassioSystem extends LitElement {
              .hassOsInfo=${this.hassOsInfo}
            ></hassio-host-info>
          </div>
-          <h1>System log</h1>
          <hassio-supervisor-log .hass=${this.hass}></hassio-supervisor-log>
        </div>
      </hass-tabs-subpage>
@@ -13,7 +13,7 @@
    "lint:prettier": "prettier '**/src/**/*.{js,ts,json,css,md}' --check",
    "format:prettier": "prettier '**/src/**/*.{js,ts,json,css,md}' --write",
    "lint:types": "tsc",
-    "lint:lit": "lit-analyzer '**/src/**/*.ts'",
+    "lint:lit": "lit-analyzer '**/src/**/*.ts' --format markdown --outFile result.md",
    "lint": "npm run lint:eslint && npm run lint:prettier && npm run lint:types",
    "format": "npm run format:eslint && npm run format:prettier",
    "mocha": "node_modules/.bin/ts-mocha -p test-mocha/tsconfig.test.json --opts test-mocha/mocha.opts",
@@ -23,25 +23,29 @@
  "license": "Apache-2.0",
  "dependencies": {
    "@formatjs/intl-pluralrules": "^1.5.8",
-    "@fullcalendar/core": "^5.0.0-beta.2",
-    "@fullcalendar/daygrid": "^5.0.0-beta.2",
-    "@material/chips": "=8.0.0-canary.a78ceb112.0",
+    "@fullcalendar/common": "5.1.0",
+    "@fullcalendar/core": "5.1.0",
+    "@fullcalendar/daygrid": "5.1.0",
+    "@fullcalendar/interaction": "5.1.0",
+    "@fullcalendar/list": "5.1.0",
+    "@material/chips": "=8.0.0-canary.096a7a066.0",
    "@material/circular-progress": "=8.0.0-canary.a78ceb112.0",
-    "@material/mwc-button": "^0.17.2",
-    "@material/mwc-checkbox": "^0.17.2",
-    "@material/mwc-dialog": "^0.17.2",
-    "@material/mwc-fab": "^0.17.2",
-    "@material/mwc-formfield": "^0.17.2",
-    "@material/mwc-icon-button": "^0.17.2",
-    "@material/mwc-list": "^0.17.2",
-    "@material/mwc-menu": "^0.17.2",
-    "@material/mwc-ripple": "^0.17.2",
-    "@material/mwc-switch": "^0.17.2",
-    "@material/mwc-tab": "^0.17.2",
-    "@material/mwc-tab-bar": "^0.17.2",
-    "@material/top-app-bar": "=8.0.0-canary.a78ceb112.0",
-    "@mdi/js": "5.3.45",
-    "@mdi/svg": "5.3.45",
+    "@material/mwc-button": "^0.18.0",
+    "@material/mwc-checkbox": "^0.18.0",
+    "@material/mwc-dialog": "^0.18.0",
+    "@material/mwc-fab": "^0.18.0",
+    "@material/mwc-formfield": "^0.18.0",
+    "@material/mwc-icon-button": "^0.18.0",
+    "@material/mwc-list": "^0.18.0",
+    "@material/mwc-menu": "^0.18.0",
+    "@material/mwc-radio": "^0.18.0",
+    "@material/mwc-ripple": "^0.18.0",
+    "@material/mwc-switch": "^0.18.0",
+    "@material/mwc-tab": "^0.18.0",
+    "@material/mwc-tab-bar": "^0.18.0",
+    "@material/top-app-bar": "=8.0.0-canary.096a7a066.0",
+    "@mdi/js": "5.5.55",
+    "@mdi/svg": "5.5.55",
    "@polymer/app-layout": "^3.0.2",
    "@polymer/app-route": "^3.0.2",
    "@polymer/app-storage": "^3.0.2",
@@ -74,6 +78,7 @@
    "@polymer/paper-tooltip": "^3.0.1",
    "@polymer/polymer": "3.1.0",
    "@thomasloven/round-slider": "0.5.0",
+    "@types/chromecast-caf-sender": "^1.0.3",
    "@vaadin/vaadin-combo-box": "^5.0.10",
    "@vaadin/vaadin-date-picker": "^4.0.7",
    "@vue/web-component-wrapper": "^1.2.0",
@@ -83,6 +88,7 @@
    "codemirror": "^5.49.0",
    "comlink": "^4.3.0",
    "cpx": "^1.5.0",
+    "cropperjs": "^1.5.7",
    "deep-clone-simple": "^1.1.1",
    "deep-freeze": "^0.0.1",
    "es6-object-assign": "^1.1.0",
@@ -99,16 +105,16 @@
    "lit-element": "^2.3.1",
    "lit-html": "^1.2.1",
    "lit-virtualizer": "^0.4.2",
-    "marked": "^0.6.1",
+    "marked": "^1.1.1",
    "mdn-polyfills": "^5.16.0",
    "memoize-one": "^5.0.2",
    "node-vibrant": "^3.1.5",
    "proxy-polyfill": "^0.3.1",
+    "punycode": "^2.1.1",
    "regenerator-runtime": "^0.13.2",
    "resize-observer-polyfill": "^1.5.1",
    "roboto-fontface": "^0.10.0",
-    "superstruct": "^0.6.1",
-    "svg-gauge": "^1.0.6",
+    "superstruct": "^0.10.12",
    "unfetch": "^4.1.0",
    "vue": "^2.6.11",
    "vue2-daterange-picker": "^0.5.1",
@@ -136,13 +142,14 @@
    "@rollup/plugin-replace": "^2.3.2",
    "@types/chai": "^4.1.7",
    "@types/chromecast-caf-receiver": "^3.0.12",
-    "@types/codemirror": "^0.0.78",
+    "@types/codemirror": "^0.0.97",
    "@types/hls.js": "^0.12.3",
    "@types/js-yaml": "^3.12.1",
    "@types/leaflet": "^1.4.3",
    "@types/leaflet-draw": "^1.0.1",
+    "@types/marked": "^1.1.0",
    "@types/memoize-one": "4.1.0",
-    "@types/mocha": "^5.2.6",
+    "@types/mocha": "^7.0.2",
    "@types/resize-observer-browser": "^0.1.3",
    "@types/webspeechapi": "^0.0.29",
    "@typescript-eslint/eslint-plugin": "^2.28.0",
@@ -153,7 +160,7 @@
    "eslint": "^6.8.0",
    "eslint-config-airbnb-typescript": "^7.2.1",
    "eslint-config-prettier": "^6.10.1",
-    "eslint-import-resolver-webpack": "^0.12.1",
+    "eslint-import-resolver-webpack": "^0.12.2",
    "eslint-plugin-disable": "^2.0.1",
    "eslint-plugin-import": "^2.20.2",
    "eslint-plugin-lit": "^1.2.0",
@@ -171,12 +178,12 @@
    "html-minifier": "^4.0.0",
    "husky": "^1.3.1",
    "lint-staged": "^8.1.5",
-    "lit-analyzer": "^1.1.10",
+    "lit-analyzer": "^1.2.0",
    "lodash.template": "^4.5.0",
    "magic-string": "^0.25.7",
    "map-stream": "^0.0.7",
    "merge-stream": "^1.0.1",
-    "mocha": "^6.0.2",
+    "mocha": "^7.2.0",
    "object-hash": "^2.0.3",
    "open": "^7.0.4",
    "prettier": "^2.0.4",
@@ -192,8 +199,8 @@
    "source-map-url": "^0.4.0",
    "systemjs": "^6.3.2",
    "terser-webpack-plugin": "^3.0.6",
-    "ts-lit-plugin": "^1.1.10",
-    "ts-mocha": "^6.0.0",
+    "ts-lit-plugin": "^1.2.0",
+    "ts-mocha": "^7.0.0",
    "typescript": "^3.8.3",
    "vinyl-buffer": "^1.0.1",
    "vinyl-source-stream": "^2.0.0",
@@ -210,7 +217,11 @@
    "@webcomponents/webcomponentsjs": "^2.2.10",
    "@polymer/polymer": "3.1.0",
    "lit-html": "1.2.1",
-    "lit-element": "2.3.1"
+    "lit-element": "2.3.1",
+    "@material/animation": "8.0.0-canary.096a7a066.0",
+    "@material/base": "8.0.0-canary.096a7a066.0",
+    "@material/feature-targeting": "8.0.0-canary.096a7a066.0",
+    "@material/theme": "8.0.0-canary.096a7a066.0"
  },
  "main": "src/home-assistant.js",
  "husky": {
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages

 setup(
    name="home-assistant-frontend",
-    version="20200714.0",
+    version="20200824.0",
    description="The Home Assistant frontend",
    url="https://github.com/home-assistant/home-assistant-polymer",
    author="The Home Assistant Authors",
@@ -5,6 +5,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -28,13 +29,13 @@ class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {

  @property() public oauth2State?: string;

-  @property() private _state: State = "loading";
+  @internalProperty() private _state: State = "loading";

-  @property() private _stepData: any = {};
+  @internalProperty() private _stepData: any = {};

-  @property() private _step?: DataEntryFlowStep;
+  @internalProperty() private _step?: DataEntryFlowStep;

-  @property() private _errorMessage?: string;
+  @internalProperty() private _errorMessage?: string;

  protected render() {
    return html`
@@ -4,6 +4,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
 } from "lit-element";
 import {
@@ -15,6 +16,7 @@ import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 import { registerServiceWorker } from "../util/register-service-worker";
 import "./ha-auth-flow";
 import { extractSearchParamsObject } from "../common/url/search-params";
+import punycode from "punycode";

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

@@ -25,9 +27,9 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {

  @property() public oauth2State?: string;

-  @property() private _authProvider?: AuthProvider;
+  @internalProperty() private _authProvider?: AuthProvider;

-  @property() private _authProviders?: AuthProvider[];
+  @internalProperty() private _authProviders?: AuthProvider[];

  constructor() {
    super();
@@ -74,7 +76,7 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
        ${this.localize(
          "ui.panel.page-authorize.authorizing_client",
          "clientId",
-          this.clientId
+          this.clientId ? punycode.toASCII(this.clientId) : this.clientId
        )}
      </p>
      ${loggingInWith}
@@ -1,4 +1,8 @@
 /* eslint-disable no-undef, no-console */
+import {
+  CastStateEventData,
+  SessionStateEventData,
+} from "chromecast-caf-receiver/cast.framework";
 import { Auth } from "home-assistant-js-websocket";
 import { castApiAvailable } from "./cast_framework";
 import { CAST_APP_ID, CAST_DEV, CAST_NS } from "./const";
@@ -40,16 +44,13 @@ export class CastManager {
    const context = this.castContext;
    context.setOptions({
      receiverApplicationId: CAST_APP_ID,
-      // @ts-ignore
      autoJoinPolicy: chrome.cast.AutoJoinPolicy.ORIGIN_SCOPED,
    });
    context.addEventListener(
-      // @ts-ignore
      cast.framework.CastContextEventType.SESSION_STATE_CHANGED,
      (ev) => this._sessionStateChanged(ev)
    );
    context.addEventListener(
-      // @ts-ignore
      cast.framework.CastContextEventType.CAST_STATE_CHANGED,
      (ev) => this._castStateChanged(ev)
    );
@@ -118,7 +119,7 @@ export class CastManager {
    }
  }

-  private _sessionStateChanged(ev) {
+  private _sessionStateChanged(ev: SessionStateEventData) {
    if (__DEV__) {
      console.log("Cast session state changed", ev.sessionState);
    }
@@ -141,7 +142,7 @@ export class CastManager {
    }
  }

-  private _castStateChanged(ev) {
+  private _castStateChanged(ev: CastStateEventData) {
    if (__DEV__) {
      console.log("Cast state changed", ev.castState);
    }
@@ -0,0 +1,113 @@
+const expand_hex = (hex: string): string => {
+  let result = "";
+  for (const val of hex) {
+    result += val + val;
+  }
+  return result;
+};
+
+const rgb_hex = (component: number): string => {
+  const hex = Math.round(Math.min(Math.max(component, 0), 255)).toString(16);
+  return hex.length === 1 ? `0${hex}` : hex;
+};
+
+// Conversion between HEX and RGB
+
+export const hex2rgb = (hex: string): [number, number, number] => {
+  hex = hex.replace("#", "");
+  if (hex.length === 3 || hex.length === 4) {
+    hex = expand_hex(hex);
+  }
+
+  return [
+    parseInt(hex.substring(0, 2), 16),
+    parseInt(hex.substring(2, 4), 16),
+    parseInt(hex.substring(4, 6), 16),
+  ];
+};
+
+export const rgb2hex = (rgb: [number, number, number]): string => {
+  return `#${rgb_hex(rgb[0])}${rgb_hex(rgb[1])}${rgb_hex(rgb[2])}`;
+};
+
+// Conversion between LAB, XYZ and RGB from https://github.com/gka/chroma.js
+// Copyright (c) 2011-2019, Gregor Aisch
+
+// Constants for XYZ and LAB conversion
+const Xn = 0.95047;
+const Yn = 1;
+const Zn = 1.08883;
+
+const t0 = 0.137931034; // 4 / 29
+const t1 = 0.206896552; // 6 / 29
+const t2 = 0.12841855; // 3 * t1 * t1
+const t3 = 0.008856452; // t1 * t1 * t1
+
+const rgb_xyz = (r: number) => {
+  r /= 255;
+  if (r <= 0.04045) {
+    return r / 12.92;
+  }
+  return ((r + 0.055) / 1.055) ** 2.4;
+};
+
+const xyz_lab = (t: number) => {
+  if (t > t3) {
+    return t ** (1 / 3);
+  }
+  return t / t2 + t0;
+};
+
+const xyz_rgb = (r: number) => {
+  return 255 * (r <= 0.00304 ? 12.92 * r : 1.055 * r ** (1 / 2.4) - 0.055);
+};
+
+const lab_xyz = (t: number) => {
+  return t > t1 ? t * t * t : t2 * (t - t0);
+};
+
+// Conversions between RGB and LAB
+
+const rgb2xyz = (rgb: [number, number, number]): [number, number, number] => {
+  let [r, g, b] = rgb;
+  r = rgb_xyz(r);
+  g = rgb_xyz(g);
+  b = rgb_xyz(b);
+  const x = xyz_lab((0.4124564 * r + 0.3575761 * g + 0.1804375 * b) / Xn);
+  const y = xyz_lab((0.2126729 * r + 0.7151522 * g + 0.072175 * b) / Yn);
+  const z = xyz_lab((0.0193339 * r + 0.119192 * g + 0.9503041 * b) / Zn);
+  return [x, y, z];
+};
+
+export const rgb2lab = (
+  rgb: [number, number, number]
+): [number, number, number] => {
+  const [x, y, z] = rgb2xyz(rgb);
+  const l = 116 * y - 16;
+  return [l < 0 ? 0 : l, 500 * (x - y), 200 * (y - z)];
+};
+
+export const lab2rgb = (
+  lab: [number, number, number]
+): [number, number, number] => {
+  const [l, a, b] = lab;
+
+  let y = (l + 16) / 116;
+  let x = isNaN(a) ? y : y + a / 500;
+  let z = isNaN(b) ? y : y - b / 200;
+
+  y = Yn * lab_xyz(y);
+  x = Xn * lab_xyz(x);
+  z = Zn * lab_xyz(z);
+
+  const r = xyz_rgb(3.2404542 * x - 1.5371385 * y - 0.4985314 * z); // D65 -> sRGB
+  const g = xyz_rgb(-0.969266 * x + 1.8760108 * y + 0.041556 * z);
+  const b_ = xyz_rgb(0.0556434 * x - 0.2040259 * y + 1.0572252 * z);
+
+  return [r, g, b_];
+};
+
+export const lab2hex = (lab: [number, number, number]): string => {
+  const rgb = lab2rgb(lab);
+  return rgb2hex(rgb);
+};
@@ -0,0 +1,16 @@
+// From https://github.com/gka/chroma.js
+// Copyright (c) 2011-2019, Gregor Aisch
+
+export const labDarken = (
+  lab: [number, number, number],
+  amount = 1
+): [number, number, number] => {
+  return [lab[0] - 18 * amount, lab[1], lab[2]];
+};
+
+export const labBrighten = (
+  lab: [number, number, number],
+  amount = 1
+): [number, number, number] => {
+  return labDarken(lab, -amount);
+};
@@ -0,0 +1,24 @@
+const luminosity = (rgb: [number, number, number]): number => {
+  // http://www.w3.org/TR/WCAG20/#relativeluminancedef
+  const lum: [number, number, number] = [0, 0, 0];
+  for (let i = 0; i < rgb.length; i++) {
+    const chan = rgb[i] / 255;
+    lum[i] = chan <= 0.03928 ? chan / 12.92 : ((chan + 0.055) / 1.055) ** 2.4;
+  }
+
+  return 0.2126 * lum[0] + 0.7152 * lum[1] + 0.0722 * lum[2];
+};
+
+export const rgbContrast = (
+  color1: [number, number, number],
+  color2: [number, number, number]
+) => {
+  const lum1 = luminosity(color1);
+  const lum2 = luminosity(color2);
+
+  if (lum1 > lum2) {
+    return (lum1 + 0.05) / (lum2 + 0.05);
+  }
+
+  return (lum2 + 0.05) / (lum1 + 0.05);
+};
@@ -0,0 +1,9 @@
+import { HomeAssistant } from "../../types";
+
+/** Return if a service is loaded. */
+export const isServiceLoaded = (
+  hass: HomeAssistant,
+  domain: string,
+  service: string
+): boolean =>
+  hass && domain in hass.services && service in hass.services[domain];
@@ -21,6 +21,11 @@ export default function relativeTime(
  const tense = delta >= 0 ? "past" : "future";
  delta = Math.abs(delta);
  let roundedDelta = Math.round(delta);
+
+  if (roundedDelta === 0) {
+    return localize("ui.components.relative_time.just_now");
+  }
+
  let unit = "week";

  for (let i = 0; i < tests.length; i++) {
@@ -1,26 +1,20 @@
-import { derivedStyles } from "../../resources/styles";
+import { derivedStyles, darkStyles } from "../../resources/styles";
 import { HomeAssistant, Theme } from "../../types";
+import {
+  hex2rgb,
+  rgb2hex,
+  rgb2lab,
+  lab2rgb,
+  lab2hex,
+} from "../color/convert-color";
+import { rgbContrast } from "../color/rgb";
+import { labDarken, labBrighten } from "../color/lab";

 interface ProcessedTheme {
  keys: { [key: string]: "" };
  styles: { [key: string]: string };
 }

-const hexToRgb = (hex: string): string | null => {
-  const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
-  const checkHex = hex.replace(shorthandRegex, (_m, r, g, b) => {
-    return r + r + g + g + b + b;
-  });
-
-  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(checkHex);
-  return result
-    ? `${parseInt(result[1], 16)}, ${parseInt(result[2], 16)}, ${parseInt(
-        result[3],
-        16
-      )}`
-    : null;
-};
-
 let PROCESSED_THEMES: { [key: string]: ProcessedTheme } = {};

 /**
@@ -33,17 +27,56 @@ let PROCESSED_THEMES: { [key: string]: ProcessedTheme } = {};
 export const applyThemesOnElement = (
  element,
  themes: HomeAssistant["themes"],
-  selectedTheme?: string
+  selectedTheme?: string,
+  themeOptions?: Partial<HomeAssistant["selectedTheme"]>
 ) => {
-  const newTheme = selectedTheme
-    ? PROCESSED_THEMES[selectedTheme] || processTheme(selectedTheme, themes)
-    : undefined;
+  let cacheKey = selectedTheme;
+  let themeRules: Partial<Theme> = {};

-  if (!element._themes && !newTheme) {
+  if (selectedTheme === "default" && themeOptions) {
+    if (themeOptions.dark) {
+      cacheKey = `${cacheKey}__dark`;
+      themeRules = darkStyles;
+    }
+    if (themeOptions.primaryColor) {
+      cacheKey = `${cacheKey}__primary_${themeOptions.primaryColor}`;
+      const rgbPrimaryColor = hex2rgb(themeOptions.primaryColor);
+      const labPrimaryColor = rgb2lab(rgbPrimaryColor);
+      themeRules["primary-color"] = themeOptions.primaryColor;
+      const rgbLigthPrimaryColor = lab2rgb(labBrighten(labPrimaryColor));
+      themeRules["light-primary-color"] = rgb2hex(rgbLigthPrimaryColor);
+      themeRules["dark-primary-color"] = lab2hex(labDarken(labPrimaryColor));
+      themeRules["text-primary-color"] =
+        rgbContrast(rgbPrimaryColor, [33, 33, 33]) < 6 ? "#fff" : "#212121";
+      themeRules["text-light-primary-color"] =
+        rgbContrast(rgbLigthPrimaryColor, [33, 33, 33]) < 6
+          ? "#fff"
+          : "#212121";
+      themeRules["state-icon-color"] = themeRules["dark-primary-color"];
+    }
+    if (themeOptions.accentColor) {
+      cacheKey = `${cacheKey}__accent_${themeOptions.accentColor}`;
+      themeRules["accent-color"] = themeOptions.accentColor;
+      const rgbAccentColor = hex2rgb(themeOptions.accentColor);
+      themeRules["text-accent-color"] =
+        rgbContrast(rgbAccentColor, [33, 33, 33]) < 6 ? "#fff" : "#212121";
+    }
+  }
+
+  if (selectedTheme && themes.themes[selectedTheme]) {
+    themeRules = themes.themes[selectedTheme];
+  }
+
+  if (!element._themes && !Object.keys(themeRules).length) {
    // No styles to reset, and no styles to set
    return;
  }

+  const newTheme =
+    themeRules && cacheKey
+      ? PROCESSED_THEMES[cacheKey] || processTheme(cacheKey, themeRules)
+      : undefined;
+
  // Add previous set keys to reset them, and new theme
  const styles = { ...element._themes, ...newTheme?.styles };
  element._themes = newTheme?.keys;
@@ -58,42 +91,45 @@ export const applyThemesOnElement = (
 };

 const processTheme = (
-  themeName: string,
-  themes: HomeAssistant["themes"]
+  cacheKey: string,
+  theme: Partial<Theme>
 ): ProcessedTheme | undefined => {
-  if (!themes.themes[themeName]) {
+  if (!theme || !Object.keys(theme).length) {
    return undefined;
  }
-  const theme: Theme = {
+  const combinedTheme: Partial<Theme> = {
    ...derivedStyles,
-    ...themes.themes[themeName],
+    ...theme,
  };
  const styles = {};
  const keys = {};
-  for (const key of Object.keys(theme)) {
+  for (const key of Object.keys(combinedTheme)) {
    const prefixedKey = `--${key}`;
-    const value = theme[key];
+    const value = combinedTheme[key]!;
    styles[prefixedKey] = value;
    keys[prefixedKey] = "";

-    // Try to create a rgb value for this key if it is a hex color
+    // Try to create a rgb value for this key if it is not a var
    if (!value.startsWith("#")) {
-      // Not a hex color
+      // Can't convert non hex value
      continue;
    }
+
    const rgbKey = `rgb-${key}`;
-    if (theme[rgbKey] !== undefined) {
+    if (combinedTheme[rgbKey] !== undefined) {
      // Theme has it's own rgb value
      continue;
    }
-    const rgbValue = hexToRgb(value);
-    if (rgbValue !== null) {
+    try {
+      const rgbValue = hex2rgb(value).join(",");
      const prefixedRgbKey = `--${rgbKey}`;
      styles[prefixedRgbKey] = rgbValue;
      keys[prefixedRgbKey] = "";
+    } catch (e) {
+      continue;
    }
  }
-  PROCESSED_THEMES[themeName] = { styles, keys };
+  PROCESSED_THEMES[cacheKey] = { styles, keys };
  return { styles, keys };
 };

@@ -23,7 +23,8 @@ const _load = (
        if (type) {
          (element as HTMLScriptElement).type = type;
          // https://github.com/home-assistant/frontend/pull/6328
-          (element as HTMLScriptElement).crossOrigin = url.substr(0, 1) === "/" ? "use-credentials" : "anonymous";
+          (element as HTMLScriptElement).crossOrigin =
+            url.substr(0, 1) === "/" ? "use-credentials" : "anonymous";
        }
        break;
      case "link":
@@ -1,4 +1,4 @@
-import type { Map } from "leaflet";
+import type { Map, TileLayer } from "leaflet";

 // Sets up a Leaflet map on the provided DOM element
 export type LeafletModuleType = typeof import("leaflet");
@@ -6,9 +6,9 @@ export type LeafletDrawModuleType = typeof import("leaflet-draw");

 export const setupLeafletMap = async (
  mapElement: HTMLElement,
-  darkMode = false,
+  darkMode?: boolean,
  draw = false
-): Promise<[Map, LeafletModuleType]> => {
+): Promise<[Map, LeafletModuleType, TileLayer]> => {
  if (!mapElement.parentNode) {
    throw new Error("Cannot setup Leaflet map on disconnected element");
  }
@@ -28,15 +28,28 @@ export const setupLeafletMap = async (
  style.setAttribute("rel", "stylesheet");
  mapElement.parentNode.appendChild(style);
  map.setView([52.3731339, 4.8903147], 13);
-  createTileLayer(Leaflet, darkMode).addTo(map);

-  return [map, Leaflet];
+  const tileLayer = createTileLayer(Leaflet, Boolean(darkMode)).addTo(map);
+
+  return [map, Leaflet, tileLayer];
 };

-export const createTileLayer = (
+export const replaceTileLayer = (
+  leaflet: LeafletModuleType,
+  map: Map,
+  tileLayer: TileLayer,
+  darkMode: boolean
+): TileLayer => {
+  map.removeLayer(tileLayer);
+  tileLayer = createTileLayer(leaflet, darkMode);
+  tileLayer.addTo(map);
+  return tileLayer;
+};
+
+const createTileLayer = (
  leaflet: LeafletModuleType,
  darkMode: boolean
-) => {
+): TileLayer => {
  return leaflet.tileLayer(
    `https://{s}.basemaps.cartocdn.com/${
      darkMode ? "dark_all" : "light_all"
@@ -13,7 +13,7 @@ export const batteryIcon = (
    return "hass:battery-unknown";
  }

-  var icon = "hass:battery";
+  let icon = "hass:battery";
  const batteryRound = Math.round(battery / 10) * 10;
  if (battery_charging && battery > 10) {
    icon += `-charging-${batteryRound}`;
@@ -5,12 +5,16 @@ import { domainIcon } from "./domain_icon";
 import { batteryIcon } from "./battery_icon";

 const fixedDeviceClassIcons = {
+  current: "hass:current-ac",
+  energy: "hass:flash",
  humidity: "hass:water-percent",
  illuminance: "hass:brightness-5",
  temperature: "hass:thermometer",
  pressure: "hass:gauge",
  power: "hass:flash",
+  power_factor: "hass:angle-acute",
  signal_strength: "hass:wifi",
+  voltage: "hass:sine-wave",
 };

 export const sensorIcon = (state: HassEntity) => {
@@ -4,6 +4,6 @@ export const supportsFeature = (
  stateObj: HassEntity,
  feature: number
 ): boolean => {
-  // eslint-disable-next-line:no-bitwise
+  // eslint-disable-next-line no-bitwise
  return (stateObj.attributes.supported_features! & feature) !== 0;
 };
@@ -2,11 +2,3 @@ const validEntityId = /^(\w+)\.(\w+)$/;

 export const isValidEntityId = (entityId: string) =>
  validEntityId.test(entityId);
-
-export const createValidEntityId = (input: string) =>
-  input
-    .toLowerCase()
-    .replace(/\s|'|\./g, "_") // replace spaces, points and quotes with underscore
-    .replace(/\W/g, "") // remove not allowed chars
-    .replace(/_{2,}/g, "_") // replace multiple underscores with 1
-    .replace(/_$/, ""); // remove underscores at the end
@@ -0,0 +1,14 @@
+import {
+  RequestSelectedDetail,
+  ListItem,
+} from "@material/mwc-list/mwc-list-item";
+
+export const shouldHandleRequestSelectedEvent = (
+  ev: CustomEvent<RequestSelectedDetail>
+): boolean => {
+  if (!ev.detail.selected && ev.detail.source !== "property") {
+    return false;
+  }
+  (ev.target as ListItem).selected = false;
+  return true;
+};
@@ -1,5 +1,5 @@
 // https://gist.github.com/hagemann/382adfc57adbd5af078dc93feef01fe1
-export const slugify = (value: string, delimiter = "-") => {
+export const slugify = (value: string, delimiter = "_") => {
  const a =
    "àáäâãåăæąçćčđďèéěėëêęğǵḧìíïîįłḿǹńňñòóöôœøṕŕřßşśšșťțùúüûǘůűūųẃẍÿýźžż·/_,:;";
  const b = `aaaaaaaaacccddeeeeeeegghiiiiilmnnnnooooooprrsssssttuuuuuuuuuwxyyzzz${delimiter}${delimiter}${delimiter}${delimiter}${delimiter}${delimiter}`;
@@ -19,7 +19,13 @@ export const iconColorCSS = css`
  ha-icon[data-domain="sun"][data-state="above_horizon"],
  ha-icon[data-domain="switch"][data-state="on"],
  ha-icon[data-domain="timer"][data-state="active"],
-  ha-icon[data-domain="vacuum"][data-state="cleaning"] {
+  ha-icon[data-domain="vacuum"][data-state="cleaning"],
+  ha-icon[data-domain="group"][data-state="on"],
+  ha-icon[data-domain="group"][data-state="home"],
+  ha-icon[data-domain="group"][data-state="open"],
+  ha-icon[data-domain="group"][data-state="locked"],
+  ha-icon[data-domain="group"][data-state="problem"]   
+  {
    color: var(--paper-item-icon-active-color, #fdd835);
  }

@@ -9,5 +9,9 @@ export function computeRTL(hass: HomeAssistant) {
 }

 export function computeRTLDirection(hass: HomeAssistant) {
-  return computeRTL(hass) ? "rtl" : "ltr";
+  return emitRTLDirection(computeRTL(hass));
+}
+
+export function emitRTLDirection(rtl: boolean) {
+  return rtl ? "rtl" : "ltr";
 }
@@ -54,8 +54,8 @@ class HaCallServiceButton extends EventsMixin(PolymerElement) {
  callService() {
    this.progress = true;
    // eslint-disable-next-line @typescript-eslint/no-this-alias
-    var el = this;
-    var eventData = {
+    const el = this;
+    const eventData = {
      domain: this.domain,
      service: this.service,
      serviceData: this.serviceData,
@@ -78,7 +78,7 @@ class HaProgressButton extends PolymerElement {
  }

  tempClass(className) {
-    var classList = this.$.container.classList;
+    const classList = this.$.container.classList;
    classList.add(className);
    setTimeout(() => {
      classList.remove(className);
@@ -3,19 +3,21 @@ import {
  css,
  CSSResult,
  customElement,
+  eventOptions,
  html,
+  internalProperty,
  LitElement,
  property,
  PropertyValues,
  query,
  TemplateResult,
-  eventOptions,
-  internalProperty,
 } from "lit-element";
 import { classMap } from "lit-html/directives/class-map";
 import { ifDefined } from "lit-html/directives/if-defined";
 import { styleMap } from "lit-html/directives/style-map";
 import { scroll } from "lit-virtualizer";
+import memoizeOne from "memoize-one";
+import { restoreScroll } from "../../common/decorators/restore-scroll";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../common/search/search-input";
 import { debounce } from "../../common/util/debounce";
@@ -24,8 +26,6 @@ import "../ha-checkbox";
 import type { HaCheckbox } from "../ha-checkbox";
 import "../ha-icon";
 import { filterData, sortData } from "./sort-filter";
-import memoizeOne from "memoize-one";
-import { restoreScroll } from "../../common/decorators/restore-scroll";

 declare global {
  // for fire event
@@ -70,6 +70,7 @@ export interface DataTableColumnData extends DataTableSortColumnData {
  maxWidth?: string;
  grows?: boolean;
  forceLTR?: boolean;
+  hidden?: boolean;
 }

 export interface DataTableRowData {
@@ -98,6 +99,8 @@ export class HaDataTable extends LitElement {

  @property({ type: String }) public noDataText?: string;

+  @property({ type: String }) public searchLabel?: string;
+
  @property({ type: String }) public filter = "";

  @internalProperty() private _filterable = false;
@@ -202,6 +205,7 @@ export class HaDataTable extends LitElement {
                <div class="table-header">
                  <search-input
                    @value-changed=${this._handleSearchChange}
+                    .label=${this.searchLabel}
                  ></search-input>
                </div>
              `
@@ -211,13 +215,15 @@ export class HaDataTable extends LitElement {
          class="mdc-data-table__table ${classMap({
            "auto-height": this.autoHeight,
          })}"
+          role="table"
+          aria-rowcount=${this._filteredData.length}
          style=${styleMap({
            height: this.autoHeight
              ? `${(this._filteredData.length || 1) * 53 + 57}px`
              : `calc(100% - ${this._header?.clientHeight}px)`,
          })}
        >
-          <div class="mdc-data-table__header-row">
+          <div class="mdc-data-table__header-row" role="row">
            ${this.selectable
              ? html`
                  <div
@@ -237,8 +243,10 @@ export class HaDataTable extends LitElement {
                  </div>
                `
              : ""}
-            ${Object.entries(this.columns).map((columnEntry) => {
-              const [key, column] = columnEntry;
+            ${Object.entries(this.columns).map(([key, column]) => {
+              if (column.hidden) {
+                return "";
+              }
              const sorted = key === this._sortColumn;
              const classes = {
                "mdc-data-table__header-cell--numeric": Boolean(
@@ -285,8 +293,8 @@ export class HaDataTable extends LitElement {
          ${!this._filteredData.length
            ? html`
                <div class="mdc-data-table__content">
-                  <div class="mdc-data-table__row">
-                    <div class="mdc-data-table__cell grows center">
+                  <div class="mdc-data-table__row" role="row">
+                    <div class="mdc-data-table__cell grows center" role="cell">
                      ${this.noDataText || "No data"}
                    </div>
                  </div>
@@ -301,12 +309,14 @@ export class HaDataTable extends LitElement {
                    items: !this.hasFab
                      ? this._filteredData
                      : [...this._filteredData, ...[{ empty: true }]],
-                    renderItem: (row: DataTableRowData) => {
+                    renderItem: (row: DataTableRowData, index) => {
                      if (row.empty) {
                        return html` <div class="mdc-data-table__row"></div> `;
                      }
                      return html`
                        <div
+                          aria-rowindex=${index}
+                          role="row"
                          .rowId="${row[this.id]}"
                          @click=${this._handleRowClick}
                          class="mdc-data-table__row ${classMap({
@@ -325,6 +335,7 @@ export class HaDataTable extends LitElement {
                            ? html`
                                <div
                                  class="mdc-data-table__cell mdc-data-table__cell--checkbox"
+                                  role="cell"
                                >
                                  <ha-checkbox
                                    class="mdc-data-table__row-checkbox"
@@ -338,40 +349,45 @@ export class HaDataTable extends LitElement {
                                </div>
                              `
                            : ""}
-                          ${Object.entries(this.columns).map((columnEntry) => {
-                            const [key, column] = columnEntry;
-                            return html`
-                              <div
-                                class="mdc-data-table__cell ${classMap({
-                                  "mdc-data-table__cell--numeric": Boolean(
-                                    column.type === "numeric"
-                                  ),
-                                  "mdc-data-table__cell--icon": Boolean(
-                                    column.type === "icon"
-                                  ),
-                                  "mdc-data-table__cell--icon-button": Boolean(
-                                    column.type === "icon-button"
-                                  ),
-                                  grows: Boolean(column.grows),
-                                  forceLTR: Boolean(column.forceLTR),
-                                })}"
-                                style=${column.width
-                                  ? styleMap({
-                                      [column.grows
-                                        ? "minWidth"
-                                        : "width"]: column.width,
-                                      maxWidth: column.maxWidth
-                                        ? column.maxWidth
-                                        : "",
-                                    })
-                                  : ""}
-                              >
-                                ${column.template
-                                  ? column.template(row[key], row)
-                                  : row[key]}
-                              </div>
-                            `;
-                          })}
+                          ${Object.entries(this.columns).map(
+                            ([key, column]) => {
+                              if (column.hidden) {
+                                return "";
+                              }
+                              return html`
+                                <div
+                                  role="cell"
+                                  class="mdc-data-table__cell ${classMap({
+                                    "mdc-data-table__cell--numeric": Boolean(
+                                      column.type === "numeric"
+                                    ),
+                                    "mdc-data-table__cell--icon": Boolean(
+                                      column.type === "icon"
+                                    ),
+                                    "mdc-data-table__cell--icon-button": Boolean(
+                                      column.type === "icon-button"
+                                    ),
+                                    grows: Boolean(column.grows),
+                                    forceLTR: Boolean(column.forceLTR),
+                                  })}"
+                                  style=${column.width
+                                    ? styleMap({
+                                        [column.grows
+                                          ? "minWidth"
+                                          : "width"]: column.width,
+                                        maxWidth: column.maxWidth
+                                          ? column.maxWidth
+                                          : "",
+                                      })
+                                    : ""}
+                                >
+                                  ${column.template
+                                    ? column.template(row[key], row)
+                                    : row[key]}
+                                </div>
+                              `;
+                            }
+                          )}
                        </div>
                      `;
                    },
@@ -538,7 +554,7 @@ export class HaDataTable extends LitElement {
        border-radius: 4px;
        border-width: 1px;
        border-style: solid;
-        border-color: rgba(var(--rgb-primary-text-color), 0.12);
+        border-color: var(--divider-color);
        display: inline-flex;
        flex-direction: column;
        box-sizing: border-box;
@@ -556,7 +572,7 @@ export class HaDataTable extends LitElement {
      }

      .mdc-data-table__row ~ .mdc-data-table__row {
-        border-top: 1px solid rgba(var(--rgb-primary-text-color), 0.12);
+        border-top: 1px solid var(--divider-color);
      }

      .mdc-data-table__row:not(.mdc-data-table__row--selected):hover {
@@ -575,7 +591,7 @@ export class HaDataTable extends LitElement {
        height: 56px;
        display: flex;
        width: 100%;
-        border-bottom: 1px solid rgba(var(--rgb-primary-text-color), 0.12);
+        border-bottom: 1px solid var(--divider-color);
        overflow-x: auto;
      }

@@ -828,7 +844,7 @@ export class HaDataTable extends LitElement {
        right: 12px;
      }
      .table-header {
-        border-bottom: 1px solid rgba(var(--rgb-primary-text-color), 0.12);
+        border-bottom: 1px solid var(--divider-color);
        padding: 0 16px;
      }
      search-input {
@@ -1,11 +1,11 @@
 // To use comlink under ES5
-import "proxy-polyfill";
 import { expose } from "comlink";
+import "proxy-polyfill";
 import type {
-  DataTableSortColumnData,
  DataTableRowData,
-  SortingDirection,
+  DataTableSortColumnData,
  SortableColumnContainer,
+  SortingDirection,
 } from "./ha-data-table";

 const filterData = (
@@ -19,7 +19,7 @@ const filterData = (
      const [key, column] = columnEntry;
      if (column.filterable) {
        if (
-          (column.filterKey ? row[key][column.filterKey] : row[key])
+          String(column.filterKey ? row[key][column.filterKey] : row[key])
            .toUpperCase()
            .includes(filter)
        ) {
@@ -135,7 +135,7 @@ class DateRangePickerElement extends WrappedElement {
          }
          .daterangepicker td.in-range {
            background-color: var(--light-primary-color);
-            color: var(--primary-text-color);
+            color: var(--text-light-primary-color, var(--primary-text-color));
          }
          .daterangepicker td.active,
          .daterangepicker td.active:hover {
@@ -13,6 +13,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -87,7 +88,7 @@ const rowRenderer = (

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

  @property() public label?: string;

@@ -124,13 +125,13 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
  @property({ type: Boolean })
  private _opened?: boolean;

-  @property() private _areaPicker = true;
+  @internalProperty() private _areaPicker = true;

-  @property() private _devices?: DeviceRegistryEntry[];
+  @internalProperty() private _devices?: DeviceRegistryEntry[];

-  @property() private _areas?: AreaRegistryEntry[];
+  @internalProperty() private _areas?: AreaRegistryEntry[];

-  @property() private _entities?: EntityRegistryEntry[];
+  @internalProperty() private _entities?: EntityRegistryEntry[];

  private _selectedDevices: string[] = [];

@@ -8,6 +8,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import { fireEvent } from "../../common/dom/fire_event";
@@ -24,7 +25,7 @@ const UNKNOWN_AUTOMATION_KEY = "UNKNOWN_AUTOMATION";
 export abstract class HaDeviceAutomationPicker<
  T extends DeviceAutomation
 > extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public label?: string;

@@ -36,11 +37,11 @@ export abstract class HaDeviceAutomationPicker<

  protected UNKNOWN_AUTOMATION_TEXT = "Unknown automation";

-  @property() private _automations: T[] = [];
+  @internalProperty() private _automations: T[] = [];

  // Trigger an empty render so we start with a clean DOM.
  // paper-listbox does not like changing things around.
-  @property() private _renderEmpty = false;
+  @internalProperty() private _renderEmpty = false;

  private _localizeDeviceAutomation: (
    hass: HomeAssistant,
@@ -116,11 +117,7 @@ export abstract class HaDeviceAutomationPicker<
          >
            ${this.NO_AUTOMATION_TEXT}
          </paper-item>
-          <paper-item
-            key=${UNKNOWN_AUTOMATION_KEY}
-            .automation=${this.value}
-            hidden
-          >
+          <paper-item key=${UNKNOWN_AUTOMATION_KEY} hidden>
            ${this.UNKNOWN_AUTOMATION_TEXT}
          </paper-item>
          ${this._automations.map(
@@ -174,18 +171,17 @@ export abstract class HaDeviceAutomationPicker<
  }

  private _automationChanged(ev) {
-    this._setValue(ev.detail.item.automation);
+    if (ev.detail.item.automation) {
+      this._setValue(ev.detail.item.automation);
+    }
  }

  private _setValue(automation: T) {
    if (this.value && deviceAutomationsEqual(automation, this.value)) {
      return;
    }
-    this.value = automation;
-    setTimeout(() => {
-      fireEvent(this, "change");
-      fireEvent(this, "value-changed", { value: automation });
-    }, 0);
+    fireEvent(this, "change");
+    fireEvent(this, "value-changed", { value: automation });
  }

  static get styles(): CSSResult {
@@ -66,7 +66,7 @@ const rowRenderer = (root: HTMLElement, _owner, model: { item: Device }) => {

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

  @property() public label?: string;

@@ -12,7 +12,7 @@ import "./ha-device-picker";

@customElement("ha-devices-picker")
 class HaDevicesPicker extends LitElement {
-  @property() public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property() public value?: string[];

@@ -23,10 +23,10 @@ export const HaIronFocusablesHelper = {
   * @return {!Array<!HTMLElement>}
   */
  getTabbableNodes: function (node) {
-    var result = [];
+    const result = [];
    // If there is at least one element with tabindex > 0, we need to sort
    // the final array by tabindex.
-    var needsSortByTabIndex = this._collectTabbableNodes(node, result);
+    const needsSortByTabIndex = this._collectTabbableNodes(node, result);
    if (needsSortByTabIndex) {
      return IronFocusablesHelper._sortByTabIndex(result);
    }
@@ -50,9 +50,9 @@ export const HaIronFocusablesHelper = {
    ) {
      return false;
    }
-    var element = /** @type {!HTMLElement} */ (node);
-    var tabIndex = IronFocusablesHelper._normalizedTabIndex(element);
-    var needsSort = tabIndex > 0;
+    const element = /** @type {!HTMLElement} */ (node);
+    const tabIndex = IronFocusablesHelper._normalizedTabIndex(element);
+    let needsSort = tabIndex > 0;
    if (tabIndex >= 0) {
      result.push(element);
    }
@@ -70,7 +70,7 @@ export const HaIronFocusablesHelper = {
    //   <input id="B" slot="b" tabindex="1">
    //  </div>
    // TODO(valdrin) support ShadowDOM v1 when upgrading to Polymer v2.0.
-    var children;
+    let children;
    if (element.localName === "content" || element.localName === "slot") {
      children = dom(element).getDistributedNodes();
    } else {
@@ -80,7 +80,7 @@ export const HaIronFocusablesHelper = {
      children = dom(element.shadowRoot || element.root || element).children;
      // /////////////////////////
    }
-    for (var i = 0; i < children.length; i++) {
+    for (let i = 0; i < children.length; i++) {
      // Ensure method is always invoked to collect tabbable children.
      needsSort = this._collectTabbableNodes(children[i], result) || needsSort;
    }
@@ -1,12 +1,12 @@
 /* eslint-plugin-disable lit */
 import { IronResizableBehavior } from "@polymer/iron-resizable-behavior/iron-resizable-behavior";
-import "../ha-icon-button";
 import { mixinBehaviors } from "@polymer/polymer/lib/legacy/class";
 import { timeOut } from "@polymer/polymer/lib/utils/async";
 import { Debouncer } from "@polymer/polymer/lib/utils/debounce";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 import { formatTime } from "../../common/datetime/format_time";
+import "../ha-icon-button";

 // eslint-disable-next-line no-unused-vars
 /* global Chart moment Color */
@@ -355,7 +355,7 @@ class HaChartBase extends mixinBehaviors(
      return value;
    }
    const date = new Date(values[index].value);
-    return formatTime(date);
+    return formatTime(date, this.hass.language);
  }

  drawChart() {
@@ -420,7 +420,7 @@ class HaChartBase extends mixinBehaviors(
        },
      };
      options = Chart.helpers.merge(options, this.data.options);
-      options.scales.xAxes[0].ticks.callback = this._formatTickValue;
+      options.scales.xAxes[0].ticks.callback = this._formatTickValue.bind(this);
      if (this.data.type === "timeline") {
        this.set("isTimeline", true);
        if (this.data.colors !== undefined) {
@@ -15,7 +15,7 @@ import type { HaEntityPickerEntityFilterFunc } from "./ha-entity-picker";

@customElement("ha-entities-picker")
 class HaEntitiesPickerLight extends LitElement {
-  @property() public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property() public value?: string[];

@@ -59,7 +59,7 @@ class HaEntityPicker extends LitElement {
  @property({ type: Boolean, attribute: "allow-custom-entity" })
  public allowCustomEntity;

-  @property() public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property() public label?: string;

@@ -6,6 +6,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -28,7 +29,7 @@ export class HaEntityToggle extends LitElement {

  @property() public stateObj?: HassEntity;

-  @property() private _isOn = false;
+  @internalProperty() private _isOn = false;

  protected render(): TemplateResult {
    if (!this.stateObj) {
@@ -6,6 +6,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -22,7 +23,7 @@ import "../ha-label-badge";

@customElement("ha-state-label-badge")
 export class HaStateLabelBadge extends LitElement {
-  @property() public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property() public state?: HassEntity;

@@ -32,7 +33,7 @@ export class HaStateLabelBadge extends LitElement {

  @property() public image?: string;

-  @property() private _timerTimeRemaining?: number;
+  @internalProperty() private _timerTimeRemaining?: number;

  private _connected?: boolean;

@@ -80,7 +81,7 @@ export class HaStateLabelBadge extends LitElement {
          ? ""
          : this.image
          ? this.image
-          : state.attributes.entity_picture}"
+          : state.attributes.entity_picture_local || state.attributes.entity_picture}"
        .label="${this._computeLabel(domain, state, this._timerTimeRemaining)}"
        .description="${this.name ? this.name : computeStateName(state)}"
      ></ha-label-badge>
@@ -6,6 +6,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
@@ -31,7 +32,7 @@ export class StateBadge extends LitElement {
  @property({ type: Boolean, reflect: true, attribute: "icon" })
  private _showIcon = true;

-  @property() private _iconStyle: { [name: string]: string } = {};
+  @internalProperty() private _iconStyle: { [name: string]: string } = {};

  protected render(): TemplateResult {
    const stateObj = this.stateObj;
@@ -72,10 +73,10 @@ export class StateBadge extends LitElement {
    if (stateObj) {
      // hide icon if we have entity picture
      if (
-        (stateObj.attributes.entity_picture && !this.overrideIcon) ||
+        ((stateObj.attributes.entity_picture_local || stateObj.attributes.entity_picture) && !this.overrideIcon) ||
        this.overrideImage
      ) {
-        let imageUrl = this.overrideImage || stateObj.attributes.entity_picture;
+        let imageUrl = this.overrideImage || stateObj.attributes.entity_picture_local || stateObj.attributes.entity_picture;
        if (this.hass) {
          imageUrl = this.hass.hassUrl(imageUrl);
        }
@@ -12,6 +12,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import { fireEvent } from "../common/dom/fire_event";
@@ -61,7 +62,7 @@ const rowRenderer = (

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

  @property() public label?: string;

@@ -72,7 +73,7 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
  @property({ type: Boolean, attribute: "no-add" })
  public noAdd?: boolean;

-  @property() private _opened?: boolean;
+  @internalProperty() private _opened?: boolean;

  public hassSubscribe(): UnsubscribeFunc[] {
    return [
@@ -17,7 +17,7 @@ let jsYamlPromise: Promise<typeof import("js-yaml")>;
 class HaAttributes extends LitElement {
  @property() public stateObj?: HassEntity;

-  @property() public extraFilters?: string;
+  @property({ attribute: "extra-filters" }) public extraFilters?: string;

  protected render(): TemplateResult {
    if (!this.stateObj) {
@@ -0,0 +1,67 @@
+import {
+  css,
+  CSSResult,
+  customElement,
+  LitElement,
+  property,
+  svg,
+  TemplateResult,
+} from "lit-element";
+
+import {
+  getValueInPercentage,
+  normalize,
+  roundWithOneDecimal,
+} from "../util/calculate";
+
+@customElement("ha-bar")
+export class HaBar extends LitElement {
+  @property({ type: Number }) public min = 0;
+
+  @property({ type: Number }) public max = 100;
+
+  @property({ type: Number }) public value!: number;
+
+  protected render(): TemplateResult {
+    const valuePrecentage = roundWithOneDecimal(
+      getValueInPercentage(
+        normalize(this.value, this.min, this.max),
+        this.min,
+        this.max
+      )
+    );
+
+    return svg`
+      <svg>
+        <g>
+          <rect></rect>
+          <rect width="${valuePrecentage}%"></rect>
+        </g>
+      </svg>
+    `;
+  }
+
+  static get styles(): CSSResult {
+    return css`
+      rect:first-child {
+        width: 100%;
+        fill: var(--ha-bar-background-color, var(--secondary-background-color));
+      }
+      rect:last-child {
+        fill: var(--ha-bar-primary-color, var(--primary-color));
+        rx: var(--ha-bar-border-radius, 4px);
+      }
+      svg {
+        border-radius: var(--ha-bar-border-radius, 4px);
+        height: 12px;
+        width: 100%;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-bar": HaBar;
+  }
+}
@@ -10,7 +10,6 @@ import {
 } from "lit-element";
 import "@material/mwc-button";
 import "@material/mwc-menu";
-import "@material/mwc-list/mwc-list-item";
 import type { Menu, Corner } from "@material/mwc-menu";

 import "./ha-icon-button";
@@ -19,14 +18,30 @@ import "./ha-icon-button";
 export class HaButtonMenu extends LitElement {
  @property() public corner: Corner = "TOP_START";

+  @property({ type: Boolean }) public multi = false;
+
+  @property({ type: Boolean }) public activatable = false;
+
  @query("mwc-menu") private _menu?: Menu;

+  public get items() {
+    return this._menu?.items;
+  }
+
+  public get selected() {
+    return this._menu?.selected;
+  }
+
  protected render(): TemplateResult {
    return html`
      <div @click=${this._handleClick}>
        <slot name="trigger"></slot>
      </div>
-      <mwc-menu .corner=${this.corner}>
+      <mwc-menu
+        .corner=${this.corner}
+        .multi=${this.multi}
+        .activatable=${this.activatable}
+      >
        <slot></slot>
      </mwc-menu>
    `;
@@ -1,21 +1,20 @@
+import "@material/mwc-icon-button/mwc-icon-button";
 import {
+  css,
+  CSSResult,
  customElement,
  html,
-  TemplateResult,
-  property,
  LitElement,
-  CSSResult,
-  css,
+  property,
+  TemplateResult,
 } from "lit-element";
-
-import "./ha-icon-button";
-
 import { fireEvent } from "../common/dom/fire_event";
 import type { ToggleButton } from "../types";
+import "./ha-svg-icon";

@customElement("ha-button-toggle-group")
 export class HaButtonToggleGroup extends LitElement {
-  @property() public buttons!: ToggleButton[];
+  @property({ attribute: false }) public buttons!: ToggleButton[];

  @property() public active?: string;

@@ -23,21 +22,23 @@ export class HaButtonToggleGroup extends LitElement {
    return html`
      <div>
        ${this.buttons.map(
-          (button) => html` <ha-icon-button
-            .label=${button.label}
-            .icon=${button.icon}
-            .value=${button.value}
-            ?active=${this.active === button.value}
-            @click=${this._handleClick}
-          >
-          </ha-icon-button>`
+          (button) => html`
+            <mwc-icon-button
+              .label=${button.label}
+              .value=${button.value}
+              ?active=${this.active === button.value}
+              @click=${this._handleClick}
+            >
+              <ha-svg-icon .path=${button.iconPath}></ha-svg-icon>
+            </mwc-icon-button>
+          `
        )}
      </div>
    `;
  }

  private _handleClick(ev): void {
-    this.active = ev.target.value;
+    this.active = ev.currentTarget.value;
    fireEvent(this, "value-changed", { value: this.active });
  }

@@ -48,12 +49,13 @@ export class HaButtonToggleGroup extends LitElement {
        --mdc-icon-button-size: var(--button-toggle-size, 36px);
        --mdc-icon-size: var(--button-toggle-icon-size, 20px);
      }
-      ha-icon-button {
+      mwc-icon-button {
        border: 1px solid var(--primary-color);
        border-right-width: 0px;
        position: relative;
+        cursor: pointer;
      }
-      ha-icon-button::before {
+      mwc-icon-button::before {
        top: 0;
        left: 0;
        width: 100%;
@@ -65,22 +67,26 @@ export class HaButtonToggleGroup extends LitElement {
        content: "";
        transition: opacity 15ms linear, background-color 15ms linear;
      }
-      ha-icon-button[active]::before {
+      mwc-icon-button[active]::before {
        opacity: var(--mdc-icon-button-ripple-opacity, 0.12);
      }
-      ha-icon-button:first-child {
+      mwc-icon-button:first-child {
        border-radius: 4px 0 0 4px;
      }
-      ha-icon-button:last-child {
+      mwc-icon-button:last-child {
        border-radius: 0 4px 4px 0;
        border-right-width: 1px;
      }
+      mwc-icon-button:only-child {
+        border-radius: 4px;
+        border-right-width: 1px;
+      }
    `;
  }
 }

 declare global {
  interface HTMLElementTagNameMap {
-    "ha-button-toggle-button": HaButtonToggleGroup;
+    "ha-button-toggle-group": HaButtonToggleGroup;
  }
 }
@@ -5,12 +5,15 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  TemplateResult,
 } from "lit-element";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { supportsFeature } from "../common/entity/supports-feature";
+import { nextRender } from "../common/util/render-status";
+import { getExternalConfig } from "../external_app/external_config";
 import {
  CAMERA_SUPPORT_STREAM,
  computeMJPEGStreamUrl,
@@ -22,20 +25,22 @@ type HLSModule = typeof import("hls.js");

@customElement("ha-camera-stream")
 class HaCameraStream extends LitElement {
-  @property() public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property() public stateObj?: CameraEntity;

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

-  @property() private _attached = false;
+  @internalProperty() private _attached = false;

  // We keep track if we should force MJPEG with a string
  // that way it automatically resets if we change entity.
-  @property() private _forceMJPEG: string | undefined = undefined;
+  @internalProperty() private _forceMJPEG: string | undefined = undefined;

  private _hlsPolyfillInstance?: Hls;

+  private _useExoPlayer = false;
+
  public connectedCallback() {
    super.connectedCallback();
    this._attached = true;
@@ -124,22 +129,33 @@ class HaCameraStream extends LitElement {
    return this.shadowRoot!.querySelector("video")!;
  }

+  private async _getUseExoPlayer(): Promise<boolean> {
+    if (!this.hass!.auth.external) {
+      return false;
+    }
+    const externalConfig = await getExternalConfig(this.hass!.auth.external);
+    return externalConfig && externalConfig.hasExoPlayer;
+  }
+
  private async _startHls(): Promise<void> {
    // eslint-disable-next-line
-    const Hls = ((await import(
-      /* webpackChunkName: "hls.js" */ "hls.js"
-    )) as any).default as HLSModule;
-    let hlsSupported = Hls.isSupported();
+    let hls;
    const videoEl = this._videoEl;
+    this._useExoPlayer = await this._getUseExoPlayer();
+    if (!this._useExoPlayer) {
+      hls = ((await import(/* webpackChunkName: "hls.js" */ "hls.js")) as any)
+        .default as HLSModule;
+      let hlsSupported = hls.isSupported();

-    if (!hlsSupported) {
-      hlsSupported =
-        videoEl.canPlayType("application/vnd.apple.mpegurl") !== "";
-    }
+      if (!hlsSupported) {
+        hlsSupported =
+          videoEl.canPlayType("application/vnd.apple.mpegurl") !== "";
+      }

-    if (!hlsSupported) {
-      this._forceMJPEG = this.stateObj!.entity_id;
-      return;
+      if (!hlsSupported) {
+        this._forceMJPEG = this.stateObj!.entity_id;
+        return;
+      }
    }

    try {
@@ -148,8 +164,10 @@ class HaCameraStream extends LitElement {
        this.stateObj!.entity_id
      );

-      if (Hls.isSupported()) {
-        this._renderHLSPolyfill(videoEl, Hls, url);
+      if (this._useExoPlayer) {
+        this._renderHLSExoPlayer(url);
+      } else if (hls.isSupported()) {
+        this._renderHLSPolyfill(videoEl, hls, url);
      } else {
        this._renderHLSNative(videoEl, url);
      }
@@ -162,6 +180,29 @@ class HaCameraStream extends LitElement {
    }
  }

+  private async _renderHLSExoPlayer(url: string) {
+    window.addEventListener("resize", this._resizeExoPlayer);
+    this.updateComplete.then(() => nextRender()).then(this._resizeExoPlayer);
+    this._videoEl.style.visibility = "hidden";
+    await this.hass!.auth.external!.sendMessage({
+      type: "exoplayer/play_hls",
+      payload: new URL(url, window.location.href).toString(),
+    });
+  }
+
+  private _resizeExoPlayer = () => {
+    const rect = this._videoEl.getBoundingClientRect();
+    this.hass!.auth.external!.fireMessage({
+      type: "exoplayer/resize",
+      payload: {
+        left: rect.left,
+        top: rect.top,
+        right: rect.right,
+        bottom: rect.bottom,
+      },
+    });
+  };
+
  private async _renderHLSNative(videoEl: HTMLVideoElement, url: string) {
    videoEl.src = url;
    await new Promise((resolve) =>
@@ -193,11 +234,15 @@ class HaCameraStream extends LitElement {
    fireEvent(this, "iron-resize");
  }

-  private _destroyPolyfill(): void {
+  private _destroyPolyfill() {
    if (this._hlsPolyfillInstance) {
      this._hlsPolyfillInstance.destroy();
      this._hlsPolyfillInstance = undefined;
    }
+    if (this._useExoPlayer) {
+      window.removeEventListener("resize", this._resizeExoPlayer);
+      this.hass!.auth.external!.fireMessage({ type: "exoplayer/stop" });
+    }
  }

  static get styles(): CSSResult {
@@ -9,7 +9,7 @@ import {
 } from "lit-element";

@customElement("ha-card")
-class HaCard extends LitElement {
+export class HaCard extends LitElement {
  @property() public header?: string;

  @property({ type: Boolean, reflect: true }) public outlined = false;
@@ -66,7 +66,7 @@ class HaCard extends LitElement {
      }

      :host ::slotted(.card-actions) {
-        border-top: 1px solid #e8e8e8;
+        border-top: 1px solid var(--divider-color, #e8e8e8);
        padding: 5px 16px;
      }
    `;
@@ -1,6 +1,7 @@
 import { Editor } from "codemirror";
 import {
  customElement,
+  internalProperty,
  property,
  PropertyValues,
  UpdatingElement,
@@ -28,7 +29,7 @@ export class HaCodeEditor extends UpdatingElement {

  @property() public error = false;

-  @property() private _value = "";
+  @internalProperty() private _value = "";

  public set value(value: string) {
    this._value = value;
@@ -100,11 +101,6 @@ export class HaCodeEditor extends UpdatingElement {
      .CodeMirror-scroll {
        max-height: var(--code-mirror-max-height, --code-mirror-height);
      }
-      .CodeMirror-gutters {
-        border-right: 1px solid var(--paper-input-container-color, var(--secondary-text-color));
-        background-color: var(--paper-dialog-background-color, var(--primary-background-color));
-        transition: 0.2s ease border-right;
-      }
      :host(.error-state) .CodeMirror-gutters {
        border-color: var(--error-state-color, red);
      }
@@ -112,7 +108,7 @@ export class HaCodeEditor extends UpdatingElement {
        border-right: 2px solid var(--paper-input-container-focus-color, var(--primary-color));
      }
      .CodeMirror-linenumber {
-        color: var(--paper-dialog-color, var(--primary-text-color));
+        color: var(--paper-dialog-color, var(--secondary-text-color));
      }
      .rtl .CodeMirror-vscrollbar {
        right: auto;
@@ -121,6 +117,100 @@ export class HaCodeEditor extends UpdatingElement {
      .rtl-gutter {
        width: 20px;
      }
+      .CodeMirror-gutters {
+        border-right: 1px solid var(--paper-input-container-color, var(--secondary-text-color));
+        background-color: var(--paper-dialog-background-color, var(--primary-background-color));
+        transition: 0.2s ease border-right;
+      }
+      .cm-s-default.CodeMirror {
+        background-color: var(--code-editor-background-color, var(--card-background-color));
+        color: var(--primary-text-color);
+      }
+      .cm-s-default .CodeMirror-cursor {
+        border-left: 1px solid var(--secondary-text-color);
+      }
+      
+      .cm-s-default div.CodeMirror-selected, .cm-s-default.CodeMirror-focused div.CodeMirror-selected {
+        background: rgba(var(--rgb-primary-color), 0.2);
+      }
+      
+      .cm-s-default .CodeMirror-line::selection,
+      .cm-s-default .CodeMirror-line>span::selection,
+      .cm-s-default .CodeMirror-line>span>span::selection {
+        background: rgba(var(--rgb-primary-color), 0.2);
+      }
+      
+      .cm-s-default .cm-keyword {
+        color: var(--codemirror-keyword, #6262FF);
+      }
+      
+      .cm-s-default .cm-operator {
+        color: var(--codemirror-operator, #cda869);
+      }
+      
+      .cm-s-default .cm-variable-2 {
+        color: var(--codemirror-variable-2, #690);
+      }
+      
+      .cm-s-default .cm-builtin {
+        color: var(--codemirror-builtin, #9B7536);
+      }
+      
+      .cm-s-default .cm-atom {
+        color: var(--codemirror-atom, #F90);
+      }
+      
+      .cm-s-default .cm-number {
+        color: var(--codemirror-number, #ca7841);
+      }
+      
+      .cm-s-default .cm-def {
+        color: var(--codemirror-def, #8DA6CE);
+      }
+      
+      .cm-s-default .cm-string {
+        color: var(--codemirror-string, #07a);
+      }
+      
+      .cm-s-default .cm-string-2 {
+        color: var(--codemirror-string-2, #bd6b18);
+      }
+      
+      .cm-s-default .cm-comment {
+        color: var(--codemirror-comment, #777);
+      }
+      
+      .cm-s-default .cm-variable {
+        color: var(--codemirror-variable, #07a);
+      }
+      
+      .cm-s-default .cm-tag {
+        color: var(--codemirror-tag, #997643);
+      }
+      
+      .cm-s-default .cm-meta {
+        color: var(--codemirror-meta, #000);
+      }
+      
+      .cm-s-default .cm-attribute {
+        color: var(--codemirror-attribute, #d6bb6d);
+      }
+      
+      .cm-s-default .cm-property {
+        color: var(--codemirror-property, #905);
+      }
+      
+      .cm-s-default .cm-qualifier {
+        color: var(--codemirror-qualifier, #690);
+      }
+      
+      .cm-s-default .cm-variable-3  {
+        color: var(--codemirror-variable-3, #07a);
+      }
+
+      .cm-s-default .cm-type {
+        color: var(--codemirror-type, #07a);
+      }
    </style>`;

    this.codemirror = codeMirror(shadowRoot, {
@@ -188,10 +188,10 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
  // origin is wheel center
  // returns {x: X, y: Y} object
  convertToCanvasCoordinates(clientX, clientY) {
-    var svgPoint = this.interactionLayer.createSVGPoint();
+    const svgPoint = this.interactionLayer.createSVGPoint();
    svgPoint.x = clientX;
    svgPoint.y = clientY;
-    var cc = svgPoint.matrixTransform(
+    const cc = svgPoint.matrixTransform(
      this.interactionLayer.getScreenCTM().inverse()
    );
    return { x: cc.x, y: cc.y };
@@ -225,7 +225,7 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
  // Touch events

  onTouchStart(ev) {
-    var touch = ev.changedTouches[0];
+    const touch = ev.changedTouches[0];
    const cc = this.convertToCanvasCoordinates(touch.clientX, touch.clientY);
    // return if we're not on the wheel
    if (!this.isInWheel(cc.x, cc.y)) {
@@ -275,8 +275,8 @@ class HaColorPicker extends EventsMixin(PolymerElement) {

  // Process user input to color
  processUserSelect(ev) {
-    var canvasXY = this.convertToCanvasCoordinates(ev.clientX, ev.clientY);
-    var hs = this.getColor(canvasXY.x, canvasXY.y);
+    const canvasXY = this.convertToCanvasCoordinates(ev.clientX, ev.clientY);
+    const hs = this.getColor(canvasXY.x, canvasXY.y);
    this.onColorSelect(hs);
  }

@@ -319,11 +319,11 @@ class HaColorPicker extends EventsMixin(PolymerElement) {

  // set marker position to the given color
  setMarkerOnColor(hs) {
-    var dist = hs.s * this.radius;
-    var theta = ((hs.h - 180) / 180) * Math.PI;
-    var markerdX = -dist * Math.cos(theta);
-    var markerdY = -dist * Math.sin(theta);
-    var translateString = `translate(${markerdX},${markerdY})`;
+    const dist = hs.s * this.radius;
+    const theta = ((hs.h - 180) / 180) * Math.PI;
+    const markerdX = -dist * Math.cos(theta);
+    const markerdY = -dist * Math.sin(theta);
+    const translateString = `translate(${markerdX},${markerdY})`;
    this.marker.setAttribute("transform", translateString);
    this.tooltip.setAttribute("transform", translateString);
  }
@@ -358,8 +358,8 @@ class HaColorPicker extends EventsMixin(PolymerElement) {

  // get angle (degrees)
  getAngle(dX, dY) {
-    var theta = Math.atan2(-dY, -dX); // radians from the left edge, clockwise = positive
-    var angle = (theta / Math.PI) * 180 + 180; // degrees, clockwise from right
+    const theta = Math.atan2(-dY, -dX); // radians from the left edge, clockwise = positive
+    const angle = (theta / Math.PI) * 180 + 180; // degrees, clockwise from right
    return angle;
  }

@@ -378,9 +378,9 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
   */

  getColor(x, y) {
-    var hue = this.getAngle(x, y); // degrees, clockwise from right
-    var relativeDistance = this.getDistance(x, y); // edge of radius = 1
-    var sat = Math.min(relativeDistance, 1); // Distance from center
+    const hue = this.getAngle(x, y); // degrees, clockwise from right
+    const relativeDistance = this.getDistance(x, y); // edge of radius = 1
+    const sat = Math.min(relativeDistance, 1); // Distance from center
    return { h: hue, s: sat };
  }

@@ -402,9 +402,9 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
      if (this.saturationSegments === 1) {
        hs.s = 1;
      } else {
-        var segmentSize = 1 / this.saturationSegments;
-        var saturationStep = 1 / (this.saturationSegments - 1);
-        var calculatedSat = Math.floor(hs.s / segmentSize) * saturationStep;
+        const segmentSize = 1 / this.saturationSegments;
+        const saturationStep = 1 / (this.saturationSegments - 1);
+        const calculatedSat = Math.floor(hs.s / segmentSize) * saturationStep;
        hs.s = Math.min(calculatedSat, 1);
      }
    }
@@ -477,9 +477,9 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
      hueSegments = hueSegments || 360; // reset 0 segments to 360
      const angleStep = 360 / hueSegments;
      const halfAngleStep = angleStep / 2; // center segments on color
-      for (var angle = 0; angle <= 360; angle += angleStep) {
-        var startAngle = (angle - halfAngleStep) * (Math.PI / 180);
-        var endAngle = (angle + halfAngleStep + 1) * (Math.PI / 180);
+      for (let angle = 0; angle <= 360; angle += angleStep) {
+        const startAngle = (angle - halfAngleStep) * (Math.PI / 180);
+        const endAngle = (angle + halfAngleStep + 1) * (Math.PI / 180);
        context.beginPath();
        context.moveTo(cX, cY);
        context.arc(
@@ -492,7 +492,7 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
        );
        context.closePath();
        // gradient
-        var gradient = context.createRadialGradient(
+        const gradient = context.createRadialGradient(
          cX,
          cY,
          0,
@@ -507,8 +507,8 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
        if (saturationSegments > 0) {
          const ratioStep = 1 / saturationSegments;
          let ratio = 0;
-          for (var stop = 1; stop < saturationSegments; stop += 1) {
-            var prevLighness = lightness;
+          for (let stop = 1; stop < saturationSegments; stop += 1) {
+            const prevLighness = lightness;
            ratio = stop * ratioStep;
            lightness = 100 - 50 * ratio;
            gradient.addColorStop(
@@ -95,7 +95,7 @@ class HaCoverControls extends PolymerElement {
    if (stateObj.state === UNAVAILABLE) {
      return true;
    }
-    var assumedState = stateObj.attributes.assumed_state === true;
+    const assumedState = stateObj.attributes.assumed_state === true;
    return (entityObj.isFullyOpen || entityObj.isOpening) && !assumedState;
  }

@@ -103,7 +103,7 @@ class HaCoverControls extends PolymerElement {
    if (stateObj.state === UNAVAILABLE) {
      return true;
    }
-    var assumedState = stateObj.attributes.assumed_state === true;
+    const assumedState = stateObj.attributes.assumed_state === true;
    return (entityObj.isFullyClosed || entityObj.isClosing) && !assumedState;
  }

@@ -75,7 +75,7 @@ class HaCoverTiltControls extends PolymerElement {
    if (stateObj.state === UNAVAILABLE) {
      return true;
    }
-    var assumedState = stateObj.attributes.assumed_state === true;
+    const assumedState = stateObj.attributes.assumed_state === true;
    return entityObj.isFullyOpenTilt && !assumedState;
  }

@@ -83,7 +83,7 @@ class HaCoverTiltControls extends PolymerElement {
    if (stateObj.state === UNAVAILABLE) {
      return true;
    }
-    var assumedState = stateObj.attributes.assumed_state === true;
+    const assumedState = stateObj.attributes.assumed_state === true;
    return entityObj.isFullyClosedTilt && !assumedState;
  }

@@ -17,6 +17,8 @@ import "./ha-svg-icon";
 import "@polymer/paper-input/paper-input";
 import "@material/mwc-list/mwc-list";
 import "./date-range-picker";
+import { computeRTLDirection } from "../common/util/compute_rtl";
+import { ActionDetail } from "@material/mwc-list/mwc-list-foundation";

 export interface DateRangePickerRanges {
  [key: string]: [Date, Date];
@@ -24,7 +26,7 @@ export interface DateRangePickerRanges {

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

  @property() public startDate!: Date;

@@ -36,11 +38,14 @@ export class HaDateRangePicker extends LitElement {

  @property({ type: Boolean }) private _hour24format = false;

+  @property({ type: String }) private _rtlDirection = "ltr";
+
  protected updated(changedProps: PropertyValues) {
    if (changedProps.has("hass")) {
      const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
      if (!oldHass || oldHass.language !== this.hass.language) {
        this._hour24format = this._compute24hourFormat();
+        this._rtlDirection = computeRTLDirection(this.hass);
      }
    }
  }
@@ -76,16 +81,14 @@ export class HaDateRangePicker extends LitElement {
          ></paper-input>
        </div>
        ${this.ranges
-          ? html`<div slot="ranges" class="date-range-ranges">
-              <mwc-list @click=${this._setDateRange}>
-                ${Object.entries(this.ranges).map(
-                  ([name, dates]) => html`<mwc-list-item
-                    .activated=${this.startDate.getTime() ===
-                      dates[0].getTime() &&
-                    this.endDate.getTime() === dates[1].getTime()}
-                    .startDate=${dates[0]}
-                    .endDate=${dates[1]}
-                  >
+          ? html`<div
+              slot="ranges"
+              class="date-range-ranges"
+              .dir=${this._rtlDirection}
+            >
+              <mwc-list @action=${this._setDateRange} activatable>
+                ${Object.keys(this.ranges).map(
+                  (name) => html`<mwc-list-item>
                    ${name}
                  </mwc-list-item>`
                )}
@@ -116,12 +119,10 @@ export class HaDateRangePicker extends LitElement {
    );
  }

-  private _setDateRange(ev: Event) {
-    const target = ev.target as any;
-    const startDate = target.startDate;
-    const endDate = target.endDate;
+  private _setDateRange(ev: CustomEvent<ActionDetail>) {
+    const dateRange = Object.values(this.ranges!)[ev.detail.index];
    const dateRangePicker = this._dateRangePicker;
-    dateRangePicker.clickRange([startDate, endDate]);
+    dateRangePicker.clickRange(dateRange);
    dateRangePicker.clickedApply();
  }

@@ -162,13 +163,6 @@ export class HaDateRangePicker extends LitElement {
        border-right: 1px solid var(--divider-color);
      }

-      @media only screen and (max-width: 800px) {
-        .date-range-ranges {
-          border-right: none;
-          border-bottom: 1px solid var(--divider-color);
-        }
-      }
-
      .date-range-footer {
        display: flex;
        justify-content: flex-end;
@@ -178,12 +172,30 @@ export class HaDateRangePicker extends LitElement {

      paper-input {
        display: inline-block;
-        max-width: 200px;
+        max-width: 250px;
+        min-width: 200px;
      }

      paper-input:last-child {
        margin-left: 8px;
      }
+
+      @media only screen and (max-width: 800px) {
+        .date-range-ranges {
+          border-right: none;
+          border-bottom: 1px solid var(--divider-color);
+        }
+      }
+
+      @media only screen and (max-width: 500px) {
+        paper-input {
+          min-width: inherit;
+        }
+
+        ha-svg-icon {
+          display: none;
+        }
+      }
    `;
  }
 }
@@ -5,7 +5,7 @@ import "./ha-icon-button";
 import { css, CSSResult, customElement, html } from "lit-element";
 import type { Constructor, HomeAssistant } from "../types";
 import { mdiClose } from "@mdi/js";
-import { computeRTL } from "../common/util/compute_rtl";
+import { computeRTLDirection } from "../common/util/compute_rtl";

 const MwcDialog = customElements.get("mwc-dialog") as Constructor<Dialog>;

@@ -14,8 +14,8 @@ export const createCloseHeading = (hass: HomeAssistant, title: string) => html`
  <mwc-icon-button
    aria-label=${hass.localize("ui.dialogs.generic.close")}
    dialogAction="close"
-    ?rtl=${computeRTL(hass)}
    class="header_button"
+    dir=${computeRTLDirection(hass)}
  >
    <ha-svg-icon path=${mdiClose}></ha-svg-icon>
  </mwc-icon-button>
@@ -34,10 +34,12 @@ export class HaDialog extends MwcDialog {
      style,
      css`
        .mdc-dialog {
+          --mdc-dialog-scroll-divider-color: var(--divider-color);
          z-index: var(--dialog-z-index, 7);
        }
        .mdc-dialog__actions {
          justify-content: var(--justify-action-buttons, flex-end);
+          padding-bottom: max(env(safe-area-inset-bottom), 8px);
        }
        .mdc-dialog__container {
          align-items: var(--vertial-align-dialog, center);
@@ -50,8 +52,14 @@ export class HaDialog extends MwcDialog {
          position: var(--dialog-content-position, relative);
          padding: var(--dialog-content-padding, 20px 24px);
        }
+        :host([hideactions]) .mdc-dialog .mdc-dialog__content {
+          padding-bottom: max(
+            var(--dialog-content-padding, 20px),
+            env(safe-area-inset-bottom)
+          );
+        }
        .mdc-dialog .mdc-dialog__surface {
-          position: var(--dialog-content-position, relative);
+          position: var(--dialog-surface-position, relative);
          min-height: var(--mdc-dialog-min-height, auto);
        }
        .header_button {
@@ -61,7 +69,7 @@ export class HaDialog extends MwcDialog {
          text-decoration: none;
          color: inherit;
        }
-        mwc-icon-button[rtl].header_button {
+        [dir="rtl"].header_button {
          right: auto;
          left: 16px;
        }
@@ -11,6 +11,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  query,
  TemplateResult,
 } from "lit-element";
@@ -32,7 +33,7 @@ export class HaFormMultiSelect extends LitElement implements HaFormElement {

  @property() public suffix!: string;

-  @property() private _init = false;
+  @internalProperty() private _init = false;

  @query("paper-menu-button") private _input?: HTMLElement;

@@ -6,6 +6,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  query,
  TemplateResult,
 } from "lit-element";
@@ -26,7 +27,7 @@ export class HaFormString extends LitElement implements HaFormElement {

  @property() public suffix!: string;

-  @property() private _unmaskedPassword = false;
+  @internalProperty() private _unmaskedPassword = false;

  @query("paper-input") private _input?: HTMLElement;

@@ -100,7 +100,7 @@ export interface HaFormTimeData {
 }

 export interface HaFormElement extends LitElement {
-  schema: HaFormSchema;
+  schema: HaFormSchema | HaFormSchema[];
  data?: HaFormDataContainer | HaFormData;
  label?: string;
  suffix?: string;
@@ -110,7 +110,7 @@ export interface HaFormElement extends LitElement {
 export class HaForm extends LitElement implements HaFormElement {
  @property() public data!: HaFormDataContainer | HaFormData;

-  @property() public schema!: HaFormSchema;
+  @property() public schema!: HaFormSchema | HaFormSchema[];

  @property() public error;

@@ -190,7 +190,7 @@ export class HaForm extends LitElement implements HaFormElement {
      : "";
  }

-  private _computeError(error, schema: HaFormSchema) {
+  private _computeError(error, schema: HaFormSchema | HaFormSchema[]) {
    return this.computeError ? this.computeError(error, schema) : error;
  }

@@ -203,7 +203,7 @@ export class HaForm extends LitElement implements HaFormElement {

  private _valueChanged(ev: CustomEvent) {
    ev.stopPropagation();
-    const schema = (ev.target as HaFormElement).schema;
+    const schema = (ev.target as HaFormElement).schema as HaFormSchema;
    const data = this.data as HaFormDataContainer;
    data[schema.name] = ev.detail.value;
    fireEvent(this, "value-changed", {
@@ -0,0 +1,143 @@
+import {
+  LitElement,
+  svg,
+  customElement,
+  css,
+  property,
+  internalProperty,
+  PropertyValues,
+} from "lit-element";
+import { styleMap } from "lit-html/directives/style-map";
+import { afterNextRender } from "../common/util/render-status";
+import { ifDefined } from "lit-html/directives/if-defined";
+
+import { getValueInPercentage, normalize } from "../util/calculate";
+
+const getAngle = (value: number, min: number, max: number) => {
+  const percentage = getValueInPercentage(normalize(value, min, max), min, max);
+  return (percentage * 180) / 100;
+};
+
+// Workaround for https://github.com/home-assistant/frontend/issues/6467
+const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+
+@customElement("ha-gauge")
+export class Gauge extends LitElement {
+  @property({ type: Number }) public min = 0;
+
+  @property({ type: Number }) public max = 100;
+
+  @property({ type: Number }) public value = 0;
+
+  @property() public label = "";
+
+  @internalProperty() private _angle = 0;
+
+  @internalProperty() private _updated = false;
+
+  protected firstUpdated(changedProperties: PropertyValues) {
+    super.firstUpdated(changedProperties);
+    // Wait for the first render for the initial animation to work
+    afterNextRender(() => {
+      this._updated = true;
+      this._angle = getAngle(this.value, this.min, this.max);
+      this._rescale_svg();
+    });
+  }
+
+  protected updated(changedProperties: PropertyValues) {
+    super.updated(changedProperties);
+    if (!this._updated || !changedProperties.has("value")) {
+      return;
+    }
+    this._angle = getAngle(this.value, this.min, this.max);
+    this._rescale_svg();
+  }
+
+  protected render() {
+    return svg`
+      <svg viewBox="0 0 100 50" class="gauge">
+        <path
+          class="dial"
+          d="M 10 50 A 40 40 0 0 1 90 50"
+        ></path>
+        <path
+          class="value"
+          d="M 90 50.001 A 40 40 0 0 1 10 50"
+          style=${ifDefined(
+            !isSafari
+              ? styleMap({ transform: `rotate(${this._angle}deg)` })
+              : undefined
+          )}
+          transform=${ifDefined(
+            isSafari ? `rotate(${this._angle} 50 50)` : undefined
+          )}
+        >
+        ${
+          isSafari
+            ? svg`<animateTransform
+                attributeName="transform"
+                type="rotate"
+                from="0 50 50"
+                to="${this._angle} 50 50"
+                dur="1s"
+              />`
+            : ""
+        }
+        </path>
+      </svg>
+      <svg class="text">
+        <text class="value-text">
+          ${this.value} ${this.label}
+        </text>
+      </svg>`;
+  }
+
+  private _rescale_svg() {
+    // Set the viewbox of the SVG containing the value to perfectly
+    // fit the text
+    // That way it will auto-scale correctly
+    const svgRoot = this.shadowRoot!.querySelector(".text")!;
+    const box = svgRoot.querySelector("text")!.getBBox()!;
+    svgRoot.setAttribute(
+      "viewBox",
+      `${box.x} ${box!.y} ${box.width} ${box.height}`
+    );
+  }
+
+  static get styles() {
+    return css`
+      :host {
+        position: relative;
+      }
+      .dial {
+        fill: none;
+        stroke: var(--primary-background-color);
+        stroke-width: 15;
+      }
+      .value {
+        fill: none;
+        stroke-width: 15;
+        stroke: var(--gauge-color);
+        transform-origin: 50% 100%;
+        transition: all 1s ease 0s;
+      }
+      .gauge {
+        display: block;
+      }
+      .text {
+        position: absolute;
+        max-height: 40%;
+        max-width: 55%;
+        left: 50%;
+        bottom: -6%;
+        transform: translate(-50%, 0%);
+      }
+      .value-text {
+        font-size: 50px;
+        fill: var(--primary-text-color);
+        text-anchor: middle;
+      }
+    `;
+  }
+}
@@ -1,6 +1,7 @@
 import {
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
  html,
  customElement,
@@ -13,7 +14,7 @@ import "./ha-svg-icon";
 export class HaIconButtonArrowNext extends LitElement {
  @property({ type: Boolean }) public disabled = false;

-  @property() private _icon = mdiArrowRight;
+  @internalProperty() private _icon = mdiArrowRight;

  public connectedCallback() {
    super.connectedCallback();
@@ -1,6 +1,7 @@
 import {
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
  html,
  customElement,
@@ -13,7 +14,7 @@ import "./ha-svg-icon";
 export class HaIconButtonArrowPrev extends LitElement {
  @property({ type: Boolean }) public disabled = false;

-  @property() private _icon = mdiArrowLeft;
+  @internalProperty() private _icon = mdiArrowLeft;

  public connectedCallback() {
    super.connectedCallback();
@@ -1,6 +1,7 @@
 import {
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
  html,
  customElement,
@@ -13,7 +14,7 @@ import "./ha-svg-icon";
 export class HaIconButtonNext extends LitElement {
  @property({ type: Boolean }) public disabled = false;

-  @property() private _icon = mdiChevronRight;
+  @internalProperty() private _icon = mdiChevronRight;

  public connectedCallback() {
    super.connectedCallback();
@@ -1,6 +1,7 @@
 import {
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
  html,
  customElement,
@@ -13,7 +14,7 @@ import "./ha-svg-icon";
 export class HaIconButtonPrev extends LitElement {
  @property({ type: Boolean }) public disabled = false;

-  @property() private _icon = mdiChevronLeft;
+  @internalProperty() private _icon = mdiChevronLeft;

  public connectedCallback() {
    super.connectedCallback();
@@ -3,6 +3,7 @@ import {
  customElement,
  LitElement,
  property,
+  internalProperty,
  PropertyValues,
  html,
  TemplateResult,
@@ -88,7 +89,7 @@ const mdiRenameMapping = {
  "library-movie": "filmstrip-box-multiple",
  "library-music": "music-box-multiple",
  "library-music-outline": "music-box-multiple-outline",
-  "library-video": "play-box-mutiple",
+  "library-video": "play-box-multiple",
  markdown: "language-markdown",
  "markdown-outline": "language-markdown-outline",
  "message-settings-variant": "message-cog",
@@ -105,6 +106,7 @@ const mdiRenameMapping = {
  pot: "pot-steam",
  ruby: "language-ruby",
  sailing: "sail-boat",
+  scooter: "human-scooter",
  settings: "cog",
  "settings-box": "cog-box",
  "settings-outline": "cog-outline",
@@ -150,6 +152,8 @@ const mdiRenameMapping = {
  "textbox-lock": "form-textbox-lock",
  "textbox-password": "form-textbox-password",
  "syllabary-katakana-half-width": "syllabary-katakana-halfwidth",
+  "visual-studio-code": "microsoft-visual-studio-code",
+  "visual-studio": "microsoft-visual-studio",
 };

 const mdiRemovedIcons = new Set([
@@ -190,6 +194,7 @@ const mdiRemovedIcons = new Set([
  "medium",
  "meetup",
  "mixcloud",
+  "mixer",
  "nfc-off",
  "npm-variant",
  "npm-variant-outline",
@@ -233,11 +238,11 @@ const cachedIcons: { [key: string]: string } = {};
 export class HaIcon extends LitElement {
  @property() public icon?: string;

-  @property() private _path?: string;
+  @internalProperty() private _path?: string;

-  @property() private _viewBox?;
+  @internalProperty() private _viewBox?;

-  @property() private _legacy = false;
+  @internalProperty() private _legacy = false;

  protected updated(changedProps: PropertyValues) {
    if (changedProps.has("icon")) {
@@ -15,7 +15,7 @@ class HaLabeledSlider extends PolymerElement {

        .title {
          margin-bottom: 16px;
-          opacity: var(--dark-primary-opacity);
+          color: var(--secondary-text-color);
        }

        .slider-container {
@@ -24,7 +24,7 @@ class HaLabeledSlider extends PolymerElement {

        ha-icon {
          margin-top: 4px;
-          opacity: var(--dark-secondary-opacity);
+          color: var(--secondary-text-color);
        }

        ha-paper-slider {
@@ -23,7 +23,6 @@ class HaMarkdownElement extends UpdatingElement {
      {
        breaks: this.breaks,
        gfm: true,
-        tables: true,
      },
      {
        allowSvg: this.allowSvg,
@@ -57,6 +57,10 @@ class HaMarkdown extends LitElement {
        background-color: var(--markdown-code-background-color, none);
        border-radius: 3px;
      }
+      ha-markdown-element svg {
+        background-color: var(--markdown-svg-background-color, none);
+        color: var(--markdown-svg-color, none);
+      }
      ha-markdown-element code {
        font-size: 85%;
        padding: 0.2em 0.4em;
@@ -70,8 +74,8 @@ class HaMarkdown extends LitElement {
        line-height: 1.45;
      }
      ha-markdown-element h2 {
-        font-size: 1.5em !important;
-        font-weight: bold !important;
+        font-size: 1.5em;
+        font-weight: bold;
      }
    `;
  }
@@ -8,6 +8,7 @@ import {
  html,
  LitElement,
  property,
+  internalProperty,
  TemplateResult,
 } from "lit-element";
 import { fireEvent } from "../common/dom/fire_event";
@@ -22,9 +23,9 @@ class HaMenuButton extends LitElement {

  @property() public narrow!: boolean;

-  @property() public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;

-  @property() private _hasNotifications = false;
+  @internalProperty() private _hasNotifications = false;

  private _alwaysVisible = false;

@@ -0,0 +1,226 @@
+import "@material/mwc-icon-button/mwc-icon-button";
+import { mdiClose, mdiImagePlus } from "@mdi/js";
+import "@polymer/iron-input/iron-input";
+import "@polymer/paper-input/paper-input-container";
+import {
+  css,
+  customElement,
+  html,
+  internalProperty,
+  LitElement,
+  property,
+  PropertyValues,
+  TemplateResult,
+} from "lit-element";
+import { classMap } from "lit-html/directives/class-map";
+import { fireEvent } from "../common/dom/fire_event";
+import { createImage, generateImageThumbnailUrl } from "../data/image";
+import { HomeAssistant } from "../types";
+import "./ha-circular-progress";
+import "./ha-svg-icon";
+import {
+  showImageCropperDialog,
+  CropOptions,
+} from "../dialogs/image-cropper-dialog/show-image-cropper-dialog";
+
+@customElement("ha-picture-upload")
+export class HaPictureUpload extends LitElement {
+  public hass!: HomeAssistant;
+
+  @property() public value: string | null = null;
+
+  @property() public label?: string;
+
+  @property({ type: Boolean }) public crop = false;
+
+  @property({ attribute: false }) public cropOptions?: CropOptions;
+
+  @property({ type: Number }) public size = 512;
+
+  @internalProperty() private _error = "";
+
+  @internalProperty() private _uploading = false;
+
+  @internalProperty() private _drag = false;
+
+  protected updated(changedProperties: PropertyValues) {
+    if (changedProperties.has("_drag")) {
+      (this.shadowRoot!.querySelector(
+        "paper-input-container"
+      ) as any)._setFocused(this._drag);
+    }
+  }
+
+  public render(): TemplateResult {
+    return html`
+      ${this._uploading
+        ? html`<ha-circular-progress
+            alt="Uploading"
+            size="large"
+            active
+          ></ha-circular-progress>`
+        : html`
+            ${this._error ? html`<div class="error">${this._error}</div>` : ""}
+            <label for="input">
+              <paper-input-container
+                .alwaysFloatLabel=${Boolean(this.value)}
+                @drop=${this._handleDrop}
+                @dragenter=${this._handleDragStart}
+                @dragover=${this._handleDragStart}
+                @dragleave=${this._handleDragEnd}
+                @dragend=${this._handleDragEnd}
+                class=${classMap({
+                  dragged: this._drag,
+                })}
+              >
+                <label for="input" slot="label">
+                  ${this.label ||
+                  this.hass.localize("ui.components.picture-upload.label")}
+                </label>
+                <iron-input slot="input">
+                  <input
+                    id="input"
+                    type="file"
+                    class="file"
+                    accept="image/png, image/jpeg, image/gif"
+                    @change=${this._handleFilePicked}
+                  />
+                  ${this.value ? html`<img .src=${this.value} />` : ""}
+                </iron-input>
+                ${this.value
+                  ? html`<mwc-icon-button
+                      slot="suffix"
+                      @click=${this._clearPicture}
+                    >
+                      <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
+                    </mwc-icon-button>`
+                  : html`<mwc-icon-button slot="suffix">
+                      <ha-svg-icon .path=${mdiImagePlus}></ha-svg-icon>
+                    </mwc-icon-button>`}
+              </paper-input-container>
+            </label>
+          `}
+    `;
+  }
+
+  private _handleDrop(ev: DragEvent) {
+    ev.preventDefault();
+    ev.stopPropagation();
+    if (ev.dataTransfer?.files) {
+      if (this.crop) {
+        this._cropFile(ev.dataTransfer.files[0]);
+      } else {
+        this._uploadFile(ev.dataTransfer.files[0]);
+      }
+    }
+    this._drag = false;
+  }
+
+  private _handleDragStart(ev: DragEvent) {
+    ev.preventDefault();
+    ev.stopPropagation();
+    this._drag = true;
+  }
+
+  private _handleDragEnd(ev: DragEvent) {
+    ev.preventDefault();
+    ev.stopPropagation();
+    this._drag = false;
+  }
+
+  private async _handleFilePicked(ev) {
+    if (this.crop) {
+      this._cropFile(ev.target.files[0]);
+    } else {
+      this._uploadFile(ev.target.files[0]);
+    }
+  }
+
+  private async _cropFile(file: File) {
+    if (!["image/png", "image/jpeg", "image/gif"].includes(file.type)) {
+      this._error = this.hass.localize(
+        "ui.components.picture-upload.unsupported_format"
+      );
+      return;
+    }
+    showImageCropperDialog(this, {
+      file,
+      options: this.cropOptions || {
+        round: false,
+        aspectRatio: NaN,
+      },
+      croppedCallback: (croppedFile) => {
+        this._uploadFile(croppedFile);
+      },
+    });
+  }
+
+  private async _uploadFile(file: File) {
+    if (!["image/png", "image/jpeg", "image/gif"].includes(file.type)) {
+      this._error = this.hass.localize(
+        "ui.components.picture-upload.unsupported_format"
+      );
+      return;
+    }
+    this._uploading = true;
+    this._error = "";
+    try {
+      const media = await createImage(this.hass, file);
+      this.value = generateImageThumbnailUrl(media.id, this.size);
+      fireEvent(this, "change");
+    } catch (err) {
+      this._error = err.toString();
+    } finally {
+      this._uploading = false;
+    }
+  }
+
+  private _clearPicture(ev: Event) {
+    ev.preventDefault();
+    this.value = null;
+    this._error = "";
+    fireEvent(this, "change");
+  }
+
+  static get styles() {
+    return css`
+      .error {
+        color: var(--error-color);
+      }
+      paper-input-container {
+        position: relative;
+        padding: 8px;
+        margin: 0 -8px;
+      }
+      paper-input-container.dragged:before {
+        position: var(--layout-fit_-_position);
+        top: var(--layout-fit_-_top);
+        right: var(--layout-fit_-_right);
+        bottom: var(--layout-fit_-_bottom);
+        left: var(--layout-fit_-_left);
+        background: currentColor;
+        content: "";
+        opacity: var(--dark-divider-opacity);
+        pointer-events: none;
+        border-radius: 4px;
+      }
+      img {
+        max-width: 125px;
+        max-height: 125px;
+      }
+      input.file {
+        display: none;
+      }
+      mwc-icon-button {
+        --mdc-icon-button-size: 24px;
+        --mdc-icon-size: 20px;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-picture-upload": HaPictureUpload;
+  }
+}
@@ -0,0 +1,20 @@
+import "@material/mwc-radio";
+import type { Radio } from "@material/mwc-radio";
+import { customElement } from "lit-element";
+import type { Constructor } from "../types";
+
+const MwcRadio = customElements.get("mwc-radio") as Constructor<Radio>;
+
+@customElement("ha-radio")
+export class HaRadio extends MwcRadio {
+  public firstUpdated() {
+    super.firstUpdated();
+    this.style.setProperty("--mdc-theme-secondary", "var(--primary-color)");
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-radio": HaRadio;
+  }
+}
--- a/Show More
+++ b/Show More