diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2737b9a696..3529bccbf4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,8 +1,6 @@
 name: Report a bug with the UI, Frontend or Lovelace
-about: Report an issue related to the Home Assistant frontend.
+description: Report an issue related to the Home Assistant frontend.
 labels: bug
-title: ""
-issue_body: true
 body:
   - type: markdown
     attributes:
@@ -97,11 +95,7 @@ body:
         If your issue is about how an entity is shown in the UI, please add the
         state and attributes for all situations. You can find this information
         at Developer Tools -> States.
-      value: |
-        ```yaml
-        # Paste your state here.
-
-        ```
+      render: txt
   - type: textarea
     attributes:
       label: Problem-relevant frontend configuration
@@ -110,29 +104,18 @@ body:
         configuration of the used cards. Fill this out even if it seems
         unimportant to you. Please be sure to remove personal information like
         passwords, private URLs and other credentials.
-      value: |
-        ```yaml
-        # Paste your YAML here.
-
-        ```
+      render: yaml
   - type: textarea
     attributes:
       label: Javascript errors shown in your browser console/inspector
       description: >
         If you come across any Javascript or other error logs, e.g., in your
         browser console/inspector please provide them.
-      value: |
-        ```txt
-        # Paste your logs here.
-
-        ```
-  - type: markdown
+      render: txt
+  - type: textarea
     attributes:
-      value: |
-        ## Additional information
-  - type: markdown
-    attributes:
-      value: |
+      label: Additional information
+      description: >
         If you have any additional information for us, use the field below.
-        Please note, you can attach screenshots or screen recordings here,
-        by dragging and dropping files in the field below.
+        Please note, you can attach screenshots or screen recordings here, by
+        dragging and dropping files in the field below.
diff --git a/cast/src/receiver/layout/hc-lovelace.ts b/cast/src/receiver/layout/hc-lovelace.ts
index be23073207..ba94b42394 100644
--- a/cast/src/receiver/layout/hc-lovelace.ts
+++ b/cast/src/receiver/layout/hc-lovelace.ts
@@ -35,6 +35,7 @@ class HcLovelace extends LitElement {
     }
     const lovelace: Lovelace = {
       config: this.lovelaceConfig,
+      rawConfig: this.lovelaceConfig,
       editMode: false,
       urlPath: this.urlPath!,
       enableFullEditMode: () => undefined,
diff --git a/cast/src/receiver/layout/hc-main.ts b/cast/src/receiver/layout/hc-main.ts
index e035d5dd4e..e8623dfa65 100644
--- a/cast/src/receiver/layout/hc-main.ts
+++ b/cast/src/receiver/layout/hc-main.ts
@@ -221,11 +221,17 @@ export class HcMain extends HassElement {
   }
 
   private async _generateLovelaceConfig() {
-    const { generateLovelaceConfigFromHass } = await import(
-      "../../../../src/panels/lovelace/common/generate-lovelace-config"
+    const { generateLovelaceDashboardStrategy } = await import(
+      "../../../../src/panels/lovelace/strategies/get-strategy"
     );
     this._handleNewLovelaceConfig(
-      await generateLovelaceConfigFromHass(this.hass!)
+      await generateLovelaceDashboardStrategy(
+        {
+          hass: this.hass!,
+          narrow: false,
+        },
+        "original-states"
+      )
     );
   }
 
diff --git a/demo/src/configs/arsaboo/entities.ts b/demo/src/configs/arsaboo/entities.ts
index 63b4909255..ea1de467f2 100644
--- a/demo/src/configs/arsaboo/entities.ts
+++ b/demo/src/configs/arsaboo/entities.ts
@@ -246,11 +246,15 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
 
     "light.living_room_lights": {
       entity_id: "light.living_room_lights",
-      state: "off",
+      state: "on",
       attributes: {
         min_mireds: 111,
         max_mireds: 400,
+        brightness: 175,
+        color_temp: 300,
+        supported_color_modes: ["brightness", "color_temp"],
         friendly_name: "Living Room Lights",
+        color_mode: "color_temp",
         supported_features: 55,
       },
     },
@@ -263,13 +267,27 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
     },
     "light.kitchen_lights": {
       entity_id: "light.kitchen_lights",
+      state: "on",
+      attributes: {
+        min_mireds: 111,
+        max_mireds: 400,
+        brightness: 200,
+        rgb_color: [255, 175, 96],
+        supported_color_modes: ["brightness", "color_temp", "rgb"],
+        color_mode: "rgb",
+        friendly_name: "Kitchen Lights",
+        supported_features: 55,
+      },
+    },
+    "light.lifx5": {
+      entity_id: "light.lifx5",
       state: "off",
       attributes: {
-        friendly_name: "Kitchen Lights",
+        supported_color_modes: ["brightness"],
+        friendly_name: "Garage Lights",
         supported_features: 1,
       },
     },
-
     "sensor.plexspy": {
       entity_id: "sensor.plexspy",
       state: "0",
@@ -482,16 +500,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         icon: "hademo:history",
       },
     },
-    "light.lifx5": {
-      entity_id: "light.lifx5",
-      state: "on",
-      attributes: {
-        min_mireds: 111,
-        max_mireds: 400,
-        friendly_name: "Garage Lights",
-        supported_features: 55,
-      },
-    },
     "sensor.alok_to_home": {
       entity_id: "sensor.alok_to_home",
       state: "41",
diff --git a/demo/src/configs/teachingbirds/entities.ts b/demo/src/configs/teachingbirds/entities.ts
index 4b61b57a36..476eab9219 100644
--- a/demo/src/configs/teachingbirds/entities.ts
+++ b/demo/src/configs/teachingbirds/entities.ts
@@ -1114,6 +1114,9 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         min_mireds: 153,
         max_mireds: 500,
         brightness: 63,
+        color_temp: 200,
+        supported_color_modes: ["brightness", "color_temp", "rgb"],
+        color_mode: "color_temp",
         friendly_name: "Upstairs lights",
         supported_features: 63,
         custom_ui_state_card: "state-card-custom-ui",
@@ -1125,6 +1128,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
       attributes: {
         friendly_name: "Walk in closet lights",
         supported_features: 41,
+        supported_color_modes: ["brightness", "color_temp"],
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:wall-sconce",
       },
@@ -1136,6 +1140,8 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         brightness: 254,
         friendly_name: "Outdoor lights",
         supported_features: 41,
+        supported_color_modes: ["brightness"],
+        color_mode: "brightness",
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:wall-sconce",
       },
@@ -1148,6 +1154,8 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         max_mireds: 500,
         brightness: 128,
         color_temp: 366,
+        supported_color_modes: ["brightness", "color_temp", "rgb"],
+        color_mode: "color_temp",
         effect_list: ["colorloop"],
         friendly_name: "Downstairs lights",
         supported_features: 63,
@@ -1307,6 +1315,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
       attributes: {
         min_mireds: 153,
         max_mireds: 500,
+        supported_color_modes: ["brightness", "color_temp"],
         is_deconz_group: false,
         friendly_name: "Bedside Lamp",
         supported_features: 63,
@@ -1320,6 +1329,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
       attributes: {
         min_mireds: 153,
         max_mireds: 500,
+        supported_color_modes: ["brightness", "color_temp"],
         is_deconz_group: false,
         friendly_name: "Floorlamp Reading Light",
         supported_features: 43,
@@ -1335,6 +1345,8 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         max_mireds: 500,
         brightness: 128,
         color_temp: 366,
+        supported_color_modes: ["brightness", "color_temp", "rgb"],
+        color_mode: "color_temp",
         effect_list: ["colorloop"],
         is_deconz_group: false,
         friendly_name: "Hallway window light",
@@ -1349,6 +1361,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
       attributes: {
         brightness: 77,
         is_deconz_group: false,
+        supported_color_modes: ["brightness"],
         friendly_name: "Isa Ceiling Light",
         supported_features: 41,
         custom_ui_state_card: "state-card-custom-ui",
@@ -1363,6 +1376,8 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         max_mireds: 500,
         brightness: 150,
         color_temp: 366,
+        supported_color_modes: ["brightness", "color_temp"],
+        color_mode: "color_temp",
         effect_list: ["colorloop"],
         is_deconz_group: false,
         friendly_name: "Floorlamp",
@@ -1377,6 +1392,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
       attributes: {
         friendly_name: "Bedroom Ceiling Light",
         supported_features: 41,
+        supported_color_modes: ["brightness"],
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:ceiling-light",
       },
@@ -1387,6 +1403,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
       attributes: {
         friendly_name: "Nightlight",
         supported_features: 17,
+        supported_color_modes: ["brightness"],
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:lamp",
       },
@@ -1753,6 +1770,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         power_consumption: 2.2,
         friendly_name: "Upstairs Hallway Light",
         supported_features: 33,
+        supported_color_modes: ["brightness"],
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:ceiling-light",
       },
@@ -1768,6 +1786,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         power_consumption: 0,
         friendly_name: "Dining Room Light",
         supported_features: 33,
+        supported_color_modes: ["brightness"],
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:ceiling-light",
       },
@@ -1783,6 +1802,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         power_consumption: 0,
         friendly_name: "Living room Spotlights",
         supported_features: 33,
+        supported_color_modes: ["brightness"],
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:track-light",
       },
@@ -1799,6 +1819,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         power_consumption: 2.5,
         friendly_name: "Passage Lights",
         supported_features: 33,
+        supported_color_modes: ["brightness"],
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:track-light",
       },
@@ -1843,6 +1864,7 @@ export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
         power_consumption: 37.4,
         friendly_name: "Kitchen Lights",
         supported_features: 33,
+        supported_color_modes: ["brightness"],
         custom_ui_state_card: "state-card-custom-ui",
         icon: "mdi:track-light",
       },
diff --git a/gallery/src/demos/demo-integration-card.ts b/gallery/src/demos/demo-integration-card.ts
new file mode 100644
index 0000000000..03a44a1853
--- /dev/null
+++ b/gallery/src/demos/demo-integration-card.ts
@@ -0,0 +1,350 @@
+import {
+  customElement,
+  html,
+  css,
+  internalProperty,
+  LitElement,
+  TemplateResult,
+  property,
+} from "lit-element";
+import "../../../src/components/ha-formfield";
+import "../../../src/components/ha-switch";
+
+import { IntegrationManifest } from "../../../src/data/integration";
+
+import { provideHass } from "../../../src/fake_data/provide_hass";
+import { HomeAssistant } from "../../../src/types";
+import "../../../src/panels/config/integrations/ha-integration-card";
+import "../../../src/panels/config/integrations/ha-ignored-config-entry-card";
+import "../../../src/panels/config/integrations/ha-config-flow-card";
+import type {
+  ConfigEntryExtended,
+  DataEntryFlowProgressExtended,
+} from "../../../src/panels/config/integrations/ha-config-integrations";
+import { DeviceRegistryEntry } from "../../../src/data/device_registry";
+import { EntityRegistryEntry } from "../../../src/data/entity_registry";
+import { classMap } from "lit-html/directives/class-map";
+
+const createConfigEntry = (
+  title: string,
+  override: Partial<ConfigEntryExtended> = {}
+): ConfigEntryExtended => ({
+  entry_id: title,
+  domain: "esphome",
+  localized_domain_name: "ESPHome",
+  title,
+  source: "zeroconf",
+  state: "loaded",
+  connection_class: "local_push",
+  supports_options: false,
+  supports_unload: true,
+  disabled_by: null,
+  reason: null,
+  ...override,
+});
+
+const createManifest = (
+  isCustom: boolean,
+  isCloud: boolean,
+  name = "ESPHome"
+): IntegrationManifest => ({
+  name,
+  domain: "esphome",
+  is_built_in: !isCustom,
+  config_flow: false,
+  documentation: "https://www.home-assistant.io/integrations/esphome/",
+  iot_class: isCloud ? "cloud_polling" : "local_polling",
+});
+
+const loadedEntry = createConfigEntry("Loaded");
+const nameAsDomainEntry = createConfigEntry("ESPHome");
+const longNameEntry = createConfigEntry(
+  "Entry with a super long name that is going to the next line"
+);
+const configPanelEntry = createConfigEntry("Config Panel", {
+  domain: "mqtt",
+  localized_domain_name: "MQTT",
+});
+const optionsFlowEntry = createConfigEntry("Options Flow", {
+  supports_options: true,
+});
+const setupErrorEntry = createConfigEntry("Setup Error", {
+  state: "setup_error",
+});
+const migrationErrorEntry = createConfigEntry("Migration Error", {
+  state: "migration_error",
+});
+const setupRetryEntry = createConfigEntry("Setup Retry", {
+  state: "setup_retry",
+});
+const setupRetryReasonEntry = createConfigEntry("Setup Retry", {
+  state: "setup_retry",
+  reason: "connection_error",
+});
+const setupRetryReasonMissingKeyEntry = createConfigEntry("Setup Retry", {
+  state: "setup_retry",
+  reason: "resolve_error",
+});
+const failedUnloadEntry = createConfigEntry("Failed Unload", {
+  state: "failed_unload",
+});
+const notLoadedEntry = createConfigEntry("Not Loaded", { state: "not_loaded" });
+const disabledEntry = createConfigEntry("Disabled", {
+  state: "not_loaded",
+  disabled_by: "user",
+});
+const disabledFailedUnloadEntry = createConfigEntry(
+  "Disabled - Failed Unload",
+  {
+    state: "failed_unload",
+    disabled_by: "user",
+  }
+);
+
+const configFlows: DataEntryFlowProgressExtended[] = [
+  {
+    flow_id: "adbb401329d8439ebb78ef29837826a8",
+    handler: "roku",
+    context: {
+      source: "ssdp",
+      unique_id: "YF008D862864",
+      title_placeholders: {
+        name: "Living room Roku",
+      },
+    },
+    step_id: "discovery_confirm",
+    localized_title: "Living room Roku",
+  },
+  {
+    flow_id: "adbb401329d8439ebb78ef29837826a8",
+    handler: "hue",
+    context: {
+      source: "reauth",
+      unique_id: "YF008D862864",
+      title_placeholders: {
+        name: "Living room Roku",
+      },
+    },
+    step_id: "discovery_confirm",
+    localized_title: "Philips Hue",
+  },
+];
+
+const configEntries: Array<{
+  items: ConfigEntryExtended[];
+  is_custom?: boolean;
+  disabled?: boolean;
+  highlight?: string;
+}> = [
+  { items: [loadedEntry] },
+  { items: [configPanelEntry] },
+  { items: [optionsFlowEntry] },
+  { items: [nameAsDomainEntry] },
+  { items: [longNameEntry] },
+  { items: [setupErrorEntry] },
+  { items: [migrationErrorEntry] },
+  { items: [setupRetryEntry] },
+  { items: [setupRetryReasonEntry] },
+  { items: [setupRetryReasonMissingKeyEntry] },
+  { items: [failedUnloadEntry] },
+  { items: [notLoadedEntry] },
+  {
+    items: [
+      loadedEntry,
+      setupErrorEntry,
+      migrationErrorEntry,
+      longNameEntry,
+      setupRetryEntry,
+      failedUnloadEntry,
+      notLoadedEntry,
+      disabledEntry,
+      nameAsDomainEntry,
+      configPanelEntry,
+      optionsFlowEntry,
+    ],
+  },
+  { disabled: true, items: [disabledEntry] },
+  { disabled: true, items: [disabledFailedUnloadEntry] },
+  {
+    disabled: true,
+    items: [disabledEntry, disabledFailedUnloadEntry],
+  },
+  {
+    items: [loadedEntry, configPanelEntry],
+    highlight: "Loaded",
+  },
+];
+
+const createEntityRegistryEntries = (
+  item: ConfigEntryExtended
+): EntityRegistryEntry[] => [
+  {
+    config_entry_id: item.entry_id,
+    device_id: "mock-device-id",
+    area_id: null,
+    disabled_by: null,
+    entity_id: "binary_sensor.updater",
+    name: null,
+    icon: null,
+    platform: "updater",
+  },
+];
+
+const createDeviceRegistryEntries = (
+  item: ConfigEntryExtended
+): DeviceRegistryEntry[] => [
+  {
+    entry_type: null,
+    config_entries: [item.entry_id],
+    connections: [],
+    manufacturer: "ESPHome",
+    model: "Mock Device",
+    name: "Tag Reader",
+    sw_version: null,
+    id: "mock-device-id",
+    identifiers: [],
+    via_device_id: null,
+    area_id: null,
+    name_by_user: null,
+    disabled_by: null,
+  },
+];
+
+@customElement("demo-integration-card")
+export class DemoIntegrationCard extends LitElement {
+  @property({ attribute: false }) hass?: HomeAssistant;
+
+  @internalProperty() isCustomIntegration = false;
+
+  @internalProperty() isCloud = false;
+
+  protected render(): TemplateResult {
+    if (!this.hass) {
+      return html``;
+    }
+    return html`
+      <div class="container">
+        <div class="filters">
+          <ha-formfield label="Custom Integration">
+            <ha-switch @change=${this._toggleCustomIntegration}></ha-switch>
+          </ha-formfield>
+          <ha-formfield label="Relies on cloud">
+            <ha-switch @change=${this._toggleCloud}></ha-switch>
+          </ha-formfield>
+        </div>
+
+        <ha-ignored-config-entry-card
+          .hass=${this.hass}
+          .entry=${createConfigEntry("Ignored Entry")}
+          .manifest=${createManifest(this.isCustomIntegration, this.isCloud)}
+        ></ha-ignored-config-entry-card>
+
+        ${configFlows.map(
+          (flow) => html`
+            <ha-config-flow-card
+              .hass=${this.hass}
+              .flow=${flow}
+              .manifest=${createManifest(
+                this.isCustomIntegration,
+                this.isCloud,
+                flow.handler === "roku" ? "Roku" : "Philips Hue"
+              )}
+            ></ha-config-flow-card>
+          `
+        )}
+        ${configEntries.map(
+          (info) => html`
+            <ha-integration-card
+              class=${classMap({
+                highlight: info.highlight !== undefined,
+              })}
+              .hass=${this.hass}
+              domain="esphome"
+              .items=${info.items}
+              .manifest=${createManifest(
+                this.isCustomIntegration,
+                this.isCloud
+              )}
+              .entityRegistryEntries=${createEntityRegistryEntries(
+                info.items[0]
+              )}
+              .deviceRegistryEntries=${createDeviceRegistryEntries(
+                info.items[0]
+              )}
+              ?disabled=${info.disabled}
+              .selectedConfigEntryId=${info.highlight}
+            ></ha-integration-card>
+          `
+        )}
+      </div>
+      <div class="container">
+        <!-- One that is standalone to see how it increases height if height
+           not defined by other cards. -->
+        <ha-integration-card
+          .hass=${this.hass}
+          domain="esphome"
+          .items=${[
+            loadedEntry,
+            setupErrorEntry,
+            migrationErrorEntry,
+            setupRetryEntry,
+            failedUnloadEntry,
+          ]}
+          .manifest=${createManifest(this.isCustomIntegration, this.isCloud)}
+          .entityRegistryEntries=${createEntityRegistryEntries(loadedEntry)}
+          .deviceRegistryEntries=${createDeviceRegistryEntries(loadedEntry)}
+        ></ha-integration-card>
+      </div>
+    `;
+  }
+
+  protected firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+    const hass = provideHass(this);
+    hass.updateTranslations(null, "en");
+    hass.updateTranslations("config", "en");
+    // Normally this string is loaded from backend
+    hass.addTranslations(
+      {
+        "component.esphome.config.error.connection_error":
+          "Can't connect to ESP. Please make sure your YAML file contains an 'api:' line.",
+      },
+      "en"
+    );
+  }
+
+  private _toggleCustomIntegration() {
+    this.isCustomIntegration = !this.isCustomIntegration;
+  }
+
+  private _toggleCloud() {
+    this.isCloud = !this.isCloud;
+  }
+
+  static get styles() {
+    return css`
+      .container {
+        display: grid;
+        grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+        grid-gap: 16px 16px;
+        padding: 8px 16px 16px;
+        margin-bottom: 64px;
+      }
+
+      .container > * {
+        max-width: 500px;
+      }
+
+      ha-formfield {
+        margin: 8px 0;
+        display: block;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-integration-card": DemoIntegrationCard;
+  }
+}
diff --git a/gallery/src/demos/demo-more-info-light.ts b/gallery/src/demos/demo-more-info-light.ts
index d469da2212..399873aa9c 100644
--- a/gallery/src/demos/demo-more-info-light.ts
+++ b/gallery/src/demos/demo-more-info-light.ts
@@ -9,13 +9,10 @@ import {
 } from "lit-element";
 import "../../../src/components/ha-card";
 import {
-  SUPPORT_BRIGHTNESS,
-  SUPPORT_COLOR,
-  SUPPORT_COLOR_TEMP,
+  LightColorModes,
   SUPPORT_EFFECT,
   SUPPORT_FLASH,
   SUPPORT_TRANSITION,
-  SUPPORT_WHITE_VALUE,
 } from "../../../src/data/light";
 import "../../../src/dialogs/more-info/more-info-content";
 import { getEntity } from "../../../src/fake_data/entity";
@@ -32,7 +29,8 @@ const ENTITIES = [
   getEntity("light", "kitchen_light", "on", {
     friendly_name: "Brightness Light",
     brightness: 200,
-    supported_features: SUPPORT_BRIGHTNESS,
+    supported_color_modes: [LightColorModes.BRIGHTNESS],
+    color_mode: LightColorModes.BRIGHTNESS,
   }),
   getEntity("light", "color_temperature_light", "on", {
     friendly_name: "White Color Temperature Light",
@@ -40,20 +38,96 @@ const ENTITIES = [
     color_temp: 75,
     min_mireds: 30,
     max_mireds: 150,
-    supported_features: SUPPORT_BRIGHTNESS + SUPPORT_COLOR_TEMP,
+    supported_color_modes: [
+      LightColorModes.BRIGHTNESS,
+      LightColorModes.COLOR_TEMP,
+    ],
+    color_mode: LightColorModes.COLOR_TEMP,
   }),
-  getEntity("light", "color_effectslight", "on", {
-    friendly_name: "Color Effets Light",
+  getEntity("light", "color_hs_light", "on", {
+    friendly_name: "Color HS Light",
     brightness: 255,
     hs_color: [30, 100],
-    white_value: 36,
-    supported_features:
-      SUPPORT_BRIGHTNESS +
-      SUPPORT_EFFECT +
-      SUPPORT_FLASH +
-      SUPPORT_COLOR +
-      SUPPORT_TRANSITION +
-      SUPPORT_WHITE_VALUE,
+    rgb_color: [30, 100, 255],
+    min_mireds: 30,
+    max_mireds: 150,
+    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_color_modes: [
+      LightColorModes.BRIGHTNESS,
+      LightColorModes.COLOR_TEMP,
+      LightColorModes.HS,
+    ],
+    color_mode: LightColorModes.HS,
+    effect_list: ["random", "colorloop"],
+  }),
+  getEntity("light", "color_rgb_ct_light", "on", {
+    friendly_name: "Color RGB + CT Light",
+    brightness: 255,
+    color_temp: 75,
+    min_mireds: 30,
+    max_mireds: 150,
+    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_color_modes: [
+      LightColorModes.BRIGHTNESS,
+      LightColorModes.COLOR_TEMP,
+      LightColorModes.RGB,
+    ],
+    color_mode: LightColorModes.COLOR_TEMP,
+    effect_list: ["random", "colorloop"],
+  }),
+  getEntity("light", "color_RGB_light", "on", {
+    friendly_name: "Color Effets Light",
+    brightness: 255,
+    rgb_color: [30, 100, 255],
+    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_color_modes: [LightColorModes.BRIGHTNESS, LightColorModes.RGB],
+    color_mode: LightColorModes.RGB,
+    effect_list: ["random", "colorloop"],
+  }),
+  getEntity("light", "color_rgbw_light", "on", {
+    friendly_name: "Color RGBW Light",
+    brightness: 255,
+    rgbw_color: [30, 100, 255, 125],
+    min_mireds: 30,
+    max_mireds: 150,
+    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_color_modes: [
+      LightColorModes.BRIGHTNESS,
+      LightColorModes.COLOR_TEMP,
+      LightColorModes.RGBW,
+    ],
+    color_mode: LightColorModes.RGBW,
+    effect_list: ["random", "colorloop"],
+  }),
+  getEntity("light", "color_rgbww_light", "on", {
+    friendly_name: "Color RGBWW Light",
+    brightness: 255,
+    rgbww_color: [30, 100, 255, 125, 10],
+    min_mireds: 30,
+    max_mireds: 150,
+    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_color_modes: [
+      LightColorModes.BRIGHTNESS,
+      LightColorModes.COLOR_TEMP,
+      LightColorModes.RGBWW,
+    ],
+    color_mode: LightColorModes.RGBWW,
+    effect_list: ["random", "colorloop"],
+  }),
+  getEntity("light", "color_xy_light", "on", {
+    friendly_name: "Color XY Light",
+    brightness: 255,
+    xy_color: [30, 100],
+    rgb_color: [30, 100, 255],
+    min_mireds: 30,
+    max_mireds: 150,
+    supported_features: SUPPORT_EFFECT + SUPPORT_FLASH + SUPPORT_TRANSITION,
+    supported_color_modes: [
+      LightColorModes.BRIGHTNESS,
+      LightColorModes.COLOR_TEMP,
+      LightColorModes.XY,
+    ],
+    color_mode: LightColorModes.XY,
     effect_list: ["random", "colorloop"],
   }),
 ];
diff --git a/hassio/src/addon-view/hassio-addon-dashboard.ts b/hassio/src/addon-view/hassio-addon-dashboard.ts
index 4e11853aca..6287c7907d 100644
--- a/hassio/src/addon-view/hassio-addon-dashboard.ts
+++ b/hassio/src/addon-view/hassio-addon-dashboard.ts
@@ -177,8 +177,9 @@ class HassioAddonDashboard extends LitElement {
       const requestedAddon = extractSearchParam("addon");
       if (requestedAddon) {
         const addonsInfo = await fetchHassioAddonsInfo(this.hass);
-        const validAddon = addonsInfo.addons
-          .some((addon) => addon.slug === requestedAddon);
+        const validAddon = addonsInfo.addons.some(
+          (addon) => addon.slug === requestedAddon
+        );
         if (!validAddon) {
           this._error = this.supervisor.localize("my.error_addon_not_found");
         } else {
diff --git a/hassio/src/addon-view/info/hassio-addon-info.ts b/hassio/src/addon-view/info/hassio-addon-info.ts
index e4161971bb..b0f10392fa 100644
--- a/hassio/src/addon-view/info/hassio-addon-info.ts
+++ b/hassio/src/addon-view/info/hassio-addon-info.ts
@@ -242,14 +242,18 @@ class HassioAddonInfo extends LitElement {
               ? html`
                   Current version: ${this.addon.version}
                   <div class="changelog" @click=${this._openChangelog}>
-                    (<span class="changelog-link">${
-                      this.supervisor.localize("addon.dashboard.changelog")}</span
+                    (<span class="changelog-link"
+                      >${this.supervisor.localize(
+                        "addon.dashboard.changelog"
+                      )}</span
                     >)
                   </div>
                 `
-              : html`<span class="changelog-link" @click=${this._openChangelog}>${
-                  this.supervisor.localize("addon.dashboard.changelog")
-                }</span>`}
+              : html`<span class="changelog-link" @click=${this._openChangelog}
+                  >${this.supervisor.localize(
+                    "addon.dashboard.changelog"
+                  )}</span
+                >`}
           </div>
 
           <div class="description light-color">
diff --git a/hassio/src/components/supervisor-metric.ts b/hassio/src/components/supervisor-metric.ts
index 25eabcdf60..5241733876 100644
--- a/hassio/src/components/supervisor-metric.ts
+++ b/hassio/src/components/supervisor-metric.ts
@@ -73,7 +73,7 @@ class SupervisorMetric extends LitElement {
         );
       }
       .value {
-        width: 42px;
+        width: 48px;
         padding-right: 4px;
       }
     `;
diff --git a/hassio/src/hassio-main.ts b/hassio/src/hassio-main.ts
index fd05060c94..e5b8f89530 100644
--- a/hassio/src/hassio-main.ts
+++ b/hassio/src/hassio-main.ts
@@ -44,7 +44,10 @@ export class HassioMain extends SupervisorBaseElement {
     // We changed the navigate event to fire directly on the window, as that's
     // where we are listening for it. However, the older panel_custom will
     // listen on this element for navigation events, so we need to forward them.
-    window.addEventListener("location-changed", (ev) =>
+
+    // Joakim - April 26, 2021
+    // Due to changes in behavior in Google Chrome, we changed navigate to fire on the top element
+    top.addEventListener("location-changed", (ev) =>
       // @ts-ignore
       fireEvent(this, ev.type, ev.detail, {
         bubbles: false,
diff --git a/hassio/src/system/hassio-supervisor-info.ts b/hassio/src/system/hassio-supervisor-info.ts
index 74585bbec2..bfa21d0d69 100644
--- a/hassio/src/system/hassio-supervisor-info.ts
+++ b/hassio/src/system/hassio-supervisor-info.ts
@@ -269,13 +269,15 @@ class HassioSupervisorInfo extends LitElement {
           </b>
           <br /><br />
           ${this.supervisor.localize("system.supervisor.beta_release_items")}
-          <li>Home Assistant Core</li>
-          <li>Home Assistant Supervisor</li>
-          <li>Home Assistant Operating System</li>
+          <ul>
+            <li>Home Assistant Core</li>
+            <li>Home Assistant Supervisor</li>
+            <li>Home Assistant Operating System</li>
+          </ul>
           <br />
-          ${this.supervisor.localize("system.supervisor.join_beta_action")}`,
+          ${this.supervisor.localize("system.supervisor.beta_join_confirm")}`,
         confirmText: this.supervisor.localize(
-          "system.supervisor.beta_join_confirm"
+          "system.supervisor.join_beta_action"
         ),
         dismissText: this.supervisor.localize("common.cancel"),
       });
diff --git a/package.json b/package.json
index d0482825d6..458085538a 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@braintree/sanitize-url": "^5.0.0",
     "@codemirror/commands": "^0.18.0",
     "@codemirror/gutter": "^0.18.0",
-    "@codemirror/highlight": "^0.18.1",
+    "@codemirror/highlight": "^0.18.0",
     "@codemirror/history": "^0.18.0",
     "@codemirror/legacy-modes": "^0.18.0",
     "@codemirror/rectangular-selection": "^0.18.0",
@@ -100,7 +100,6 @@
     "@webcomponents/webcomponentsjs": "^2.2.7",
     "chart.js": "~2.8.0",
     "chartjs-chart-timeline": "^0.3.0",
-    "codemirror": "^5.49.0",
     "comlink": "^4.3.0",
     "core-js": "^3.6.5",
     "cropperjs": "^1.5.7",
@@ -109,7 +108,7 @@
     "fecha": "^4.2.0",
     "fuse.js": "^6.0.0",
     "google-timezones-json": "^1.0.2",
-    "hls.js": "^0.13.2",
+    "hls.js": "^1.0.1",
     "home-assistant-js-websocket": "^5.9.0",
     "idb-keyval": "^3.2.0",
     "intl-messageformat": "^8.3.9",
@@ -139,10 +138,12 @@
     "vue": "^2.6.11",
     "vue2-daterange-picker": "^0.5.1",
     "web-animations-js": "^2.3.2",
-    "workbox-core": "^5.1.3",
-    "workbox-precaching": "^5.1.3",
-    "workbox-routing": "^5.1.3",
-    "workbox-strategies": "^5.1.3",
+    "workbox-cacheable-response": "^6.1.5",
+    "workbox-core": "^6.1.5",
+    "workbox-expiration": "^6.1.5",
+    "workbox-precaching": "^6.1.5",
+    "workbox-routing": "^6.1.5",
+    "workbox-strategies": "^6.1.5",
     "xss": "^1.0.6"
   },
   "devDependencies": {
@@ -167,8 +168,6 @@
     "@types/chai": "^4.1.7",
     "@types/chromecast-caf-receiver": "^5.0.11",
     "@types/chromecast-caf-sender": "^1.0.3",
-    "@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",
@@ -228,14 +227,14 @@
     "terser-webpack-plugin": "^5.1.1",
     "ts-lit-plugin": "^1.2.1",
     "ts-mocha": "^7.0.0",
-    "typescript": "^4.0.3",
+    "typescript": "^4.2.4",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
     "webpack": "^5.24.1",
     "webpack-cli": "^4.5.0",
     "webpack-dev-server": "^3.11.2",
     "webpack-manifest-plugin": "^3.0.0",
-    "workbox-build": "^5.1.3"
+    "workbox-build": "^6.1.5"
   },
   "_comment": "Polymer fixed to 3.1 because 3.2 throws on logbook page",
   "_comment_2": "Fix in https://github.com/Polymer/polymer/pull/5569",
diff --git a/setup.py b/setup.py
index 3e60acb104..18d6b372e6 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20210407.3",
+    version="20210428.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",
diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts
index 3cd85aa5f2..ceabc2b409 100644
--- a/src/auth/ha-authorize.ts
+++ b/src/auth/ha-authorize.ts
@@ -8,6 +8,7 @@ import {
   PropertyValues,
 } from "lit-element";
 import punycode from "punycode";
+import { applyThemesOnElement } from "../common/dom/apply_themes_on_element";
 import { extractSearchParamsObject } from "../common/url/search-params";
 import {
   AuthProvider,
@@ -116,6 +117,20 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
     this._fetchAuthProviders();
     this._fetchDiscoveryInfo();
 
+    if (matchMedia("(prefers-color-scheme: dark)").matches) {
+      applyThemesOnElement(
+        document.documentElement,
+        {
+          default_theme: "default",
+          default_dark_theme: null,
+          themes: {},
+          darkMode: false,
+        },
+        "default",
+        { dark: true }
+      );
+    }
+
     if (!this.redirectUri) {
       return;
     }
diff --git a/src/cast/receiver_messages.ts b/src/cast/receiver_messages.ts
index 460054135d..953d766abd 100644
--- a/src/cast/receiver_messages.ts
+++ b/src/cast/receiver_messages.ts
@@ -62,7 +62,7 @@ export const ensureConnectedCastSession = (cast: CastManager, auth: Auth) => {
     return undefined;
   }
 
-  return new Promise((resolve) => {
+  return new Promise<void>((resolve) => {
     const unsub = cast.addEventListener("connection-changed", () => {
       if (cast.castConnectedToOurHass) {
         unsub();
diff --git a/src/common/color/convert-color.ts b/src/common/color/convert-color.ts
index 29f95b4283..a0716a68e4 100644
--- a/src/common/color/convert-color.ts
+++ b/src/common/color/convert-color.ts
@@ -102,3 +102,18 @@ export const lab2hex = (lab: [number, number, number]): string => {
   const rgb = lab2rgb(lab);
   return rgb2hex(rgb);
 };
+
+export const rgb2hsv = (
+  rgb: [number, number, number]
+): [number, number, number] => {
+  const [r, g, b] = rgb;
+  const v = Math.max(r, g, b);
+  const c = v - Math.min(r, g, b);
+  const h =
+    c && (v === r ? (g - b) / c : v === g ? 2 + (b - r) / c : 4 + (r - g) / c);
+  return [60 * (h < 0 ? h + 6 : h), v && c / v, v];
+};
+
+export const rgb2hs = (rgb: [number, number, number]): [number, number] => {
+  return rgb2hsv(rgb).slice(0, 2) as [number, number];
+};
diff --git a/src/common/dom/apply_themes_on_element.ts b/src/common/dom/apply_themes_on_element.ts
index 926b2eb670..176068c92b 100644
--- a/src/common/dom/apply_themes_on_element.ts
+++ b/src/common/dom/apply_themes_on_element.ts
@@ -70,13 +70,18 @@ export const applyThemesOnElement = (
       themeRules["text-accent-color"] =
         rgbContrast(rgbAccentColor, [33, 33, 33]) < 6 ? "#fff" : "#212121";
     }
+
+    // Nothing was changed
+    if (element._themes?.cacheKey === cacheKey) {
+      return;
+    }
   }
 
   if (selectedTheme && themes.themes[selectedTheme]) {
     themeRules = themes.themes[selectedTheme];
   }
 
-  if (!element._themes && !Object.keys(themeRules).length) {
+  if (!element._themes?.keys && !Object.keys(themeRules).length) {
     // No styles to reset, and no styles to set
     return;
   }
@@ -87,8 +92,8 @@ export const applyThemesOnElement = (
       : undefined;
 
   // Add previous set keys to reset them, and new theme
-  const styles = { ...element._themes, ...newTheme?.styles };
-  element._themes = newTheme?.keys;
+  const styles = { ...element._themes?.keys, ...newTheme?.styles };
+  element._themes = { cacheKey, keys: newTheme?.keys };
 
   // Set and/or reset styles
   if (element.updateStyles) {
diff --git a/src/common/navigate.ts b/src/common/navigate.ts
index e8505ca3d4..7bbc589f29 100644
--- a/src/common/navigate.ts
+++ b/src/common/navigate.ts
@@ -12,20 +12,24 @@ declare global {
 export const navigate = (_node: any, path: string, replace = false) => {
   if (__DEMO__) {
     if (replace) {
-      history.replaceState(
-        history.state?.root ? { root: true } : null,
+      top.history.replaceState(
+        top.history.state?.root ? { root: true } : null,
         "",
-        `${location.pathname}#${path}`
+        `${top.location.pathname}#${path}`
       );
     } else {
-      window.location.hash = path;
+      top.location.hash = path;
     }
   } else if (replace) {
-    history.replaceState(history.state?.root ? { root: true } : null, "", path);
+    top.history.replaceState(
+      top.history.state?.root ? { root: true } : null,
+      "",
+      path
+    );
   } else {
-    history.pushState(null, "", path);
+    top.history.pushState(null, "", path);
   }
-  fireEvent(window, "location-changed", {
+  fireEvent(top, "location-changed", {
     replace,
   });
 };
diff --git a/src/common/string/filter/sequence-matching.ts b/src/common/string/filter/sequence-matching.ts
index aa67093497..8c50326fd2 100644
--- a/src/common/string/filter/sequence-matching.ts
+++ b/src/common/string/filter/sequence-matching.ts
@@ -10,10 +10,13 @@ import { fuzzyScore } from "./filter";
  * @return {number} Score representing how well the word matches the filter. Return of 0 means no match.
  */
 
-export const fuzzySequentialMatch = (filter: string, ...words: string[]) => {
+export const fuzzySequentialMatch = (
+  filter: string,
+  item: ScorableTextItem
+) => {
   let topScore = Number.NEGATIVE_INFINITY;
 
-  for (const word of words) {
+  for (const word of item.strings) {
     const scores = fuzzyScore(
       filter,
       filter.toLowerCase(),
@@ -28,13 +31,9 @@ export const fuzzySequentialMatch = (filter: string, ...words: string[]) => {
       continue;
     }
 
-    // The VS Code implementation of filter returns a:
-    //    - Negative score for a good match that starts in the middle of the string
-    //    - Positive score if the match starts at the beginning of the string
-    //    - 0 if the filter string is just barely a match
-    //    - undefined for no match
-    // The "0" return is problematic since .filter() will remove that match, even though a 0 == good match.
-    // So, if we encounter a 0 return, set it to 1 so the match will be included, and still respect ordering.
+    // The VS Code implementation of filter returns a 0 for a weak match.
+    // But if .filter() sees a "0", it considers that a failed match and will remove it.
+    // So, we set score to 1 in these cases so the match will be included, and mostly respect correct ordering.
     const score = scores[0] === 0 ? 1 : scores[0];
 
     if (score > topScore) {
@@ -49,10 +48,22 @@ export const fuzzySequentialMatch = (filter: string, ...words: string[]) => {
   return topScore;
 };
 
+/**
+ * An interface that objects must extend in order to use the fuzzy sequence matcher
+ *
+ * @param {number} score - A number representing the existence and strength of a match.
+ *    - `< 0` means a good match that starts in the middle of the string
+ *    - `> 0` means a good match that starts at the beginning of the string
+ *    - `0` means just barely a match
+ *    - `undefined` means not a match
+ *
+ * @param {string} strings - Array of strings (aliases) representing the item. The filter string will be compared against each of these for a match.
+ *
+ */
+
 export interface ScorableTextItem {
   score?: number;
-  filterText: string;
-  altText?: string;
+  strings: string[];
 }
 
 type FuzzyFilterSort = <T extends ScorableTextItem>(
@@ -63,9 +74,7 @@ type FuzzyFilterSort = <T extends ScorableTextItem>(
 export const fuzzyFilterSort: FuzzyFilterSort = (filter, items) => {
   return items
     .map((item) => {
-      item.score = item.altText
-        ? fuzzySequentialMatch(filter, item.filterText, item.altText)
-        : fuzzySequentialMatch(filter, item.filterText);
+      item.score = fuzzySequentialMatch(filter, item);
       return item;
     })
     .filter((item) => item.score !== undefined)
diff --git a/src/common/string/format_number.ts b/src/common/string/format_number.ts
index 0f171bd0ea..da8af2798a 100644
--- a/src/common/string/format_number.ts
+++ b/src/common/string/format_number.ts
@@ -58,7 +58,7 @@ export const formatNumber = (
       ).format(Number(num));
     }
   }
-  return num ? num.toString() : "";
+  return num.toString();
 };
 
 /**
diff --git a/src/common/util/render-status.ts b/src/common/util/render-status.ts
index b51baffce4..c0319c623c 100644
--- a/src/common/util/render-status.ts
+++ b/src/common/util/render-status.ts
@@ -1,4 +1,4 @@
-export const afterNextRender = (cb: () => void): void => {
+export const afterNextRender = (cb: (value: unknown) => void): void => {
   requestAnimationFrame(() => setTimeout(cb, 0));
 };
 
diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts
index 0b67adcc6a..2fa735f5b6 100644
--- a/src/components/entity/state-badge.ts
+++ b/src/components/entity/state-badge.ts
@@ -15,6 +15,7 @@ import { computeActiveState } from "../../common/entity/compute_active_state";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { stateIcon } from "../../common/entity/state_icon";
 import { iconColorCSS } from "../../common/style/icon_color_css";
+import { getLightRgbColor, LightEntity } from "../../data/light";
 import type { HomeAssistant } from "../../types";
 import "../ha-icon";
 
@@ -99,11 +100,13 @@ export class StateBadge extends LitElement {
         hostStyle.backgroundImage = `url(${imageUrl})`;
         this._showIcon = false;
       } else if (stateObj.state === "on") {
-        if (stateObj.attributes.hs_color && this.stateColor !== false) {
-          const hue = stateObj.attributes.hs_color[0];
-          const sat = stateObj.attributes.hs_color[1];
-          if (sat > 10) {
-            iconStyle.color = `hsl(${hue}, 100%, ${100 - sat / 2}%)`;
+        if (
+          computeStateDomain(stateObj) === "light" &&
+          this.stateColor !== false
+        ) {
+          const rgb = getLightRgbColor(stateObj as LightEntity);
+          if (rgb) {
+            iconStyle.color = `rgb(${rgb.slice(0, 3).join(",")})`;
           }
         }
         if (stateObj.attributes.brightness && this.stateColor !== false) {
diff --git a/src/components/ha-analytics-learn-more.ts b/src/components/ha-analytics-learn-more.ts
index 8b7c756efa..75acdab0b5 100644
--- a/src/components/ha-analytics-learn-more.ts
+++ b/src/components/ha-analytics-learn-more.ts
@@ -6,5 +6,6 @@ export const analyticsLearnMore = (hass: HomeAssistant) => html`<a
   .href=${documentationUrl(hass, "/integrations/analytics/")}
   target="_blank"
   rel="noreferrer"
-  >${hass.localize("ui.panel.config.core.section.core.analytics.learn_more")}</a
->`;
+>
+  How we process your data
+</a>`;
diff --git a/src/components/ha-analytics.ts b/src/components/ha-analytics.ts
index 6cf9d37b07..f6d40fe356 100644
--- a/src/components/ha-analytics.ts
+++ b/src/components/ha-analytics.ts
@@ -8,7 +8,6 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
-import { isComponentLoaded } from "../common/config/is_component_loaded";
 import { fireEvent } from "../common/dom/fire_event";
 import { Analytics, AnalyticsPreferences } from "../data/analytics";
 import { haStyle } from "../resources/styles";
@@ -17,7 +16,18 @@ import "./ha-checkbox";
 import type { HaCheckbox } from "./ha-checkbox";
 import "./ha-settings-row";
 
-const ADDITIONAL_PREFERENCES = ["usage", "statistics"];
+const ADDITIONAL_PREFERENCES = [
+  {
+    key: "usage",
+    title: "Usage",
+    description: "Details of what you use with Home Assistant",
+  },
+  {
+    key: "statistics",
+    title: "Statistical data",
+    description: "Counts containing total number of datapoints",
+  },
+];
 
 declare global {
   interface HASSDomEvents {
@@ -48,14 +58,10 @@ export class HaAnalytics extends LitElement {
           </ha-checkbox>
         </span>
         <span slot="heading" data-for="base">
-          ${this.hass.localize(
-            `ui.panel.config.core.section.core.analytics.preference.base.title`
-          )}
+          Basic analytics
         </span>
         <span slot="description" data-for="base">
-          ${this.hass.localize(
-            `ui.panel.config.core.section.core.analytics.preference.base.description`
-          )}
+          This includes information about your system.
         </span>
       </ha-settings-row>
       ${ADDITIONAL_PREFERENCES.map(
@@ -64,44 +70,23 @@ export class HaAnalytics extends LitElement {
             <span slot="prefix">
               <ha-checkbox
                 @change=${this._handleRowCheckboxClick}
-                .checked=${this.analytics?.preferences[preference]}
-                .preference=${preference}
-                name=${preference}
+                .checked=${this.analytics?.preferences[preference.key]}
+                .preference=${preference.key}
+                name=${preference.key}
               >
               </ha-checkbox>
               ${!baseEnabled
-                ? html`<paper-tooltip animation-delay="0" position="right"
-                    >${this.hass.localize(
-                      "ui.panel.config.core.section.core.analytics.needs_base"
-                    )}
+                ? html`<paper-tooltip animation-delay="0" position="right">
+                    You need to enable basic analytics for this option to be
+                    available
                   </paper-tooltip>`
                 : ""}
             </span>
-            <span slot="heading" data-for=${preference}>
-              ${preference === "usage"
-                ? isComponentLoaded(this.hass, "hassio")
-                  ? this.hass.localize(
-                      `ui.panel.config.core.section.core.analytics.preference.usage_supervisor.title`
-                    )
-                  : this.hass.localize(
-                      `ui.panel.config.core.section.core.analytics.preference.usage.title`
-                    )
-                : this.hass.localize(
-                    `ui.panel.config.core.section.core.analytics.preference.${preference}.title`
-                  )}
+            <span slot="heading" data-for=${preference.key}>
+              ${preference.title}
             </span>
-            <span slot="description" data-for=${preference}>
-              ${preference !== "usage"
-                ? this.hass.localize(
-                    `ui.panel.config.core.section.core.analytics.preference.${preference}.description`
-                  )
-                : isComponentLoaded(this.hass, "hassio")
-                ? this.hass.localize(
-                    `ui.panel.config.core.section.core.analytics.preference.usage_supervisor.description`
-                  )
-                : this.hass.localize(
-                    `ui.panel.config.core.section.core.analytics.preference.usage.description`
-                  )}
+            <span slot="description" data-for=${preference.key}>
+              ${preference.description}
             </span>
           </ha-settings-row>`
       )}
@@ -117,14 +102,10 @@ export class HaAnalytics extends LitElement {
           </ha-checkbox>
         </span>
         <span slot="heading" data-for="diagnostics">
-          ${this.hass.localize(
-            `ui.panel.config.core.section.core.analytics.preference.diagnostics.title`
-          )}
+          Diagnostics
         </span>
         <span slot="description" data-for="diagnostics">
-          ${this.hass.localize(
-            `ui.panel.config.core.section.core.analytics.preference.diagnostics.description`
-          )}
+          Share crash reports when unexpected errors occur.
         </span>
       </ha-settings-row>
     `;
@@ -161,7 +142,10 @@ export class HaAnalytics extends LitElement {
 
     preferences[preference] = checkbox.checked;
 
-    if (ADDITIONAL_PREFERENCES.includes(preference) && checkbox.checked) {
+    if (
+      ADDITIONAL_PREFERENCES.some((entry) => entry.key === preference) &&
+      checkbox.checked
+    ) {
       preferences.base = true;
     } else if (preference === "base" && !checkbox.checked) {
       preferences.usage = false;
diff --git a/src/components/ha-button-toggle-group.ts b/src/components/ha-button-toggle-group.ts
index 33c65cdf82..8facec61bf 100644
--- a/src/components/ha-button-toggle-group.ts
+++ b/src/components/ha-button-toggle-group.ts
@@ -9,6 +9,7 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
+import { styleMap } from "lit-html/directives/style-map";
 import { fireEvent } from "../common/dom/fire_event";
 import type { ToggleButton } from "../types";
 import "./ha-svg-icon";
@@ -19,6 +20,8 @@ export class HaButtonToggleGroup extends LitElement {
 
   @property() public active?: string;
 
+  @property({ type: Boolean }) public fullWidth = false;
+
   protected render(): TemplateResult {
     return html`
       <div>
@@ -33,6 +36,11 @@ export class HaButtonToggleGroup extends LitElement {
                 <ha-svg-icon .path=${button.iconPath}></ha-svg-icon>
               </mwc-icon-button>`
             : html`<mwc-button
+                style=${styleMap({
+                  width: this.fullWidth
+                    ? `${100 / this.buttons.length}%`
+                    : "initial",
+                })}
                 .value=${button.value}
                 ?active=${this.active === button.value}
                 @click=${this._handleClick}
diff --git a/src/components/ha-color-picker.js b/src/components/ha-color-picker.js
index a50601c0ea..0a7f88d54a 100644
--- a/src/components/ha-color-picker.js
+++ b/src/components/ha-color-picker.js
@@ -2,7 +2,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 import { EventsMixin } from "../mixins/events-mixin";
-
+import { rgb2hs } from "../common/color/convert-color";
 /**
  * Color-picker custom element
  *
@@ -114,6 +114,12 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
         observer: "applyHsColor",
       },
 
+      // use these properties to update the state via attributes
+      desiredRgbColor: {
+        type: Object,
+        observer: "applyRgbColor",
+      },
+
       // width, height and radius apply to the coordinates of
       // of the canvas.
       // border width are relative to these numbers
@@ -177,8 +183,11 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
     this.drawMarker();
 
     if (this.desiredHsColor) {
-      this.setMarkerOnColor(this.desiredHsColor);
-      this.applyColorToCanvas(this.desiredHsColor);
+      this.applyHsColor(this.desiredHsColor);
+    }
+
+    if (this.desiredRgbColor) {
+      this.applyRgbColor(this.desiredRgbColor);
     }
 
     this.interactionLayer.addEventListener("mousedown", (ev) =>
@@ -282,12 +291,13 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
   processUserSelect(ev) {
     const canvasXY = this.convertToCanvasCoordinates(ev.clientX, ev.clientY);
     const hs = this.getColor(canvasXY.x, canvasXY.y);
-    this.onColorSelect(hs);
+    const rgb = this.getRgbColor(canvasXY.x, canvasXY.y);
+    this.onColorSelect(hs, rgb);
   }
 
   // apply color to marker position and canvas
-  onColorSelect(hs) {
-    this.setMarkerOnColor(hs); // marker always follows mounse 'raw' hs value (= mouse position)
+  onColorSelect(hs, rgb) {
+    this.setMarkerOnColor(hs); // marker always follows mouse 'raw' hs value (= mouse position)
     if (!this.ignoreSegments) {
       // apply segments if needed
       hs = this.applySegmentFilter(hs);
@@ -301,11 +311,11 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
       // eventually after throttle limit has passed
       clearTimeout(this.ensureFinalSelect);
       this.ensureFinalSelect = setTimeout(() => {
-        this.fireColorSelected(hs); // do it for the final time
+        this.fireColorSelected(hs, rgb); // do it for the final time
       }, this.throttle);
       return;
     }
-    this.fireColorSelected(hs); // do it
+    this.fireColorSelected(hs, rgb); // do it
     this.colorSelectIsThrottled = true;
     setTimeout(() => {
       this.colorSelectIsThrottled = false;
@@ -313,9 +323,9 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
   }
 
   // set color values and fire colorselected event
-  fireColorSelected(hs) {
+  fireColorSelected(hs, rgb) {
     this.hsColor = hs;
-    this.fire("colorselected", { hs: { h: hs.h, s: hs.s } });
+    this.fire("colorselected", { hs, rgb });
   }
 
   /*
@@ -363,6 +373,11 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
     this.applyColorToCanvas(hs);
   }
 
+  applyRgbColor(rgb) {
+    const [h, s] = rgb2hs(rgb);
+    this.applyHsColor({ h, s });
+  }
+
   /*
    * input processing helpers
    */
@@ -395,6 +410,15 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
     return { h: hue, s: sat };
   }
 
+  getRgbColor(x, y) {
+    // get current pixel
+    const imageData = this.backgroundLayer
+      .getContext("2d")
+      .getImageData(x + 250, y + 250, 1, 1);
+    const pixel = imageData.data;
+    return { r: pixel[0], g: pixel[1], b: pixel[2] };
+  }
+
   applySegmentFilter(hs) {
     // apply hue segment steps
     if (this.hueSegments) {
@@ -468,7 +492,7 @@ class HaColorPicker extends EventsMixin(PolymerElement) {
       .getPropertyValue("--wheel-bordercolor")
       .trim();
     const wheelShadow = wheelStyle.getPropertyValue("--wheel-shadow").trim();
-    // extract shadow properties from  CCS variable
+    // extract shadow properties from CSS variable
     // the shadow should be defined as: "10px 5px 5px 0px COLOR"
     if (wheelShadow !== "none") {
       const values = wheelShadow.split("px ");
diff --git a/src/components/ha-hls-player.ts b/src/components/ha-hls-player.ts
index 777684d187..e841993c1b 100644
--- a/src/components/ha-hls-player.ts
+++ b/src/components/ha-hls-player.ts
@@ -1,3 +1,4 @@
+import type HlsType from "hls.js";
 import {
   css,
   CSSResult,
@@ -15,8 +16,6 @@ import { nextRender } from "../common/util/render-status";
 import { getExternalConfig } from "../external_app/external_config";
 import type { HomeAssistant } from "../types";
 
-type HLSModule = typeof import("hls.js");
-
 @customElement("ha-hls-player")
 class HaHLSPlayer extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -43,7 +42,7 @@ class HaHLSPlayer extends LitElement {
 
   @internalProperty() private _attached = false;
 
-  private _hlsPolyfillInstance?: Hls;
+  private _hlsPolyfillInstance?: HlsType;
 
   private _useExoPlayer = false;
 
@@ -107,8 +106,8 @@ class HaHLSPlayer extends LitElement {
     const useExoPlayerPromise = this._getUseExoPlayer();
     const masterPlaylistPromise = fetch(this.url);
 
-    const hls = ((await import("hls.js")) as any).default as HLSModule;
-    let hlsSupported = hls.isSupported();
+    const Hls = (await import("hls.js")).default;
+    let hlsSupported = Hls.isSupported();
 
     if (!hlsSupported) {
       hlsSupported =
@@ -144,8 +143,8 @@ class HaHLSPlayer extends LitElement {
     // If codec is HEVC and ExoPlayer is supported, use ExoPlayer.
     if (this._useExoPlayer && match !== null && match[1] !== undefined) {
       this._renderHLSExoPlayer(playlist_url);
-    } else if (hls.isSupported()) {
-      this._renderHLSPolyfill(videoEl, hls, playlist_url);
+    } else if (Hls.isSupported()) {
+      this._renderHLSPolyfill(videoEl, Hls, playlist_url);
     } else {
       this._renderHLSNative(videoEl, playlist_url);
     }
@@ -182,7 +181,7 @@ class HaHLSPlayer extends LitElement {
 
   private async _renderHLSPolyfill(
     videoEl: HTMLVideoElement,
-    Hls: HLSModule,
+    Hls: typeof HlsType,
     url: string
   ) {
     const hls = new Hls({
diff --git a/src/components/ha-selector/ha-selector-time.ts b/src/components/ha-selector/ha-selector-time.ts
index f573773868..8fb0d530c0 100644
--- a/src/components/ha-selector/ha-selector-time.ts
+++ b/src/components/ha-selector/ha-selector-time.ts
@@ -1,12 +1,9 @@
 import { customElement, html, LitElement, property } from "lit-element";
+import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { TimeSelector } from "../../data/selector";
 import { HomeAssistant } from "../../types";
 import "../paper-time-input";
-
-const test = new Date().toLocaleString();
-const useAMPM = test.includes("AM") || test.includes("PM");
-
 @customElement("ha-selector-time")
 export class HaTimeSelector extends LitElement {
   @property() public hass!: HomeAssistant;
@@ -19,16 +16,24 @@ export class HaTimeSelector extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
+  private _useAmPm = memoizeOne((language: string) => {
+    const test = new Date().toLocaleString(language);
+    return test.includes("AM") || test.includes("PM");
+  });
+
   protected render() {
+    const useAMPM = this._useAmPm(this.hass.locale.language);
+
     const parts = this.value?.split(":") || [];
-    const hours = useAMPM ? parts[0] ?? "12" : parts[0] ?? "0";
+    const hours = parts[0];
 
     return html`
       <paper-time-input
         .label=${this.label}
-        .hour=${useAMPM && Number(hours) > 12 ? Number(hours) - 12 : hours}
-        .min=${parts[1] ?? "00"}
-        .sec=${parts[2] ?? "00"}
+        .hour=${hours &&
+        (useAMPM && Number(hours) > 12 ? Number(hours) - 12 : hours)}
+        .min=${parts[1]}
+        .sec=${parts[2]}
         .format=${useAMPM ? 12 : 24}
         .amPm=${useAMPM && (Number(hours) > 12 ? "PM" : "AM")}
         .disabled=${this.disabled}
@@ -42,12 +47,16 @@ export class HaTimeSelector extends LitElement {
 
   private _timeChanged(ev) {
     let value = ev.target.value;
-    if (useAMPM) {
-      let hours = Number(ev.target.hour);
+    const useAMPM = this._useAmPm(this.hass.locale.language);
+    let hours = Number(ev.target.hour || 0);
+    if (value && useAMPM) {
       if (ev.target.amPm === "PM") {
         hours += 12;
       }
-      value = `${hours}:${ev.target.min}:${ev.target.sec}`;
+      value = `${hours}:${ev.target.min || "00"}:${ev.target.sec || "00"}`;
+    }
+    if (value === this.value) {
+      return;
     }
     fireEvent(this, "value-changed", {
       value,
diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts
index 0d72abc7ee..66152e4f8a 100644
--- a/src/components/ha-service-control.ts
+++ b/src/components/ha-service-control.ts
@@ -1,3 +1,4 @@
+import { mdiHelpCircle } from "@mdi/js";
 import { HassService, HassServiceTarget } from "home-assistant-js-websocket";
 import {
   css,
@@ -18,11 +19,12 @@ import { ENTITY_COMPONENT_DOMAINS } from "../data/entity";
 import { Selector } from "../data/selector";
 import { PolymerChangedEvent } from "../polymer-types";
 import { HomeAssistant } from "../types";
+import { documentationUrl } from "../util/documentation-url";
+import "./ha-checkbox";
 import "./ha-selector/ha-selector";
 import "./ha-service-picker";
 import "./ha-settings-row";
 import "./ha-yaml-editor";
-import "./ha-checkbox";
 import type { HaYamlEditor } from "./ha-yaml-editor";
 
 interface ExtHassService extends Omit<HassService, "fields"> {
@@ -49,6 +51,8 @@ export class HaServiceControl extends LitElement {
     data?: Record<string, any>;
   };
 
+  @internalProperty() private _value!: this["value"];
+
   @property({ reflect: true, type: Boolean }) public narrow!: boolean;
 
   @property({ type: Boolean }) public showAdvanced?: boolean;
@@ -57,7 +61,7 @@ export class HaServiceControl extends LitElement {
 
   @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor;
 
-  protected updated(changedProperties: PropertyValues) {
+  protected updated(changedProperties: PropertyValues<this>) {
     if (!changedProperties.has("value")) {
       return;
     }
@@ -92,21 +96,23 @@ export class HaServiceControl extends LitElement {
         target.device_id = this.value.data.device_id;
       }
 
-      this.value = {
+      this._value = {
         ...this.value,
         target,
         data: { ...this.value.data },
       };
 
-      delete this.value.data!.entity_id;
-      delete this.value.data!.device_id;
-      delete this.value.data!.area_id;
+      delete this._value.data!.entity_id;
+      delete this._value.data!.device_id;
+      delete this._value.data!.area_id;
+    } else {
+      this._value = this.value;
     }
 
-    if (this.value?.data) {
+    if (this._value?.data) {
       const yamlEditor = this._yamlEditor;
-      if (yamlEditor && yamlEditor.value !== this.value.data) {
-        yamlEditor.setValue(this.value.data);
+      if (yamlEditor && yamlEditor.value !== this._value.data) {
+        yamlEditor.setValue(this._value.data);
       }
     }
   }
@@ -151,12 +157,12 @@ export class HaServiceControl extends LitElement {
   });
 
   protected render() {
-    const serviceData = this._getServiceInfo(this.value?.service);
+    const serviceData = this._getServiceInfo(this._value?.service);
 
     const shouldRenderServiceDataYaml =
       (serviceData?.fields.length && !serviceData.hasSelector.length) ||
       (serviceData &&
-        Object.keys(this.value?.data || {}).some(
+        Object.keys(this._value?.data || {}).some(
           (key) => !serviceData!.hasSelector.includes(key)
         ));
 
@@ -171,10 +177,32 @@ export class HaServiceControl extends LitElement {
 
     return html`<ha-service-picker
         .hass=${this.hass}
-        .value=${this.value?.service}
+        .value=${this._value?.service}
         @value-changed=${this._serviceChanged}
       ></ha-service-picker>
-      <p>${serviceData?.description}</p>
+      <div class="description">
+        <p>${serviceData?.description}</p>
+        ${this.value?.service
+          ? html` <a
+              href="${documentationUrl(
+                this.hass,
+                "/integrations/" + computeDomain(this.value?.service)
+              )}"
+              title="${this.hass.localize(
+                "ui.components.service-control.integration_doc"
+              )}"
+              target="_blank"
+              rel="noreferrer"
+            >
+              <mwc-icon-button>
+                <ha-svg-icon
+                  path=${mdiHelpCircle}
+                  class="help-icon"
+                ></ha-svg-icon>
+              </mwc-icon-button>
+            </a>`
+          : ""}
+      </div>
       ${serviceData && "target" in serviceData
         ? html`<ha-settings-row .narrow=${this.narrow}>
             ${hasOptional
@@ -195,19 +223,19 @@ export class HaServiceControl extends LitElement {
                 ? { target: serviceData.target }
                 : {
                     target: {
-                      entity: { domain: computeDomain(this.value!.service) },
+                      entity: { domain: computeDomain(this._value!.service) },
                     },
                   }}
               @value-changed=${this._targetChanged}
-              .value=${this.value?.target}
+              .value=${this._value?.target}
             ></ha-selector
           ></ha-settings-row>`
         : entityId
         ? html`<ha-entity-picker
             .hass=${this.hass}
-            .value=${this.value?.data?.entity_id}
+            .value=${this._value?.data?.entity_id}
             .label=${entityId.description}
-            .includeDomains=${this._domainFilter(this.value!.service)}
+            .includeDomains=${this._domainFilter(this._value!.service)}
             @value-changed=${this._entityPicked}
             allow-custom-entity
           ></ha-entity-picker>`
@@ -218,15 +246,15 @@ export class HaServiceControl extends LitElement {
               "ui.components.service-control.service_data"
             )}
             .name=${"data"}
-            .defaultValue=${this.value?.data}
+            .defaultValue=${this._value?.data}
             @value-changed=${this._dataChanged}
           ></ha-yaml-editor>`
         : serviceData?.fields.map((dataField) =>
             dataField.selector &&
             (!dataField.advanced ||
               this.showAdvanced ||
-              (this.value?.data &&
-                this.value.data[dataField.key] !== undefined))
+              (this._value?.data &&
+                this._value.data[dataField.key] !== undefined))
               ? html`<ha-settings-row .narrow=${this.narrow}>
                   ${dataField.required
                     ? hasOptional
@@ -235,8 +263,8 @@ export class HaServiceControl extends LitElement {
                     : html`<ha-checkbox
                         .key=${dataField.key}
                         .checked=${this._checkedKeys.has(dataField.key) ||
-                        (this.value?.data &&
-                          this.value.data[dataField.key] !== undefined)}
+                        (this._value?.data &&
+                          this._value.data[dataField.key] !== undefined)}
                         @change=${this._checkboxChanged}
                         slot="prefix"
                       ></ha-checkbox>`}
@@ -245,15 +273,15 @@ export class HaServiceControl extends LitElement {
                   ><ha-selector
                     .disabled=${!dataField.required &&
                     !this._checkedKeys.has(dataField.key) &&
-                    (!this.value?.data ||
-                      this.value.data[dataField.key] === undefined)}
+                    (!this._value?.data ||
+                      this._value.data[dataField.key] === undefined)}
                     .hass=${this.hass}
                     .selector=${dataField.selector}
                     .key=${dataField.key}
                     @value-changed=${this._serviceDataChanged}
-                    .value=${this.value?.data &&
-                    this.value.data[dataField.key] !== undefined
-                      ? this.value.data[dataField.key]
+                    .value=${this._value?.data &&
+                    this._value.data[dataField.key] !== undefined
+                      ? this._value.data[dataField.key]
                       : dataField.default}
                   ></ha-selector
                 ></ha-settings-row>`
@@ -268,13 +296,13 @@ export class HaServiceControl extends LitElement {
       this._checkedKeys.add(key);
     } else {
       this._checkedKeys.delete(key);
-      const data = { ...this.value?.data };
+      const data = { ...this._value?.data };
 
       delete data[key];
 
       fireEvent(this, "value-changed", {
         value: {
-          ...this.value,
+          ...this._value,
           data,
         },
       });
@@ -284,7 +312,7 @@ export class HaServiceControl extends LitElement {
 
   private _serviceChanged(ev: PolymerChangedEvent<string>) {
     ev.stopPropagation();
-    if (ev.detail.value === this.value?.service) {
+    if (ev.detail.value === this._value?.service) {
       return;
     }
     fireEvent(this, "value-changed", {
@@ -295,17 +323,17 @@ export class HaServiceControl extends LitElement {
   private _entityPicked(ev: CustomEvent) {
     ev.stopPropagation();
     const newValue = ev.detail.value;
-    if (this.value?.data?.entity_id === newValue) {
+    if (this._value?.data?.entity_id === newValue) {
       return;
     }
     let value;
-    if (!newValue && this.value?.data) {
-      value = { ...this.value };
+    if (!newValue && this._value?.data) {
+      value = { ...this._value };
       delete value.data.entity_id;
     } else {
       value = {
-        ...this.value,
-        data: { ...this.value?.data, entity_id: ev.detail.value },
+        ...this._value,
+        data: { ...this._value?.data, entity_id: ev.detail.value },
       };
     }
     fireEvent(this, "value-changed", {
@@ -316,15 +344,15 @@ export class HaServiceControl extends LitElement {
   private _targetChanged(ev: CustomEvent) {
     ev.stopPropagation();
     const newValue = ev.detail.value;
-    if (this.value?.target === newValue) {
+    if (this._value?.target === newValue) {
       return;
     }
     let value;
     if (!newValue) {
-      value = { ...this.value };
+      value = { ...this._value };
       delete value.target;
     } else {
-      value = { ...this.value, target: ev.detail.value };
+      value = { ...this._value, target: ev.detail.value };
     }
     fireEvent(this, "value-changed", {
       value,
@@ -336,13 +364,13 @@ export class HaServiceControl extends LitElement {
     const key = (ev.currentTarget as any).key;
     const value = ev.detail.value;
     if (
-      this.value?.data?.[key] === value ||
-      (!this.value?.data?.[key] && (value === "" || value === undefined))
+      this._value?.data?.[key] === value ||
+      (!this._value?.data?.[key] && (value === "" || value === undefined))
     ) {
       return;
     }
 
-    const data = { ...this.value?.data, [key]: value };
+    const data = { ...this._value?.data, [key]: value };
 
     if (value === "" || value === undefined) {
       delete data[key];
@@ -350,7 +378,7 @@ export class HaServiceControl extends LitElement {
 
     fireEvent(this, "value-changed", {
       value: {
-        ...this.value,
+        ...this._value,
         data,
       },
     });
@@ -363,7 +391,7 @@ export class HaServiceControl extends LitElement {
     }
     fireEvent(this, "value-changed", {
       value: {
-        ...this.value,
+        ...this._value,
         data: ev.detail.value,
       },
     });
@@ -406,6 +434,15 @@ export class HaServiceControl extends LitElement {
       ha-checkbox {
         margin-left: -16px;
       }
+      .help-icon {
+        color: var(--secondary-text-color);
+      }
+      .description {
+        justify-content: space-between;
+        display: flex;
+        align-items: center;
+        padding-right: 2px;
+      }
     `;
   }
 }
diff --git a/src/components/paper-time-input.js b/src/components/paper-time-input.js
index c057b3dc36..bc4f442ba7 100644
--- a/src/components/paper-time-input.js
+++ b/src/components/paper-time-input.js
@@ -133,7 +133,7 @@ export class PaperTimeInput extends PolymerElement {
           always-float-label$="[[alwaysFloatInputLabels]]"
           disabled="[[disabled]]"
         >
-          <span suffix="" slot="suffix">:</span>
+          <span suffix slot="suffix">:</span>
         </paper-input>
 
         <!-- Min Input -->
@@ -303,28 +303,28 @@ export class PaperTimeInput extends PolymerElement {
         notify: true,
       },
       /**
-       * Suffix for the hour input
+       * Label for the hour input
        */
       hourLabel: {
         type: String,
         value: "",
       },
       /**
-       * Suffix for the min input
+       * Label for the min input
        */
       minLabel: {
         type: String,
-        value: ":",
+        value: "",
       },
       /**
-       * Suffix for the sec input
+       * Label for the sec input
        */
       secLabel: {
         type: String,
         value: "",
       },
       /**
-       * Suffix for the milli sec input
+       * Label for the milli sec input
        */
       millisecLabel: {
         type: String,
diff --git a/src/components/trace/hat-trace-timeline.ts b/src/components/trace/hat-trace-timeline.ts
index a17cb3c81e..49898be86f 100644
--- a/src/components/trace/hat-trace-timeline.ts
+++ b/src/components/trace/hat-trace-timeline.ts
@@ -314,16 +314,18 @@ class ActionRenderer {
 
     if (defaultExecuted) {
       this._renderEntry(choosePath, `${name}: Default action executed`);
-    } else {
+    } else if (chooseTrace.result) {
       const choiceConfig = this._getDataFromPath(
-        `${this.keys[index]}/choose/${chooseTrace.result?.choice}`
+        `${this.keys[index]}/choose/${chooseTrace.result.choice}`
       ) as ChooseActionChoice | undefined;
       const choiceName = choiceConfig
         ? `${
-            choiceConfig.alias || `Choice ${chooseTrace.result?.choice}`
+            choiceConfig.alias || `Choice ${chooseTrace.result.choice}`
           } executed`
         : `Error: ${chooseTrace.error}`;
       this._renderEntry(choosePath, `${name}: ${choiceName}`);
+    } else {
+      this._renderEntry(choosePath, `${name}: No action taken`);
     }
 
     let i;
diff --git a/src/data/bootstrap_integrations.ts b/src/data/bootstrap_integrations.ts
new file mode 100644
index 0000000000..864cc2efef
--- /dev/null
+++ b/src/data/bootstrap_integrations.ts
@@ -0,0 +1,16 @@
+import { HomeAssistant } from "../types";
+
+export type BootstrapIntegrationsTimings = { [key: string]: number };
+
+export const subscribeBootstrapIntegrations = (
+  hass: HomeAssistant,
+  callback: (message: BootstrapIntegrationsTimings) => void
+) => {
+  const unsubProm = hass.connection.subscribeMessage<
+    BootstrapIntegrationsTimings
+  >((message) => callback(message), {
+    type: "subscribe_bootstrap_integrations",
+  });
+
+  return unsubProm;
+};
diff --git a/src/data/config_entries.ts b/src/data/config_entries.ts
index d75de78536..9bb203c942 100644
--- a/src/data/config_entries.ts
+++ b/src/data/config_entries.ts
@@ -5,11 +5,18 @@ export interface ConfigEntry {
   domain: string;
   title: string;
   source: string;
-  state: string;
+  state:
+    | "loaded"
+    | "setup_error"
+    | "migration_error"
+    | "setup_retry"
+    | "not_loaded"
+    | "failed_unload";
   connection_class: string;
   supports_options: boolean;
   supports_unload: boolean;
-  disabled_by: string | null;
+  disabled_by: "user" | null;
+  reason: string | null;
 }
 
 export interface ConfigEntryMutableParams {
diff --git a/src/data/data_entry_flow.ts b/src/data/data_entry_flow.ts
index d1447b1c74..5a7d8088a8 100644
--- a/src/data/data_entry_flow.ts
+++ b/src/data/data_entry_flow.ts
@@ -28,6 +28,7 @@ export interface DataEntryFlowStepForm {
   data_schema: HaFormSchema[];
   errors: Record<string, string>;
   description_placeholders: Record<string, string>;
+  last_step: boolean | null;
 }
 
 export interface DataEntryFlowStepExternal {
diff --git a/src/data/device_registry.ts b/src/data/device_registry.ts
index 8fc1807586..d2d119d300 100644
--- a/src/data/device_registry.ts
+++ b/src/data/device_registry.ts
@@ -9,13 +9,13 @@ export interface DeviceRegistryEntry {
   config_entries: string[];
   connections: Array<[string, string]>;
   identifiers: Array<[string, string]>;
-  manufacturer: string;
-  model?: string;
-  name?: string;
-  sw_version?: string;
-  via_device_id?: string;
-  area_id?: string;
-  name_by_user?: string;
+  manufacturer: string | null;
+  model: string | null;
+  name: string | null;
+  sw_version: string | null;
+  via_device_id: string | null;
+  area_id: string | null;
+  name_by_user: string | null;
   entry_type: "service" | null;
   disabled_by: string | null;
 }
diff --git a/src/data/entity_registry.ts b/src/data/entity_registry.ts
index 81796ff822..0bf6a5b253 100644
--- a/src/data/entity_registry.ts
+++ b/src/data/entity_registry.ts
@@ -5,12 +5,12 @@ import { HomeAssistant } from "../types";
 
 export interface EntityRegistryEntry {
   entity_id: string;
-  name: string;
-  icon?: string;
+  name: string | null;
+  icon: string | null;
   platform: string;
-  config_entry_id?: string;
-  device_id?: string;
-  area_id?: string;
+  config_entry_id: string | null;
+  device_id: string | null;
+  area_id: string | null;
   disabled_by: string | null;
 }
 
diff --git a/src/data/integration.ts b/src/data/integration.ts
index d8caf1b591..f69a763a7c 100644
--- a/src/data/integration.ts
+++ b/src/data/integration.ts
@@ -15,7 +15,18 @@ export interface IntegrationManifest {
   ssdp?: Array<{ manufacturer?: string; modelName?: string; st?: string }>;
   zeroconf?: string[];
   homekit?: { models: string[] };
-  quality_scale?: string;
+  quality_scale?: "gold" | "internal" | "platinum" | "silver";
+  iot_class:
+    | "assumed_state"
+    | "cloud_polling"
+    | "cloud_push"
+    | "local_polling"
+    | "local_push";
+}
+
+export interface IntegrationSetup {
+  domain: string;
+  seconds?: number;
 }
 
 export const integrationIssuesUrl = (
@@ -38,3 +49,6 @@ export const fetchIntegrationManifest = (
   hass: HomeAssistant,
   integration: string
 ) => hass.callWS<IntegrationManifest>({ type: "manifest/get", integration });
+
+export const fetchIntegrationSetups = (hass: HomeAssistant) =>
+  hass.callWS<IntegrationSetup[]>({ type: "integration/setup_info" });
diff --git a/src/data/light.ts b/src/data/light.ts
index ff0070e7d0..27f335709e 100644
--- a/src/data/light.ts
+++ b/src/data/light.ts
@@ -3,26 +3,82 @@ import {
   HassEntityBase,
 } from "home-assistant-js-websocket";
 
+export enum LightColorModes {
+  UNKNOWN = "unknown",
+  ONOFF = "onoff",
+  BRIGHTNESS = "brightness",
+  COLOR_TEMP = "color_temp",
+  HS = "hs",
+  XY = "xy",
+  RGB = "rgb",
+  RGBW = "rgbw",
+  RGBWW = "rgbww",
+}
+
+const modesSupportingColor = [
+  LightColorModes.HS,
+  LightColorModes.XY,
+  LightColorModes.RGB,
+  LightColorModes.RGBW,
+  LightColorModes.RGBWW,
+];
+
+const modesSupportingDimming = [
+  ...modesSupportingColor,
+  LightColorModes.COLOR_TEMP,
+  LightColorModes.BRIGHTNESS,
+];
+
+export const SUPPORT_EFFECT = 4;
+export const SUPPORT_FLASH = 8;
+export const SUPPORT_TRANSITION = 32;
+
+export const lightSupportsColorMode = (
+  entity: LightEntity,
+  mode: LightColorModes
+) => {
+  return entity.attributes.supported_color_modes?.includes(mode);
+};
+
+export const lightIsInColorMode = (entity: LightEntity) => {
+  return modesSupportingColor.includes(entity.attributes.color_mode);
+};
+
+export const lightSupportsColor = (entity: LightEntity) => {
+  return entity.attributes.supported_color_modes?.some((mode) =>
+    modesSupportingColor.includes(mode)
+  );
+};
+
+export const lightSupportsDimming = (entity: LightEntity) => {
+  return entity.attributes.supported_color_modes?.some((mode) =>
+    modesSupportingDimming.includes(mode)
+  );
+};
+
+export const getLightRgbColor = (entity: LightEntity): number[] | undefined =>
+  entity.attributes.color_mode === LightColorModes.RGBWW
+    ? entity.attributes.rgbww_color
+    : entity.attributes.color_mode === LightColorModes.RGBW
+    ? entity.attributes.rgbw_color
+    : entity.attributes.rgb_color;
+
 interface LightEntityAttributes extends HassEntityAttributeBase {
   min_mireds: number;
   max_mireds: number;
   friendly_name: string;
   brightness: number;
-  hs_color: number[];
+  hs_color: [number, number];
+  rgb_color: [number, number, number];
+  rgbw_color: [number, number, number, number];
+  rgbww_color: [number, number, number, number, number];
   color_temp: number;
-  white_value: number;
   effect?: string;
   effect_list: string[] | null;
+  supported_color_modes: LightColorModes[];
+  color_mode: LightColorModes;
 }
 
 export interface LightEntity extends HassEntityBase {
   attributes: LightEntityAttributes;
 }
-
-export const SUPPORT_BRIGHTNESS = 1;
-export const SUPPORT_COLOR_TEMP = 2;
-export const SUPPORT_EFFECT = 4;
-export const SUPPORT_FLASH = 8;
-export const SUPPORT_COLOR = 16;
-export const SUPPORT_TRANSITION = 32;
-export const SUPPORT_WHITE_VALUE = 128;
diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index 89611b44ef..06c1294053 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -19,6 +19,10 @@ export interface LovelacePanelConfig {
 
 export interface LovelaceConfig {
   title?: string;
+  strategy?: {
+    type: string;
+    options?: Record<string, unknown>;
+  };
   views: LovelaceViewConfig[];
   background?: string;
 }
@@ -77,6 +81,10 @@ export interface LovelaceViewConfig {
   index?: number;
   title?: string;
   type?: string;
+  strategy?: {
+    type: string;
+    options?: Record<string, unknown>;
+  };
   badges?: Array<string | LovelaceBadgeConfig>;
   cards?: LovelaceCardConfig[];
   path?: string;
@@ -94,6 +102,7 @@ export interface LovelaceViewElement extends HTMLElement {
   index?: number;
   cards?: Array<LovelaceCard | HuiErrorCard>;
   badges?: LovelaceBadge[];
+  isStrategy: boolean;
   setConfig(config: LovelaceViewConfig): void;
 }
 
diff --git a/src/data/media-player.ts b/src/data/media-player.ts
index 95b5156c33..143b7e1bf0 100644
--- a/src/data/media-player.ts
+++ b/src/data/media-player.ts
@@ -292,9 +292,11 @@ export const computeMediaControls = (
           ? "hass:pause"
           : "hass:stop",
       action:
-        state === "playing" && !supportsFeature(stateObj, SUPPORT_PAUSE)
-          ? "media_stop"
-          : "media_play_pause",
+        state !== "playing"
+          ? "media_play"
+          : supportsFeature(stateObj, SUPPORT_PAUSE)
+          ? "media_pause"
+          : "media_stop",
     });
   }
 
diff --git a/src/data/service.ts b/src/data/service.ts
index 120d3096c9..5e83fd6741 100644
--- a/src/data/service.ts
+++ b/src/data/service.ts
@@ -6,3 +6,6 @@ export const callExecuteScript = (hass: HomeAssistant, sequence: Action[]) =>
     type: "execute_script",
     sequence,
   });
+
+export const serviceCallWillDisconnect = (domain: string, service: string) =>
+  domain === "homeassistant" && ["restart", "stop"].includes(service);
diff --git a/src/data/system_log.ts b/src/data/system_log.ts
index 865558ebb9..f2acb5f82b 100644
--- a/src/data/system_log.ts
+++ b/src/data/system_log.ts
@@ -16,9 +16,27 @@ export interface LoggedError {
 export const fetchSystemLog = (hass: HomeAssistant) =>
   hass.callApi<LoggedError[]>("GET", "error/all");
 
-export const getLoggedErrorIntegration = (item: LoggedError) =>
-  item.name.startsWith("homeassistant.components.")
-    ? item.name.split(".")[2]
-    : item.name.startsWith("custom_components.")
-    ? item.name.split(".")[1]
-    : undefined;
+export const getLoggedErrorIntegration = (item: LoggedError) => {
+  // Try to derive from logger name
+  if (item.name.startsWith("homeassistant.components.")) {
+    return item.name.split(".")[2];
+  }
+  if (item.name.startsWith("custom_components.")) {
+    return item.name.split(".")[1];
+  }
+
+  // Try to derive from logged location
+  if (item.source[0].startsWith("custom_components/")) {
+    return item.source[0].split("/")[1];
+  }
+
+  if (item.source[0].startsWith("homeassistant/components/")) {
+    return item.source[0].split("/")[2];
+  }
+
+  return undefined;
+};
+
+export const isCustomIntegrationError = (item: LoggedError) =>
+  item.name.startsWith("custom_components.") ||
+  item.source[0].startsWith("custom_components/");
diff --git a/src/data/zha.ts b/src/data/zha.ts
index e57df4078a..5913cf4073 100644
--- a/src/data/zha.ts
+++ b/src/data/zha.ts
@@ -1,4 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
+import { HaFormSchema } from "../components/ha-form/ha-form";
 import { HomeAssistant } from "../types";
 
 export interface ZHAEntityReference extends HassEntity {
@@ -54,6 +55,52 @@ export interface Cluster {
   type: string;
 }
 
+export interface ClusterConfigurationData {
+  cluster_name: string;
+  cluster_id: number;
+  success: boolean;
+}
+
+export interface ClusterAttributeData {
+  cluster_name: string;
+  cluster_id: number;
+  attributes: AttributeConfigurationStatus[];
+}
+
+export interface AttributeConfigurationStatus {
+  id: number;
+  name: string;
+  success: boolean | undefined;
+  min: number;
+  max: number;
+  change: number;
+}
+
+export interface ClusterConfigurationStatus {
+  cluster: Cluster;
+  bindSuccess: boolean | undefined;
+  attributes: Map<number, AttributeConfigurationStatus>;
+}
+
+interface ClusterConfigurationBindEvent {
+  type: "zha_channel_bind";
+  zha_channel_msg_data: ClusterConfigurationData;
+}
+
+interface ClusterConfigurationReportConfigurationEvent {
+  type: "zha_channel_configure_reporting";
+  zha_channel_msg_data: ClusterAttributeData;
+}
+
+interface ClusterConfigurationEventFinish {
+  type: "zha_channel_cfg_done";
+}
+
+export type ClusterConfigurationEvent =
+  | ClusterConfigurationReportConfigurationEvent
+  | ClusterConfigurationBindEvent
+  | ClusterConfigurationEventFinish;
+
 export interface Command {
   name: string;
   id: number;
@@ -75,6 +122,11 @@ export interface ZHAGroup {
   members: ZHADeviceEndpoint[];
 }
 
+export interface ZHAConfiguration {
+  data: Record<string, Record<string, unknown>>;
+  schemas: Record<string, HaFormSchema[]>;
+}
+
 export interface ZHAGroupMember {
   ieee: string;
   endpoint_id: string;
@@ -83,10 +135,10 @@ export interface ZHAGroupMember {
 export const reconfigureNode = (
   hass: HomeAssistant,
   ieeeAddress: string,
-  callbackFunction: any
+  callbackFunction: (message: ClusterConfigurationEvent) => void
 ) => {
   return hass.connection.subscribeMessage(
-    (message) => callbackFunction(message),
+    (message: ClusterConfigurationEvent) => callbackFunction(message),
     {
       type: "zha/devices/reconfigure",
       ieee: ieeeAddress,
@@ -282,6 +334,22 @@ export const addGroup = (
     members: membersToAdd,
   });
 
+export const fetchZHAConfiguration = (
+  hass: HomeAssistant
+): Promise<ZHAConfiguration> =>
+  hass.callWS({
+    type: "zha/configuration",
+  });
+
+export const updateZHAConfiguration = (
+  hass: HomeAssistant,
+  data: any
+): Promise<any> =>
+  hass.callWS({
+    type: "zha/configuration/update",
+    data: data,
+  });
+
 export const INITIALIZED = "INITIALIZED";
 export const INTERVIEW_COMPLETE = "INTERVIEW_COMPLETE";
 export const CONFIGURED = "CONFIGURED";
@@ -301,3 +369,7 @@ export const DEVICE_MESSAGE_TYPES = [
   DEVICE_FULLY_INITIALIZED,
 ];
 export const LOG_OUTPUT = "log_output";
+export const ZHA_CHANNEL_MSG = "zha_channel_message";
+export const ZHA_CHANNEL_MSG_BIND = "zha_channel_bind";
+export const ZHA_CHANNEL_MSG_CFG_RPT = "zha_channel_configure_reporting";
+export const ZHA_CHANNEL_CFG_DONE = "zha_channel_cfg_done";
diff --git a/src/data/zwave_js.ts b/src/data/zwave_js.ts
index d6db70bd21..af5f30436e 100644
--- a/src/data/zwave_js.ts
+++ b/src/data/zwave_js.ts
@@ -1,3 +1,4 @@
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { HomeAssistant } from "../types";
 import { DeviceRegistryEntry } from "./device_registry";
 
@@ -29,6 +30,10 @@ export interface ZWaveJSNode {
 }
 
 export interface ZWaveJSNodeConfigParams {
+  [key: string]: ZWaveJSNodeConfigParam;
+}
+
+export interface ZWaveJSNodeConfigParam {
   property: number;
   value: any;
   configuration_value_type: string;
@@ -56,6 +61,22 @@ export interface ZWaveJSSetConfigParamData {
   value: string | number;
 }
 
+export interface ZWaveJSSetConfigParamResult {
+  value_id?: string;
+  status?: string;
+  error?: string;
+}
+
+export interface ZWaveJSDataCollectionStatus {
+  enabled: boolean;
+  opted_in: boolean;
+}
+
+export interface ZWaveJSRefreshNodeStatusMessage {
+  event: string;
+  stage?: string;
+}
+
 export enum NodeStatus {
   Unknown,
   Asleep,
@@ -75,6 +96,26 @@ export const fetchNetworkStatus = (
     entry_id,
   });
 
+export const fetchDataCollectionStatus = (
+  hass: HomeAssistant,
+  entry_id: string
+): Promise<ZWaveJSDataCollectionStatus> =>
+  hass.callWS({
+    type: "zwave_js/data_collection_status",
+    entry_id,
+  });
+
+export const setDataCollectionPreference = (
+  hass: HomeAssistant,
+  entry_id: string,
+  opted_in: boolean
+): Promise<any> =>
+  hass.callWS({
+    type: "zwave_js/update_data_collection_preference",
+    entry_id,
+    opted_in,
+  });
+
 export const fetchNodeStatus = (
   hass: HomeAssistant,
   entry_id: string,
@@ -90,7 +131,7 @@ export const fetchNodeConfigParameters = (
   hass: HomeAssistant,
   entry_id: string,
   node_id: number
-): Promise<ZWaveJSNodeConfigParams[]> =>
+): Promise<ZWaveJSNodeConfigParams> =>
   hass.callWS({
     type: "zwave_js/get_config_parameters",
     entry_id,
@@ -104,7 +145,7 @@ export const setNodeConfigParameter = (
   property: number,
   value: number,
   property_key?: number
-): Promise<unknown> => {
+): Promise<ZWaveJSSetConfigParamResult> => {
   const data: ZWaveJSSetConfigParamData = {
     type: "zwave_js/set_config_parameter",
     entry_id,
@@ -116,9 +157,25 @@ export const setNodeConfigParameter = (
   return hass.callWS(data);
 };
 
-export const getIdentifiersFromDevice = function (
+export const reinterviewNode = (
+  hass: HomeAssistant,
+  entry_id: string,
+  node_id: number,
+  callbackFunction: (message: ZWaveJSRefreshNodeStatusMessage) => void
+): Promise<UnsubscribeFunc> => {
+  return hass.connection.subscribeMessage(
+    (message: any) => callbackFunction(message),
+    {
+      type: "zwave_js/refresh_node_info",
+      entry_id: entry_id,
+      node_id: node_id,
+    }
+  );
+};
+
+export const getIdentifiersFromDevice = (
   device: DeviceRegistryEntry
-): ZWaveJSNodeIdentifiers | undefined {
+): ZWaveJSNodeIdentifiers | undefined => {
   if (!device) {
     return undefined;
   }
@@ -136,3 +193,48 @@ export const getIdentifiersFromDevice = function (
     home_id: identifiers[0],
   };
 };
+
+export interface ZWaveJSLogMessage {
+  timestamp: string;
+  level: string;
+  primary_tags: string;
+  message: string | string[];
+}
+
+export const subscribeZWaveJSLogs = (
+  hass: HomeAssistant,
+  entry_id: string,
+  callback: (message: ZWaveJSLogMessage) => void
+) =>
+  hass.connection.subscribeMessage<ZWaveJSLogMessage>(callback, {
+    type: "zwave_js/subscribe_logs",
+    entry_id,
+  });
+
+export interface ZWaveJSLogConfig {
+  level: string;
+  enabled: boolean;
+  filename: string;
+  log_to_file: boolean;
+  force_console: boolean;
+}
+
+export const fetchZWaveJSLogConfig = (
+  hass: HomeAssistant,
+  entry_id: string
+): Promise<ZWaveJSLogConfig> =>
+  hass.callWS({
+    type: "zwave_js/get_log_config",
+    entry_id,
+  });
+
+export const setZWaveJSLogLevel = (
+  hass: HomeAssistant,
+  entry_id: string,
+  level: string
+): Promise<ZWaveJSLogConfig> =>
+  hass.callWS({
+    type: "zwave_js/update_log_config",
+    entry_id,
+    config: { level },
+  });
diff --git a/src/dialogs/make-dialog-manager.ts b/src/dialogs/make-dialog-manager.ts
index a7c496d960..bc32b08050 100644
--- a/src/dialogs/make-dialog-manager.ts
+++ b/src/dialogs/make-dialog-manager.ts
@@ -45,7 +45,8 @@ export const showDialog = async (
   root: ShadowRoot | HTMLElement,
   dialogTag: string,
   dialogParams: unknown,
-  dialogImport?: () => Promise<unknown>
+  dialogImport?: () => Promise<unknown>,
+  addHistory = true
 ) => {
   if (!(dialogTag in LOADED)) {
     if (!dialogImport) {
@@ -59,36 +60,37 @@ export const showDialog = async (
     });
   }
 
-  history.replaceState(
-    {
-      dialog: dialogTag,
-      open: false,
-      oldState:
-        history.state?.open && history.state?.dialog !== dialogTag
-          ? history.state
-          : null,
-    },
-    ""
-  );
-  try {
-    history.pushState(
-      { dialog: dialogTag, dialogParams: dialogParams, open: true },
-      ""
-    );
-  } catch (err) {
-    // dialogParams could not be cloned, probably contains callback
-    history.pushState(
-      { dialog: dialogTag, dialogParams: null, open: true },
+  if (addHistory) {
+    top.history.replaceState(
+      {
+        dialog: dialogTag,
+        open: false,
+        oldState:
+          top.history.state?.open && top.history.state?.dialog !== dialogTag
+            ? top.history.state
+            : null,
+      },
       ""
     );
+    try {
+      top.history.pushState(
+        { dialog: dialogTag, dialogParams: dialogParams, open: true },
+        ""
+      );
+    } catch (err) {
+      // dialogParams could not be cloned, probably contains callback
+      top.history.pushState(
+        { dialog: dialogTag, dialogParams: null, open: true },
+        ""
+      );
+    }
   }
-
   const dialogElement = await LOADED[dialogTag];
   dialogElement.showDialog(dialogParams);
 };
 
 export const replaceDialog = () => {
-  history.replaceState({ ...history.state, replaced: true }, "");
+  top.history.replaceState({ ...top.history.state, replaced: true }, "");
 };
 
 export const closeDialog = async (dialogTag: string): Promise<boolean> => {
diff --git a/src/dialogs/more-info/controls/more-info-light.ts b/src/dialogs/more-info/controls/more-info-light.ts
index 2ac9af776d..7bb67a8b77 100644
--- a/src/dialogs/more-info/controls/more-info-light.ts
+++ b/src/dialogs/more-info/controls/more-info-light.ts
@@ -11,7 +11,6 @@ import {
   PropertyValues,
   TemplateResult,
 } from "lit-element";
-import { classMap } from "lit-html/directives/class-map";
 import { supportsFeature } from "../../../common/entity/supports-feature";
 import "../../../components/ha-attributes";
 import "../../../components/ha-color-picker";
@@ -19,20 +18,22 @@ import "../../../components/ha-icon-button";
 import "../../../components/ha-labeled-slider";
 import "../../../components/ha-paper-dropdown-menu";
 import {
+  getLightRgbColor,
+  LightColorModes,
   LightEntity,
-  SUPPORT_BRIGHTNESS,
-  SUPPORT_COLOR,
-  SUPPORT_COLOR_TEMP,
+  lightIsInColorMode,
+  lightSupportsColor,
+  lightSupportsColorMode,
+  lightSupportsDimming,
   SUPPORT_EFFECT,
-  SUPPORT_WHITE_VALUE,
 } from "../../../data/light";
 import type { HomeAssistant } from "../../../types";
+import "../../../components/ha-button-toggle-group";
 
-interface HueSatColor {
-  h: number;
-  s: number;
-}
-
+const toggleButtons = [
+  { label: "Color", value: "color" },
+  { label: "Temperature", value: LightColorModes.COLOR_TEMP },
+];
 @customElement("more-info-light")
 class MoreInfoLight extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -41,28 +42,51 @@ class MoreInfoLight extends LitElement {
 
   @internalProperty() private _brightnessSliderValue = 0;
 
-  @internalProperty() private _ctSliderValue = 0;
+  @internalProperty() private _ctSliderValue?: number;
 
-  @internalProperty() private _wvSliderValue = 0;
+  @internalProperty() private _cwSliderValue?: number;
+
+  @internalProperty() private _wwSliderValue?: number;
+
+  @internalProperty() private _wvSliderValue?: number;
+
+  @internalProperty() private _colorBrightnessSliderValue?: number;
+
+  @internalProperty() private _brightnessAdjusted?: number;
 
   @internalProperty() private _hueSegments = 24;
 
   @internalProperty() private _saturationSegments = 8;
 
-  @internalProperty() private _colorPickerColor?: HueSatColor;
+  @internalProperty() private _colorPickerColor?: [number, number, number];
+
+  @internalProperty() private _mode?: "color" | LightColorModes.COLOR_TEMP;
 
   protected render(): TemplateResult {
     if (!this.hass || !this.stateObj) {
       return html``;
     }
 
+    const supportsTemp = lightSupportsColorMode(
+      this.stateObj,
+      LightColorModes.COLOR_TEMP
+    );
+
+    const supportsRgbww = lightSupportsColorMode(
+      this.stateObj,
+      LightColorModes.RGBWW
+    );
+
+    const supportsRgbw =
+      !supportsRgbww &&
+      lightSupportsColorMode(this.stateObj, LightColorModes.RGBW);
+
+    const supportsColor =
+      supportsRgbww || supportsRgbw || lightSupportsColor(this.stateObj);
+
     return html`
-      <div
-        class="content ${classMap({
-          "is-on": this.stateObj.state === "on",
-        })}"
-      >
-        ${supportsFeature(this.stateObj!, SUPPORT_BRIGHTNESS)
+      <div class="content">
+        ${lightSupportsDimming(this.stateObj)
           ? html`
               <ha-labeled-slider
                 caption=${this.hass.localize("ui.card.light.brightness")}
@@ -77,7 +101,17 @@ class MoreInfoLight extends LitElement {
           : ""}
         ${this.stateObj.state === "on"
           ? html`
-              ${supportsFeature(this.stateObj, SUPPORT_COLOR_TEMP)
+              ${supportsTemp || supportsColor ? html`<hr></hr>` : ""}
+              ${supportsTemp && supportsColor
+                ? html`<ha-button-toggle-group
+                    fullWidth
+                    .buttons=${toggleButtons}
+                    .active=${this._mode}
+                    @value-changed=${this._modeChanged}
+                  ></ha-button-toggle-group>`
+                : ""}
+              ${supportsTemp &&
+              (!supportsColor || this._mode === LightColorModes.COLOR_TEMP)
                 ? html`
                     <ha-labeled-slider
                       class="color_temp"
@@ -91,27 +125,16 @@ class MoreInfoLight extends LitElement {
                       @change=${this._ctSliderChanged}
                       pin
                     ></ha-labeled-slider>
+                    <hr></hr>
                   `
                 : ""}
-              ${supportsFeature(this.stateObj, SUPPORT_WHITE_VALUE)
-                ? html`
-                    <ha-labeled-slider
-                      caption=${this.hass.localize("ui.card.light.white_value")}
-                      icon="hass:file-word-box"
-                      max="255"
-                      .value=${this._wvSliderValue}
-                      @change=${this._wvSliderChanged}
-                      pin
-                    ></ha-labeled-slider>
-                  `
-                : ""}
-              ${supportsFeature(this.stateObj, SUPPORT_COLOR)
+              ${supportsColor && (!supportsTemp || this._mode === "color")
                 ? html`
                     <div class="segmentationContainer">
                       <ha-color-picker
                         class="color"
                         @colorselected=${this._colorPicked}
-                        .desiredHsColor=${this._colorPickerColor}
+                        .desiredRgbColor=${this._colorPickerColor}
                         throttle="500"
                         .hueSegments=${this._hueSegments}
                         .saturationSegments=${this._saturationSegments}
@@ -123,6 +146,67 @@ class MoreInfoLight extends LitElement {
                         class="segmentationButton"
                       ></ha-icon-button>
                     </div>
+                    
+                    ${
+                      supportsRgbw || supportsRgbww
+                        ? html`<ha-labeled-slider
+                            .caption=${this.hass.localize(
+                              "ui.card.light.color_brightness"
+                            )}
+                            icon="hass:brightness-7"
+                            max="100"
+                            .value=${this._colorBrightnessSliderValue ?? 255}
+                            @change=${this._colorBrightnessSliderChanged}
+                            pin
+                          ></ha-labeled-slider>`
+                        : ""
+                    }
+                    ${
+                      supportsRgbw
+                        ? html`
+                            <ha-labeled-slider
+                              .caption=${this.hass.localize(
+                                "ui.card.light.white_value"
+                              )}
+                              icon="hass:file-word-box"
+                              max="100"
+                              .name=${"wv"}
+                              .value=${this._wvSliderValue}
+                              @change=${this._wvSliderChanged}
+                              pin
+                            ></ha-labeled-slider>
+                          `
+                        : ""
+                    }
+                    ${
+                      supportsRgbww
+                        ? html`
+                            <ha-labeled-slider
+                              .caption=${this.hass.localize(
+                                "ui.card.light.cold_white_value"
+                              )}
+                              icon="hass:file-word-box-outline"
+                              max="100"
+                              .name=${"cw"}
+                              .value=${this._cwSliderValue}
+                              @change=${this._wvSliderChanged}
+                              pin
+                            ></ha-labeled-slider>
+                            <ha-labeled-slider
+                              .caption=${this.hass.localize(
+                                "ui.card.light.warm_white_value"
+                              )}
+                              icon="hass:file-word-box"
+                              max="100"
+                              .name=${"ww"}
+                              .value=${this._wwSliderValue}
+                              @change=${this._wvSliderChanged}
+                              pin
+                            ></ha-labeled-slider>
+                          `
+                        : ""
+                    }
+                    <hr></hr>
                   `
                 : ""}
               ${supportsFeature(this.stateObj, SUPPORT_EFFECT) &&
@@ -151,34 +235,85 @@ class MoreInfoLight extends LitElement {
           : ""}
         <ha-attributes
           .stateObj=${this.stateObj}
-          extra-filters="brightness,color_temp,white_value,effect_list,effect,hs_color,rgb_color,xy_color,min_mireds,max_mireds,entity_id"
+          extra-filters="brightness,color_temp,white_value,effect_list,effect,hs_color,rgb_color,rgbw_color,rgbww_color,xy_color,min_mireds,max_mireds,entity_id,supported_color_modes,color_mode"
         ></ha-attributes>
       </div>
     `;
   }
 
-  protected updated(changedProps: PropertyValues): void {
+  protected updated(changedProps: PropertyValues<this>) {
+    if (!changedProps.has("stateObj")) {
+      return;
+    }
     const stateObj = this.stateObj! as LightEntity;
-    if (changedProps.has("stateObj")) {
-      if (stateObj.state === "on") {
-        this._brightnessSliderValue = Math.round(
-          (stateObj.attributes.brightness * 100) / 255
-        );
-        this._ctSliderValue = stateObj.attributes.color_temp;
-        this._wvSliderValue = stateObj.attributes.white_value;
+    const oldStateObj = changedProps.get("stateObj") as LightEntity | undefined;
 
-        if (stateObj.attributes.hs_color) {
-          this._colorPickerColor = {
-            h: stateObj.attributes.hs_color[0],
-            s: stateObj.attributes.hs_color[1] / 100,
-          };
+    if (stateObj.state === "on") {
+      // Don't change tab when the color mode changes
+      if (
+        oldStateObj?.entity_id !== stateObj.entity_id ||
+        oldStateObj?.state !== stateObj.state
+      ) {
+        this._mode = lightIsInColorMode(this.stateObj!)
+          ? "color"
+          : LightColorModes.COLOR_TEMP;
+      }
+
+      let brightnessAdjust = 100;
+      if (
+        stateObj.attributes.color_mode === LightColorModes.RGB &&
+        !lightSupportsColorMode(stateObj, LightColorModes.RGBWW) &&
+        !lightSupportsColorMode(stateObj, LightColorModes.RGBW)
+      ) {
+        const maxVal = Math.max(...stateObj.attributes.rgb_color);
+        if (maxVal < 255) {
+          this._brightnessAdjusted = maxVal;
+          brightnessAdjust = (this._brightnessAdjusted / 255) * 100;
         }
       } else {
-        this._brightnessSliderValue = 0;
+        this._brightnessAdjusted = undefined;
       }
+      this._brightnessSliderValue = Math.round(
+        (stateObj.attributes.brightness * brightnessAdjust) / 255
+      );
+      this._ctSliderValue = stateObj.attributes.color_temp;
+      this._wvSliderValue =
+        stateObj.attributes.color_mode === LightColorModes.RGBW
+          ? Math.round((stateObj.attributes.rgbw_color[3] * 100) / 255)
+          : undefined;
+      this._cwSliderValue =
+        stateObj.attributes.color_mode === LightColorModes.RGBWW
+          ? Math.round((stateObj.attributes.rgbww_color[3] * 100) / 255)
+          : undefined;
+      this._wwSliderValue =
+        stateObj.attributes.color_mode === LightColorModes.RGBWW
+          ? Math.round((stateObj.attributes.rgbww_color[4] * 100) / 255)
+          : undefined;
+      this._colorBrightnessSliderValue =
+        stateObj.attributes.color_mode === LightColorModes.RGBWW
+          ? Math.round(
+              (Math.max(...stateObj.attributes.rgbww_color.slice(0, 3)) * 100) /
+                255
+            )
+          : stateObj.attributes.color_mode === LightColorModes.RGBW
+          ? Math.round(
+              (Math.max(...stateObj.attributes.rgbw_color.slice(0, 3)) * 100) /
+                255
+            )
+          : undefined;
+
+      this._colorPickerColor = getLightRgbColor(stateObj)?.slice(0, 3) as
+        | [number, number, number]
+        | undefined;
+    } else {
+      this._brightnessSliderValue = 0;
     }
   }
 
+  private _modeChanged(ev: CustomEvent) {
+    this._mode = ev.detail.value;
+  }
+
   private _effectChanged(ev: CustomEvent) {
     const newVal = ev.detail.item.itemName;
 
@@ -193,12 +328,29 @@ class MoreInfoLight extends LitElement {
   }
 
   private _brightnessSliderChanged(ev: CustomEvent) {
-    const bri = parseInt((ev.target as any).value, 10);
+    const bri = Number((ev.target as any).value);
 
     if (isNaN(bri)) {
       return;
     }
 
+    if (this._brightnessAdjusted) {
+      const rgb =
+        this.stateObj!.attributes.rgb_color ||
+        ([0, 0, 0] as [number, number, number]);
+
+      this.hass.callService("light", "turn_on", {
+        entity_id: this.stateObj!.entity_id,
+        brightness_pct: bri,
+        rgb_color: this._adjustColorBrightness(
+          rgb,
+          this._brightnessAdjusted,
+          true
+        ),
+      });
+      return;
+    }
+
     this.hass.callService("light", "turn_on", {
       entity_id: this.stateObj!.entity_id,
       brightness_pct: bri,
@@ -206,7 +358,7 @@ class MoreInfoLight extends LitElement {
   }
 
   private _ctSliderChanged(ev: CustomEvent) {
-    const ct = parseInt((ev.target as any).value, 10);
+    const ct = Number((ev.target as any).value);
 
     if (isNaN(ct)) {
       return;
@@ -219,18 +371,64 @@ class MoreInfoLight extends LitElement {
   }
 
   private _wvSliderChanged(ev: CustomEvent) {
-    const wv = parseInt((ev.target as any).value, 10);
+    const target = ev.target as any;
+    let wv = Number(target.value);
+    const name = target.name;
 
     if (isNaN(wv)) {
       return;
     }
 
+    wv = (wv * 255) / 100;
+
+    const rgb = getLightRgbColor(this.stateObj!);
+
+    if (name === "wv") {
+      const rgbw_color = rgb || [0, 0, 0, 0];
+      rgbw_color[3] = wv;
+      this.hass.callService("light", "turn_on", {
+        entity_id: this.stateObj!.entity_id,
+        rgbw_color,
+      });
+      return;
+    }
+
+    const rgbww_color = rgb || [0, 0, 0, 0, 0];
+    while (rgbww_color.length < 5) {
+      rgbww_color.push(0);
+    }
+    rgbww_color[name === "cw" ? 3 : 4] = wv;
     this.hass.callService("light", "turn_on", {
       entity_id: this.stateObj!.entity_id,
-      white_value: wv,
+      rgbww_color,
     });
   }
 
+  private _colorBrightnessSliderChanged(ev: CustomEvent) {
+    const target = ev.target as any;
+    const value = Number(target.value);
+
+    const rgb = (getLightRgbColor(this.stateObj!)?.slice(0, 3) || [
+      255,
+      255,
+      255,
+    ]) as [number, number, number];
+
+    this._setRgbColor(
+      this._adjustColorBrightness(
+        // first normalize the value
+        this._colorBrightnessSliderValue
+          ? this._adjustColorBrightness(
+              rgb,
+              this._colorBrightnessSliderValue,
+              true
+            )
+          : rgb,
+        value
+      )
+    );
+  }
+
   private _segmentClick() {
     if (this._hueSegments === 24 && this._saturationSegments === 8) {
       this._hueSegments = 0;
@@ -241,15 +439,90 @@ class MoreInfoLight extends LitElement {
     }
   }
 
+  private _adjustColorBrightness(
+    rgbColor: [number, number, number],
+    value?: number,
+    invert = false
+  ) {
+    if (value !== undefined && value !== 255) {
+      let ratio = value / 255;
+      if (invert) {
+        ratio = 1 / ratio;
+      }
+      rgbColor[0] *= ratio;
+      rgbColor[1] *= ratio;
+      rgbColor[2] *= ratio;
+    }
+    return rgbColor;
+  }
+
+  private _setRgbColor(rgbColor: [number, number, number]) {
+    if (lightSupportsColorMode(this.stateObj!, LightColorModes.RGBWW)) {
+      const rgbww_color: [number, number, number, number, number] = this
+        .stateObj!.attributes.rgbww_color
+        ? [...this.stateObj!.attributes.rgbww_color]
+        : [0, 0, 0, 0, 0];
+      this.hass.callService("light", "turn_on", {
+        entity_id: this.stateObj!.entity_id,
+        rgbww_color: rgbColor.concat(rgbww_color.slice(3)),
+      });
+    } else if (lightSupportsColorMode(this.stateObj!, LightColorModes.RGBW)) {
+      const rgbw_color: [number, number, number, number] = this.stateObj!
+        .attributes.rgbw_color
+        ? [...this.stateObj!.attributes.rgbw_color]
+        : [0, 0, 0, 0];
+      this.hass.callService("light", "turn_on", {
+        entity_id: this.stateObj!.entity_id,
+        rgbw_color: rgbColor.concat(rgbw_color.slice(3)),
+      });
+    }
+  }
+
   /**
    * Called when a new color has been picked.
    * should be throttled with the 'throttle=' attribute of the color picker
    */
   private _colorPicked(ev: CustomEvent) {
-    this.hass.callService("light", "turn_on", {
-      entity_id: this.stateObj!.entity_id,
-      hs_color: [ev.detail.hs.h, ev.detail.hs.s * 100],
-    });
+    if (
+      lightSupportsColorMode(this.stateObj!, LightColorModes.RGBWW) ||
+      lightSupportsColorMode(this.stateObj!, LightColorModes.RGBW)
+    ) {
+      this._setRgbColor(
+        this._colorBrightnessSliderValue
+          ? this._adjustColorBrightness(
+              [ev.detail.rgb.r, ev.detail.rgb.g, ev.detail.rgb.b],
+              this._colorBrightnessSliderValue
+            )
+          : [ev.detail.rgb.r, ev.detail.rgb.g, ev.detail.rgb.b]
+      );
+    } else if (lightSupportsColorMode(this.stateObj!, LightColorModes.RGB)) {
+      const rgb_color = [ev.detail.rgb.r, ev.detail.rgb.g, ev.detail.rgb.b] as [
+        number,
+        number,
+        number
+      ];
+      if (this._brightnessAdjusted) {
+        this.hass.callService("light", "turn_on", {
+          entity_id: this.stateObj!.entity_id,
+          brightness_pct: this._brightnessSliderValue,
+          rgb_color: this._adjustColorBrightness(
+            rgb_color,
+            this._brightnessAdjusted,
+            true
+          ),
+        });
+      } else {
+        this.hass.callService("light", "turn_on", {
+          entity_id: this.stateObj!.entity_id,
+          rgb_color,
+        });
+      }
+    } else {
+      this.hass.callService("light", "turn_on", {
+        entity_id: this.stateObj!.entity_id,
+        hs_color: [ev.detail.hs.h, ev.detail.hs.s * 100],
+      });
+    }
   }
 
   static get styles(): CSSResult {
@@ -275,11 +548,18 @@ class MoreInfoLight extends LitElement {
         );
         /* The color temp minimum value shouldn't be rendered differently. It's not "off". */
         --paper-slider-knob-start-border-color: var(--primary-color);
+        margin-bottom: 4px;
       }
 
       .segmentationContainer {
         position: relative;
         max-height: 500px;
+        display: flex;
+        justify-content: center;
+      }
+
+      ha-button-toggle-group {
+        margin: 8px 0px;
       }
 
       ha-color-picker {
@@ -293,12 +573,19 @@ class MoreInfoLight extends LitElement {
       .segmentationButton {
         position: absolute;
         top: 5%;
+        left: 0;
         color: var(--secondary-text-color);
       }
 
       paper-item {
         cursor: pointer;
       }
+
+      hr {
+        border-color: var(--divider-color);
+        border-bottom: none;
+        margin: 8px 0;
+      }
     `;
   }
 }
diff --git a/src/dialogs/quick-bar/ha-quick-bar.ts b/src/dialogs/quick-bar/ha-quick-bar.ts
index 443b8b8470..2e6147f7df 100644
--- a/src/dialogs/quick-bar/ha-quick-bar.ts
+++ b/src/dialogs/quick-bar/ha-quick-bar.ts
@@ -66,10 +66,11 @@ interface CommandItem extends QuickBarItem {
 }
 
 interface EntityItem extends QuickBarItem {
+  altText: string;
   icon?: string;
 }
 
-const isCommandItem = (item: EntityItem | CommandItem): item is CommandItem => {
+const isCommandItem = (item: QuickBarItem): item is CommandItem => {
   return (item as CommandItem).categoryKey !== undefined;
 };
 
@@ -230,7 +231,7 @@ export class QuickBar extends LitElement {
   private _renderItem(item: QuickBarItem, index?: number) {
     return isCommandItem(item)
       ? this._renderCommandItem(item, index)
-      : this._renderEntityItem(item, index);
+      : this._renderEntityItem(item as EntityItem, index);
   }
 
   private _renderEntityItem(item: EntityItem, index?: number) {
@@ -289,13 +290,6 @@ export class QuickBar extends LitElement {
         </span>
 
         <span class="command-text">${item.primaryText}</span>
-        ${item.altText
-          ? html`
-              <span slot="secondary" class="item-text secondary"
-                >${item.altText}</span
-              >
-            `
-          : null}
       </mwc-list-item>
     `;
   }
@@ -389,17 +383,20 @@ export class QuickBar extends LitElement {
     }
   }
 
-  private _generateEntityItems(): QuickBarItem[] {
+  private _generateEntityItems(): EntityItem[] {
     return Object.keys(this.hass.states)
       .map((entityId) => {
-        const primaryText = computeStateName(this.hass.states[entityId]);
-        return {
-          primaryText,
-          filterText: primaryText,
+        const entityItem = {
+          primaryText: computeStateName(this.hass.states[entityId]),
           altText: entityId,
           icon: domainIcon(computeDomain(entityId), this.hass.states[entityId]),
           action: () => fireEvent(this, "hass-more-info", { entityId }),
         };
+
+        return {
+          ...entityItem,
+          strings: [entityItem.primaryText, entityItem.altText],
+        };
       })
       .sort((a, b) =>
         compare(a.primaryText.toLowerCase(), b.primaryText.toLowerCase())
@@ -412,7 +409,10 @@ export class QuickBar extends LitElement {
       ...this._generateServerControlCommands(),
       ...this._generateNavigationCommands(),
     ].sort((a, b) =>
-      compare(a.filterText.toLowerCase(), b.filterText.toLowerCase())
+      compare(
+        a.strings.join(" ").toLowerCase(),
+        b.strings.join(" ").toLowerCase()
+      )
     );
   }
 
@@ -420,24 +420,27 @@ export class QuickBar extends LitElement {
     const reloadableDomains = componentsWithService(this.hass, "reload").sort();
 
     return reloadableDomains.map((domain) => {
-      const categoryText = this.hass.localize(
-        `ui.dialogs.quick-bar.commands.types.reload`
-      );
-      const primaryText =
-        this.hass.localize(`ui.dialogs.quick-bar.commands.reload.${domain}`) ||
-        this.hass.localize(
-          "ui.dialogs.quick-bar.commands.reload.reload",
-          "domain",
-          domainToName(this.hass.localize, domain)
-        );
+      const commandItem = {
+        primaryText:
+          this.hass.localize(
+            `ui.dialogs.quick-bar.commands.reload.${domain}`
+          ) ||
+          this.hass.localize(
+            "ui.dialogs.quick-bar.commands.reload.reload",
+            "domain",
+            domainToName(this.hass.localize, domain)
+          ),
+        action: () => this.hass.callService(domain, "reload"),
+        iconPath: mdiReload,
+        categoryText: this.hass.localize(
+          `ui.dialogs.quick-bar.commands.types.reload`
+        ),
+      };
 
       return {
-        primaryText,
-        filterText: `${categoryText} ${primaryText}`,
-        action: () => this.hass.callService(domain, "reload"),
+        ...commandItem,
         categoryKey: "reload",
-        iconPath: mdiReload,
-        categoryText,
+        strings: [`${commandItem.categoryText} ${commandItem.primaryText}`],
       };
     });
   }
@@ -446,26 +449,28 @@ export class QuickBar extends LitElement {
     const serverActions = ["restart", "stop"];
 
     return serverActions.map((action) => {
-      const categoryKey = "server_control";
-      const categoryText = this.hass.localize(
-        `ui.dialogs.quick-bar.commands.types.${categoryKey}`
-      );
-      const primaryText = this.hass.localize(
-        "ui.dialogs.quick-bar.commands.server_control.perform_action",
-        "action",
-        this.hass.localize(
-          `ui.dialogs.quick-bar.commands.server_control.${action}`
-        )
-      );
+      const categoryKey: CommandItem["categoryKey"] = "server_control";
+
+      const item = {
+        primaryText: this.hass.localize(
+          "ui.dialogs.quick-bar.commands.server_control.perform_action",
+          "action",
+          this.hass.localize(
+            `ui.dialogs.quick-bar.commands.server_control.${action}`
+          )
+        ),
+        iconPath: mdiServerNetwork,
+        categoryText: this.hass.localize(
+          `ui.dialogs.quick-bar.commands.types.${categoryKey}`
+        ),
+        categoryKey,
+        action: () => this.hass.callService("homeassistant", action),
+      };
 
       return this._generateConfirmationCommand(
         {
-          primaryText,
-          filterText: `${categoryText} ${primaryText}`,
-          categoryKey,
-          iconPath: mdiServerNetwork,
-          categoryText,
-          action: () => this.hass.callService("homeassistant", action),
+          ...item,
+          strings: [`${item.categoryText} ${item.primaryText}`],
         },
         this.hass.localize("ui.dialogs.generic.ok")
       );
@@ -550,18 +555,21 @@ export class QuickBar extends LitElement {
     items: BaseNavigationCommand[]
   ): CommandItem[] {
     return items.map((item) => {
-      const categoryKey = "navigation";
-      const categoryText = this.hass.localize(
-        `ui.dialogs.quick-bar.commands.types.${categoryKey}`
-      );
+      const categoryKey: CommandItem["categoryKey"] = "navigation";
+
+      const navItem = {
+        ...item,
+        iconPath: mdiEarth,
+        categoryText: this.hass.localize(
+          `ui.dialogs.quick-bar.commands.types.${categoryKey}`
+        ),
+        action: () => navigate(this, item.path),
+      };
 
       return {
-        ...item,
+        ...navItem,
+        strings: [`${navItem.categoryText} ${navItem.primaryText}`],
         categoryKey,
-        iconPath: mdiEarth,
-        categoryText,
-        filterText: `${categoryText} ${item.primaryText}`,
-        action: () => navigate(this, item.path),
       };
     });
   }
diff --git a/src/entrypoints/service_worker.ts b/src/entrypoints/service_worker.ts
index 29af95cf92..0748a15e1f 100644
--- a/src/entrypoints/service_worker.ts
+++ b/src/entrypoints/service_worker.ts
@@ -10,9 +10,11 @@ import {
   NetworkOnly,
   StaleWhileRevalidate,
 } from "workbox-strategies";
+import { CacheableResponsePlugin } from "workbox-cacheable-response";
+import { ExpirationPlugin } from "workbox-expiration";
 
 const noFallBackRegEx = new RegExp(
-  `${location.host}/(api|static|auth|frontend_latest|frontend_es5|local)/.*`
+  "/(api|static|auth|frontend_latest|frontend_es5|local)/.*"
 );
 
 // Clean up caches from older workboxes and old service workers.
@@ -31,27 +33,22 @@ function initRouting() {
 
   // Cache static content (including translations) on first access.
   registerRoute(
-    new RegExp(`${location.host}/(static|frontend_latest|frontend_es5)/.+`),
+    new RegExp("/(static|frontend_latest|frontend_es5)/.+"),
     new CacheFirst({ matchOptions: { ignoreSearch: true } })
   );
 
   // Get api from network.
-  registerRoute(
-    new RegExp(`${location.host}/(api|auth)/.*`),
-    new NetworkOnly()
-  );
+  registerRoute(new RegExp("/(api|auth)/.*"), new NetworkOnly());
 
   // Get manifest, service worker, onboarding from network.
   registerRoute(
-    new RegExp(
-      `${location.host}/(service_worker.js|manifest.json|onboarding.html)`
-    ),
+    new RegExp("/(service_worker.js|manifest.json|onboarding.html)"),
     new NetworkOnly()
   );
 
   // For the root "/" we ignore search
   registerRoute(
-    new RegExp(`^${location.host}/(\\?.*)?$`),
+    new RegExp(/\/(\?.*)?$/),
     new StaleWhileRevalidate({ matchOptions: { ignoreSearch: true } })
   );
 
@@ -59,7 +56,20 @@ function initRouting() {
   // This includes "/states" response and user files from "/local".
   // First access might bring stale data from cache, but a single refresh will bring updated
   // file.
-  registerRoute(new RegExp(`${location.host}/.*`), new StaleWhileRevalidate());
+  registerRoute(
+    new RegExp(/\/.*/),
+    new StaleWhileRevalidate({
+      cacheName: "file-cache",
+      plugins: [
+        new CacheableResponsePlugin({
+          statuses: [0, 200],
+        }),
+        new ExpirationPlugin({
+          maxAgeSeconds: 60 * 60 * 24,
+        }),
+      ],
+    })
+  );
 }
 
 function initPushNotifications() {
diff --git a/src/fake_data/entity.ts b/src/fake_data/entity.ts
index 78913353cb..89bdbfb5b0 100644
--- a/src/fake_data/entity.ts
+++ b/src/fake_data/entity.ts
@@ -81,9 +81,27 @@ class LightEntity extends Entity {
 
     if (service === "turn_on") {
       // eslint-disable-next-line
-      let { brightness, hs_color, brightness_pct } = data;
-      brightness = (255 * brightness_pct) / 100;
-      this.update("on", { ...this.attributes, brightness, hs_color });
+      let { hs_color, brightness_pct, rgb_color, color_temp } = data;
+      const attrs = { ...this.attributes };
+      if (brightness_pct) {
+        attrs.brightness = (255 * brightness_pct) / 100;
+      } else if (!attrs.brightness) {
+        attrs.brightness = 255;
+      }
+      if (hs_color) {
+        attrs.color_mode = "hs";
+        attrs.hs_color = hs_color;
+      }
+      if (rgb_color) {
+        attrs.color_mode = "rgb";
+        attrs.rgb_color = rgb_color;
+      }
+      if (color_temp) {
+        attrs.color_mode = "color_temp";
+        attrs.color_temp = color_temp;
+        delete attrs.rgb_color;
+      }
+      this.update("on", attrs);
     } else if (service === "turn_off") {
       this.update("off");
     } else if (service === "toggle") {
diff --git a/src/fake_data/provide_hass.ts b/src/fake_data/provide_hass.ts
index dbbe930314..e74cb69152 100644
--- a/src/fake_data/provide_hass.ts
+++ b/src/fake_data/provide_hass.ts
@@ -30,6 +30,7 @@ export interface MockHomeAssistant extends HomeAssistant {
   updateStates(newStates: HassEntities);
   addEntities(entites: Entity | Entity[], replace?: boolean);
   updateTranslations(fragment: null | string, language?: string);
+  addTranslations(translations: Record<string, string>, language?: string);
   mockWS(
     type: string,
     callback: (msg: any, onChange?: (response: any) => void) => any
@@ -60,15 +61,25 @@ export const provideHass = (
   ) {
     const lang = language || getLocalLanguage();
     const translation = await getTranslation(fragment, lang);
+    await addTranslations(translation.data, lang);
+  }
+
+  async function addTranslations(
+    translations: Record<string, string>,
+    language?: string
+  ) {
+    const lang = language || getLocalLanguage();
     const resources = {
       [lang]: {
         ...(hass().resources && hass().resources[lang]),
-        ...translation.data,
+        ...translations,
       },
     };
     hass().updateHass({
       resources,
-      localize: await computeLocalize(elements[0], lang, resources),
+    });
+    hass().updateHass({
+      localize: await computeLocalize(elements[0], lang, hass().resources),
     });
   }
 
@@ -209,6 +220,9 @@ export const provideHass = (
     localize: () => "",
 
     translationMetadata: translationMetadata as any,
+    async loadBackendTranslation() {
+      return hass().localize;
+    },
     dockedSidebar: "auto",
     vibrate: true,
     suspendWhenHidden: false,
@@ -250,6 +264,7 @@ export const provideHass = (
     },
     updateStates,
     updateTranslations,
+    addTranslations,
     addEntities,
     mockWS(type, callback) {
       wsCommands[type] = callback;
diff --git a/src/html/authorize.html.template b/src/html/authorize.html.template
index 43d63fd024..1cf1c7bba4 100644
--- a/src/html/authorize.html.template
+++ b/src/html/authorize.html.template
@@ -23,11 +23,9 @@
         margin-right: 16px;
       }
       @media (prefers-color-scheme: dark) {
-        body {
+        html {
           background-color: #111111;
           color: #e1e1e1;
-          --primary-text-color: #e1e1e1;
-          --secondary-text-color: #9b9b9b;
         }
       }
     </style>
diff --git a/src/html/index.html.template b/src/html/index.html.template
index 747c8c102c..dfad967ad1 100644
--- a/src/html/index.html.template
+++ b/src/html/index.html.template
@@ -51,6 +51,7 @@
       @media (prefers-color-scheme: dark) {
         html {
           background-color: #111111;
+          color: #e1e1e1;
         }
         #ha-init-skeleton::before {
           background-color: #1c1c1c;
diff --git a/src/html/onboarding.html.template b/src/html/onboarding.html.template
index 55b4144b6c..8ab6264be1 100644
--- a/src/html/onboarding.html.template
+++ b/src/html/onboarding.html.template
@@ -34,17 +34,8 @@
 
       @media (prefers-color-scheme: dark) {
         html {
-          color: #e1e1e1;
-        }
-        ha-onboarding {
-          --primary-text-color: #e1e1e1;
-          --secondary-text-color: #9b9b9b;
-          --disabled-text-color: #6f6f6f;
-          --mdc-theme-surface: #1e1e1e;
-          --ha-card-background: #1e1e1e;
-        }
-        .content {
           background-color: #111111;
+          color: #e1e1e1;
         }
       }
 
diff --git a/src/onboarding/ha-onboarding.ts b/src/onboarding/ha-onboarding.ts
index a6177099be..64ff66bf5a 100644
--- a/src/onboarding/ha-onboarding.ts
+++ b/src/onboarding/ha-onboarding.ts
@@ -32,6 +32,7 @@ import { registerServiceWorker } from "../util/register-service-worker";
 import "./onboarding-create-user";
 import "./onboarding-loading";
 import "./onboarding-analytics";
+import { applyThemesOnElement } from "../common/dom/apply_themes_on_element";
 
 type OnboardingEvent =
   | {
@@ -137,6 +138,19 @@ class HaOnboarding extends litLocalizeLiteMixin(HassElement) {
     if (window.innerWidth > 450) {
       import("./particles");
     }
+    if (matchMedia("(prefers-color-scheme: dark)").matches) {
+      applyThemesOnElement(
+        document.documentElement,
+        {
+          default_theme: "default",
+          default_dark_theme: null,
+          themes: {},
+          darkMode: false,
+        },
+        "default",
+        { dark: true }
+      );
+    }
   }
 
   protected updated(changedProps: PropertyValues) {
diff --git a/src/onboarding/onboarding-analytics.ts b/src/onboarding/onboarding-analytics.ts
index d8615b2408..78c20b485f 100644
--- a/src/onboarding/onboarding-analytics.ts
+++ b/src/onboarding/onboarding-analytics.ts
@@ -32,13 +32,9 @@ class OnboardingAnalytics extends LitElement {
   protected render(): TemplateResult {
     return html`
       <p>
-        ${this.hass.localize(
-          "ui.panel.config.core.section.core.analytics.introduction",
-          "link",
-          html`<a href="https://analytics.home-assistant.io" target="_blank"
-            >analytics.home-assistant.io</a
-          >`
-        )}
+        Share anonymized information from your installation to help make Home
+        Assistant better and help us convince manufacturers to add local control
+        and privacy-focused features.
       </p>
       <ha-analytics
         @analytics-preferences-changed=${this._preferencesChanged}
diff --git a/src/panels/config/areas/ha-config-area-page.ts b/src/panels/config/areas/ha-config-area-page.ts
index 3cddc9ba5d..527552a3ff 100644
--- a/src/panels/config/areas/ha-config-area-page.ts
+++ b/src/panels/config/areas/ha-config-area-page.ts
@@ -22,12 +22,16 @@ import {
 import {
   computeDeviceName,
   DeviceRegistryEntry,
-  devicesInArea,
 } from "../../../data/device_registry";
+import {
+  computeEntityRegistryName,
+  EntityRegistryEntry,
+} from "../../../data/entity_registry";
 import { findRelated, RelatedResult } from "../../../data/search";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant, Route } from "../../../types";
+import { showEntityEditorDialog } from "../entities/show-dialog-entity-editor";
 import { configSections } from "../ha-panel-config";
 import {
   loadAreaRegistryDetailDialog,
@@ -44,6 +48,8 @@ class HaConfigAreaPage extends LitElement {
 
   @property() public devices!: DeviceRegistryEntry[];
 
+  @property() public entities!: EntityRegistryEntry[];
+
   @property({ type: Boolean, reflect: true }) public narrow!: boolean;
 
   @property() public isWide!: boolean;
@@ -58,9 +64,39 @@ class HaConfigAreaPage extends LitElement {
     | AreaRegistryEntry
     | undefined => areas.find((area) => area.area_id === areaId));
 
-  private _devices = memoizeOne(
-    (areaId: string, devices: DeviceRegistryEntry[]): DeviceRegistryEntry[] =>
-      devicesInArea(devices, areaId)
+  private _memberships = memoizeOne(
+    (
+      areaId: string,
+      registryDevices: DeviceRegistryEntry[],
+      registryEntities: EntityRegistryEntry[]
+    ) => {
+      const devices = new Map();
+
+      for (const device of registryDevices) {
+        if (device.area_id === areaId) {
+          devices.set(device.id, device);
+        }
+      }
+
+      const entities: EntityRegistryEntry[] = [];
+      const indirectEntities: EntityRegistryEntry[] = [];
+
+      for (const entity of registryEntities) {
+        if (entity.area_id) {
+          if (entity.area_id === areaId) {
+            entities.push(entity);
+          }
+        } else if (devices.has(entity.device_id)) {
+          indirectEntities.push(entity);
+        }
+      }
+
+      return {
+        devices: Array.from(devices.values()),
+        entities,
+        indirectEntities,
+      };
+    }
   );
 
   protected firstUpdated(changedProps) {
@@ -87,7 +123,11 @@ class HaConfigAreaPage extends LitElement {
       `;
     }
 
-    const devices = this._devices(this.areaId, this.devices);
+    const { devices, entities } = this._memberships(
+      this.areaId,
+      this.devices,
+      this.entities
+    );
 
     return html`
       <hass-tabs-subpage
@@ -144,6 +184,33 @@ class HaConfigAreaPage extends LitElement {
                     >
                   `}
             </ha-card>
+            <ha-card
+              .header=${this.hass.localize(
+                "ui.panel.config.areas.editor.linked_entities_caption"
+              )}
+              >${entities.length
+                ? entities.map(
+                    (entity) =>
+                      html`
+                        <paper-item
+                          @click=${this._openEntity}
+                          .entity=${entity}
+                        >
+                          <paper-item-body>
+                            ${computeEntityRegistryName(this.hass, entity)}
+                          </paper-item-body>
+                          <ha-icon-next></ha-icon-next>
+                        </paper-item>
+                      `
+                  )
+                : html`
+                    <paper-item class="no-link"
+                      >${this.hass.localize(
+                        "ui.panel.config.areas.editor.no_linked_entities"
+                      )}</paper-item
+                    >
+                  `}
+            </ha-card>
           </div>
           <div class="column">
             ${isComponentLoaded(this.hass, "automation")
@@ -299,6 +366,14 @@ class HaConfigAreaPage extends LitElement {
     this._openDialog(entry);
   }
 
+  private _openEntity(ev) {
+    const entry: EntityRegistryEntry = (ev.currentTarget as any).entity;
+    showEntityEditorDialog(this, {
+      entity_id: entry.entity_id,
+      entry,
+    });
+  }
+
   private _openDialog(entry?: AreaRegistryEntry) {
     showAreaRegistryDetailDialog(this, {
       entry,
diff --git a/src/panels/config/areas/ha-config-areas-dashboard.ts b/src/panels/config/areas/ha-config-areas-dashboard.ts
index ad00f8e871..e07661054a 100644
--- a/src/panels/config/areas/ha-config-areas-dashboard.ts
+++ b/src/panels/config/areas/ha-config-areas-dashboard.ts
@@ -24,10 +24,8 @@ import {
   AreaRegistryEntry,
   createAreaRegistryEntry,
 } from "../../../data/area_registry";
-import {
-  DeviceRegistryEntry,
-  devicesInArea,
-} from "../../../data/device_registry";
+import type { DeviceRegistryEntry } from "../../../data/device_registry";
+import type { EntityRegistryEntry } from "../../../data/entity_registry";
 import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
 import "../../../layouts/hass-loading-screen";
 import "../../../layouts/hass-tabs-subpage-data-table";
@@ -53,12 +51,39 @@ export class HaConfigAreasDashboard extends LitElement {
 
   @property() public devices!: DeviceRegistryEntry[];
 
+  @property() public entities!: EntityRegistryEntry[];
+
   private _areas = memoizeOne(
-    (areas: AreaRegistryEntry[], devices: DeviceRegistryEntry[]) => {
+    (
+      areas: AreaRegistryEntry[],
+      devices: DeviceRegistryEntry[],
+      entities: EntityRegistryEntry[]
+    ) => {
       return areas.map((area) => {
+        const devicesInArea = new Set();
+
+        for (const device of devices) {
+          if (device.area_id === area.area_id) {
+            devicesInArea.add(device.id);
+          }
+        }
+
+        let entitiesInArea = 0;
+
+        for (const entity of entities) {
+          if (
+            entity.area_id
+              ? entity.area_id === area.area_id
+              : devicesInArea.has(entity.device_id)
+          ) {
+            entitiesInArea++;
+          }
+        }
+
         return {
           ...area,
-          devices: devicesInArea(devices, area.area_id).length,
+          devices: devicesInArea.size,
+          entities: entitiesInArea,
         };
       });
     }
@@ -97,6 +122,15 @@ export class HaConfigAreasDashboard extends LitElement {
               width: "20%",
               direction: "asc",
             },
+            entities: {
+              title: this.hass.localize(
+                "ui.panel.config.areas.data_table.entities"
+              ),
+              sortable: true,
+              type: "numeric",
+              width: "20%",
+              direction: "asc",
+            },
           }
   );
 
@@ -110,7 +144,7 @@ export class HaConfigAreasDashboard extends LitElement {
         .tabs=${configSections.integrations}
         .route=${this.route}
         .columns=${this._columns(this.narrow)}
-        .data=${this._areas(this.areas, this.devices)}
+        .data=${this._areas(this.areas, this.devices, this.entities)}
         @row-click=${this._handleRowClicked}
         .noDataText=${this.hass.localize(
           "ui.panel.config.areas.picker.no_areas"
diff --git a/src/panels/config/areas/ha-config-areas.ts b/src/panels/config/areas/ha-config-areas.ts
index fc9ead4062..c742b304d0 100644
--- a/src/panels/config/areas/ha-config-areas.ts
+++ b/src/panels/config/areas/ha-config-areas.ts
@@ -15,6 +15,10 @@ import {
   DeviceRegistryEntry,
   subscribeDeviceRegistry,
 } from "../../../data/device_registry";
+import {
+  EntityRegistryEntry,
+  subscribeEntityRegistry,
+} from "../../../data/entity_registry";
 import {
   HassRouterPage,
   RouterOptions,
@@ -51,6 +55,9 @@ class HaConfigAreas extends HassRouterPage {
   @internalProperty()
   private _deviceRegistryEntries: DeviceRegistryEntry[] = [];
 
+  @internalProperty()
+  private _entityRegistryEntries: EntityRegistryEntry[] = [];
+
   @internalProperty() private _areas: AreaRegistryEntry[] = [];
 
   private _unsubs?: UnsubscribeFunc[];
@@ -90,6 +97,7 @@ class HaConfigAreas extends HassRouterPage {
 
     pageEl.entries = this._configEntries;
     pageEl.devices = this._deviceRegistryEntries;
+    pageEl.entities = this._entityRegistryEntries;
     pageEl.areas = this._areas;
     pageEl.narrow = this.narrow;
     pageEl.isWide = this.isWide;
@@ -113,6 +121,9 @@ class HaConfigAreas extends HassRouterPage {
       subscribeDeviceRegistry(this.hass.connection, (entries) => {
         this._deviceRegistryEntries = entries;
       }),
+      subscribeEntityRegistry(this.hass.connection, (entries) => {
+        this._entityRegistryEntries = entries;
+      }),
     ];
   }
 }
diff --git a/src/panels/config/automation/trace/ha-automation-trace-path-details.ts b/src/panels/config/automation/trace/ha-automation-trace-path-details.ts
index 2416ea2ad6..51ebbdab7f 100644
--- a/src/panels/config/automation/trace/ha-automation-trace-path-details.ts
+++ b/src/panels/config/automation/trace/ha-automation-trace-path-details.ts
@@ -99,33 +99,63 @@ export class HaAutomationTracePathDetails extends LitElement {
       return "This node was not executed and so no further trace information is available.";
     }
 
-    const data: ActionTraceStep[] = paths[this.selected.path];
+    const parts: TemplateResult[][] = [];
 
-    return data.map((trace, idx) => {
-      const {
-        path,
-        timestamp,
-        result,
-        error,
-        changed_variables,
-        ...rest
-      } = trace as any;
+    let active = false;
+    const childConditionsPrefix = `${this.selected.path}/conditions/`;
 
-      return html`
-        ${data.length === 1 ? "" : html`<h3>Iteration ${idx + 1}</h3>`}
-        Executed:
-        ${formatDateTimeWithSeconds(new Date(timestamp), this.hass.locale)}<br />
-        ${result
-          ? html`Result:
-              <pre>${safeDump(result)}</pre>`
-          : error
-          ? html`<div class="error">Error: ${error}</div>`
-          : ""}
-        ${Object.keys(rest).length === 0
-          ? ""
-          : html`<pre>${safeDump(rest)}</pre>`}
-      `;
-    });
+    for (const curPath of Object.keys(this.trace.trace)) {
+      // Include all child conditions too
+      if (active) {
+        if (!curPath.startsWith(childConditionsPrefix)) {
+          break;
+        }
+      } else if (curPath === this.selected.path) {
+        active = true;
+      } else {
+        continue;
+      }
+
+      const data: ActionTraceStep[] = paths[curPath];
+
+      parts.push(
+        data.map((trace, idx) => {
+          const {
+            path,
+            timestamp,
+            result,
+            error,
+            changed_variables,
+            ...rest
+          } = trace as any;
+
+          return html`
+            ${curPath === this.selected.path
+              ? ""
+              : html`<h2>
+                  Condition ${curPath.substr(childConditionsPrefix.length)}
+                </h2>`}
+            ${data.length === 1 ? "" : html`<h3>Iteration ${idx + 1}</h3>`}
+            Executed:
+            ${formatDateTimeWithSeconds(
+              new Date(timestamp),
+              this.hass.locale
+            )}<br />
+            ${result
+              ? html`Result:
+                  <pre>${safeDump(result)}</pre>`
+              : error
+              ? html`<div class="error">Error: ${error}</div>`
+              : ""}
+            ${Object.keys(rest).length === 0
+              ? ""
+              : html`<pre>${safeDump(rest)}</pre>`}
+          `;
+        })
+      );
+    }
+
+    return parts;
   }
 
   private _renderSelectedConfig() {
diff --git a/src/panels/config/automation/trace/ha-automation-trace.ts b/src/panels/config/automation/trace/ha-automation-trace.ts
index 81522f4876..b8e480d7a9 100644
--- a/src/panels/config/automation/trace/ha-automation-trace.ts
+++ b/src/panels/config/automation/trace/ha-automation-trace.ts
@@ -87,12 +87,24 @@ export class HaAutomationTrace extends LitElement {
 
     const title = stateObj?.attributes.friendly_name || this._entityId;
 
+    let devButtons: TemplateResult | string = "";
+    if (__DEV__) {
+      devButtons = html`<div style="position: absolute; right: 0;">
+        <button @click=${this._importTrace}>
+          Import trace
+        </button>
+        <button @click=${this._loadLocalStorageTrace}>
+          Load stored trace
+        </button>
+      </div>`;
+    }
+
     const actionButtons = html`
       <mwc-icon-button label="Refresh" @click=${() => this._loadTraces()}>
         <ha-svg-icon .path=${mdiRefresh}></ha-svg-icon>
       </mwc-icon-button>
       <mwc-icon-button
-        .disabled=${!this._runId}
+        .disabled=${!this._trace}
         label="Download Trace"
         @click=${this._downloadTrace}
       >
@@ -101,6 +113,7 @@ export class HaAutomationTrace extends LitElement {
     `;
 
     return html`
+      ${devButtons}
       <hass-tabs-subpage
         .hass=${this.hass}
         .narrow=${this.narrow}
@@ -410,6 +423,27 @@ export class HaAutomationTrace extends LitElement {
     aEl.click();
   }
 
+  private _importTrace() {
+    const traceText = prompt("Enter downloaded trace");
+    if (!traceText) {
+      return;
+    }
+    localStorage.devTrace = traceText;
+    this._loadLocalTrace(traceText);
+  }
+
+  private _loadLocalStorageTrace() {
+    if (localStorage.devTrace) {
+      this._loadLocalTrace(localStorage.devTrace);
+    }
+  }
+
+  private _loadLocalTrace(traceText: string) {
+    const traceInfo = JSON.parse(traceText);
+    this._trace = traceInfo.trace;
+    this._logbookEntries = traceInfo.logbookEntries;
+  }
+
   private _showTab(ev) {
     this._view = (ev.target as any).view;
   }
diff --git a/src/panels/config/cloud/ha-config-cloud.ts b/src/panels/config/cloud/ha-config-cloud.ts
index f3ad9778a6..1bf79fac77 100644
--- a/src/panels/config/cloud/ha-config-cloud.ts
+++ b/src/panels/config/cloud/ha-config-cloud.ts
@@ -73,7 +73,7 @@ class HaConfigCloud extends HassRouterPage {
 
   private _resolveCloudStatusLoaded!: () => void;
 
-  private _cloudStatusLoaded = new Promise((resolve) => {
+  private _cloudStatusLoaded = new Promise<void>((resolve) => {
     this._resolveCloudStatusLoaded = resolve;
   });
 
diff --git a/src/panels/config/core/ha-config-analytics.ts b/src/panels/config/core/ha-config-analytics.ts
index 26a2515e2f..ee145e9f64 100644
--- a/src/panels/config/core/ha-config-analytics.ts
+++ b/src/panels/config/core/ha-config-analytics.ts
@@ -40,21 +40,13 @@ class ConfigAnalytics extends LitElement {
       : undefined;
 
     return html`
-      <ha-card
-        .header=${this.hass.localize(
-          "ui.panel.config.core.section.core.analytics.header"
-        )}
-      >
+      <ha-card header="Analytics">
         <div class="card-content">
           ${error ? html`<div class="error">${error}</div>` : ""}
           <p>
-            ${this.hass.localize(
-              "ui.panel.config.core.section.core.analytics.introduction",
-              "link",
-              html`<a href="https://analytics.home-assistant.io" target="_blank"
-                >analytics.home-assistant.io</a
-              >`
-            )}
+            Share anonymized information from your installation to help make
+            Home Assistant better and help us convince manufacturers to add
+            local control and privacy-focused features.
           </p>
           <ha-analytics
             @analytics-preferences-changed=${this._preferencesChanged}
diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts
index b6dfd0bfc1..5e4afb8cf0 100644
--- a/src/panels/config/dashboard/ha-config-dashboard.ts
+++ b/src/panels/config/dashboard/ha-config-dashboard.ts
@@ -79,36 +79,6 @@ class HaConfigDashboard extends LitElement {
           </ha-card>
         `
       )}
-      ${isComponentLoaded(this.hass, "zha")
-        ? html`
-            <div class="promo-advanced">
-              ${this.hass.localize(
-                "ui.panel.config.integration_panel_move.missing_zha",
-                "integrations_page",
-                html`<a href="/config/integrations">
-                  ${this.hass.localize(
-                    "ui.panel.config.integration_panel_move.link_integration_page"
-                  )}
-                </a>`
-              )}
-            </div>
-          `
-        : ""}
-      ${isComponentLoaded(this.hass, "zwave")
-        ? html`
-            <div class="promo-advanced">
-              ${this.hass.localize(
-                "ui.panel.config.integration_panel_move.missing_zwave",
-                "integrations_page",
-                html`<a href="/config/integrations">
-                  ${this.hass.localize(
-                    "ui.panel.config.integration_panel_move.link_integration_page"
-                  )}
-                </a>`
-              )}
-            </div>
-          `
-        : ""}
       ${!this.showAdvanced
         ? html`
             <div class="promo-advanced">
diff --git a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-actions-zwave_js.ts b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-actions-zwave_js.ts
index 13c7995243..a43d8126f3 100644
--- a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-actions-zwave_js.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-actions-zwave_js.ts
@@ -11,9 +11,13 @@ import {
   TemplateResult,
 } from "lit-element";
 import { DeviceRegistryEntry } from "../../../../../../data/device_registry";
+import {
+  getIdentifiersFromDevice,
+  ZWaveJSNodeIdentifiers,
+} from "../../../../../../data/zwave_js";
 import { haStyle } from "../../../../../../resources/styles";
-
 import { HomeAssistant } from "../../../../../../types";
+import { showZWaveJSReinterviewNodeDialog } from "../../../../integrations/integration-panels/zwave_js/show-dialog-zwave_js-reinterview-node";
 
 @customElement("ha-device-actions-zwave_js")
 export class HaDeviceActionsZWaveJS extends LitElement {
@@ -23,9 +27,19 @@ export class HaDeviceActionsZWaveJS extends LitElement {
 
   @internalProperty() private _entryId?: string;
 
+  @internalProperty() private _nodeId?: number;
+
   protected updated(changedProperties: PropertyValues) {
     if (changedProperties.has("device")) {
       this._entryId = this.device.config_entries[0];
+
+      const identifiers:
+        | ZWaveJSNodeIdentifiers
+        | undefined = getIdentifiersFromDevice(this.device);
+      if (!identifiers) {
+        return;
+      }
+      this._nodeId = identifiers.node_id;
     }
   }
 
@@ -40,9 +54,22 @@ export class HaDeviceActionsZWaveJS extends LitElement {
           )}
         </mwc-button>
       </a>
+      <mwc-button @click=${this._reinterviewClicked}
+        >Re-interview Device</mwc-button
+      >
     `;
   }
 
+  private async _reinterviewClicked() {
+    if (!this._nodeId || !this._entryId) {
+      return;
+    }
+    showZWaveJSReinterviewNodeDialog(this, {
+      entry_id: this._entryId,
+      node_id: this._nodeId,
+    });
+  }
+
   static get styles(): CSSResult[] {
     return [
       haStyle,
diff --git a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
index e60439f2de..99bd51dcb7 100644
--- a/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
+++ b/src/panels/config/devices/device-registry-detail/dialog-device-registry-detail.ts
@@ -33,7 +33,7 @@ class DialogDeviceRegistryDetail extends LitElement {
 
   @internalProperty() private _params?: DeviceRegistryDetailDialogParams;
 
-  @internalProperty() private _areaId?: string;
+  @internalProperty() private _areaId?: string | null;
 
   @internalProperty() private _disabledBy!: string | null;
 
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index 8b04716baf..187a05f875 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -728,7 +728,7 @@ export class HaConfigDevicePage extends LitElement {
           }
 
           if (!newName && !newEntityId) {
-            return new Promise((resolve) => resolve());
+            return undefined;
           }
 
           return updateEntityRegistryEntry(this.hass!, entity.entity_id, {
diff --git a/src/panels/config/entities/entity-registry-basic-editor.ts b/src/panels/config/entities/entity-registry-basic-editor.ts
index 1b1690394c..1063639aa4 100644
--- a/src/panels/config/entities/entity-registry-basic-editor.ts
+++ b/src/panels/config/entities/entity-registry-basic-editor.ts
@@ -38,7 +38,7 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
 
   @internalProperty() private _entityId!: string;
 
-  @internalProperty() private _areaId?: string;
+  @internalProperty() private _areaId?: string | null;
 
   @internalProperty() private _disabledBy!: string | null;
 
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index be295a57a4..c1277e7b8a 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -663,6 +663,10 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
           entity_id: entityId,
           platform: computeDomain(entityId),
           disabled_by: null,
+          area_id: null,
+          config_entry_id: null,
+          device_id: null,
+          icon: null,
           readonly: true,
           selectable: false,
         });
diff --git a/src/panels/config/info/ha-config-info.ts b/src/panels/config/info/ha-config-info.ts
index c1dd606e57..b3ffe78557 100644
--- a/src/panels/config/info/ha-config-info.ts
+++ b/src/panels/config/info/ha-config-info.ts
@@ -140,7 +140,10 @@ class HaConfigInfo extends LitElement {
         </div>
         <div class="content">
           <system-health-card .hass=${this.hass}></system-health-card>
-          <integrations-card .hass=${this.hass}></integrations-card>
+          <integrations-card
+            .hass=${this.hass}
+            .narrow=${this.narrow}
+          ></integrations-card>
         </div>
       </hass-tabs-subpage>
     `;
diff --git a/src/panels/config/info/integrations-card.ts b/src/panels/config/info/integrations-card.ts
index d078524f1e..a698b7e634 100644
--- a/src/panels/config/info/integrations-card.ts
+++ b/src/panels/config/info/integrations-card.ts
@@ -13,8 +13,10 @@ import "../../../components/ha-card";
 import {
   domainToName,
   fetchIntegrationManifests,
+  fetchIntegrationSetups,
   integrationIssuesUrl,
   IntegrationManifest,
+  IntegrationSetup,
 } from "../../../data/integration";
 import { HomeAssistant } from "../../../types";
 import { brandsUrl } from "../../../util/brands-url";
@@ -23,15 +25,22 @@ import { brandsUrl } from "../../../util/brands-url";
 class IntegrationsCard extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
+  @property({ type: Boolean }) public narrow = false;
+
   @internalProperty() private _manifests?: {
     [domain: string]: IntegrationManifest;
   };
 
+  @internalProperty() private _setups?: {
+    [domain: string]: IntegrationSetup;
+  };
+
   private _sortedIntegrations = memoizeOne((components: string[]) => {
     return Array.from(
       new Set(
-        components
-          .map((comp) => (comp.includes(".") ? comp.split(".")[1] : comp))
+        components.map((comp) =>
+          comp.includes(".") ? comp.split(".")[1] : comp
+        )
       )
     ).sort();
   });
@@ -39,6 +48,7 @@ class IntegrationsCard extends LitElement {
   firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
     this._fetchManifests();
+    this._fetchSetups();
   }
 
   protected render(): TemplateResult {
@@ -47,10 +57,47 @@ class IntegrationsCard extends LitElement {
         .header=${this.hass.localize("ui.panel.config.info.integrations")}
       >
         <table class="card-content">
+          <thead>
+            <tr>
+              <th></th>
+              ${!this.narrow
+                ? html`<th></th>
+                    <th></th>
+                    <th></th>`
+                : ""}
+              <th>Setup time</th>
+            </tr>
+          </thead>
           <tbody>
             ${this._sortedIntegrations(this.hass!.config.components).map(
               (domain) => {
                 const manifest = this._manifests && this._manifests[domain];
+                const docLink = manifest
+                  ? html`<a
+                      href=${manifest.documentation}
+                      target="_blank"
+                      rel="noreferrer"
+                      >${this.hass.localize(
+                        "ui.panel.config.info.documentation"
+                      )}</a
+                    >`
+                  : "";
+                const issueLink =
+                  manifest && (manifest.is_built_in || manifest.issue_tracker)
+                    ? html`
+                        <a
+                          href=${integrationIssuesUrl(domain, manifest)}
+                          target="_blank"
+                          rel="noreferrer"
+                          >${this.hass.localize(
+                            "ui.panel.config.info.issues"
+                          )}</a
+                        >
+                      `
+                    : "";
+                const setupSeconds = this._setups?.[domain]?.seconds?.toFixed(
+                  2
+                );
                 return html`
                   <tr>
                     <td>
@@ -63,39 +110,25 @@ class IntegrationsCard extends LitElement {
                     <td class="name">
                       ${domainToName(this.hass.localize, domain, manifest)}<br />
                       <span class="domain">${domain}</span>
+                      ${this.narrow
+                        ? html`<div class="mobile-row">
+                            <div>${docLink} ${issueLink}</div>
+                            ${setupSeconds ? html`${setupSeconds}s` : ""}
+                          </div>`
+                        : ""}
                     </td>
-                    ${!manifest
+                    ${this.narrow
                       ? ""
                       : html`
                           <td>
-                            <a
-                              href=${manifest.documentation}
-                              target="_blank"
-                              rel="noreferrer"
-                            >
-                              ${this.hass.localize(
-                                "ui.panel.config.info.documentation"
-                              )}
-                            </a>
+                            ${docLink}
+                          </td>
+                          <td>
+                            ${issueLink}
+                          </td>
+                          <td class="setup">
+                            ${setupSeconds ? html`${setupSeconds}s` : ""}
                           </td>
-                          ${manifest.is_built_in || manifest.issue_tracker
-                            ? html`
-                                <td>
-                                  <a
-                                    href=${integrationIssuesUrl(
-                                      domain,
-                                      manifest
-                                    )}
-                                    target="_blank"
-                                    rel="noreferrer"
-                                  >
-                                    ${this.hass.localize(
-                                      "ui.panel.config.info.issues"
-                                    )}
-                                  </a>
-                                </td>
-                              `
-                            : ""}
                         `}
                   </tr>
                 `;
@@ -115,9 +148,21 @@ class IntegrationsCard extends LitElement {
     this._manifests = manifests;
   }
 
+  private async _fetchSetups() {
+    const setups = {};
+    for (const setup of await fetchIntegrationSetups(this.hass)) {
+      setups[setup.domain] = setup;
+    }
+    this._setups = setups;
+  }
+
   static get styles(): CSSResult {
     return css`
-      td {
+      table {
+        width: 100%;
+      }
+      td,
+      th {
         padding: 0 8px;
       }
       td:first-child {
@@ -126,9 +171,22 @@ class IntegrationsCard extends LitElement {
       td.name {
         padding: 8px;
       }
+      td.setup {
+        text-align: right;
+      }
+      th {
+        text-align: right;
+      }
       .domain {
         color: var(--secondary-text-color);
       }
+      .mobile-row {
+        display: flex;
+        justify-content: space-between;
+      }
+      .mobile-row a:not(:last-of-type) {
+        margin-right: 4px;
+      }
       img {
         display: block;
         max-height: 40px;
diff --git a/src/panels/config/integrations/ha-config-flow-card.ts b/src/panels/config/integrations/ha-config-flow-card.ts
new file mode 100644
index 0000000000..fd6769b22c
--- /dev/null
+++ b/src/panels/config/integrations/ha-config-flow-card.ts
@@ -0,0 +1,130 @@
+import {
+  customElement,
+  LitElement,
+  property,
+  css,
+  html,
+  TemplateResult,
+} from "lit-element";
+import { classMap } from "lit-html/directives/class-map";
+import { fireEvent } from "../../../common/dom/fire_event";
+import {
+  ATTENTION_SOURCES,
+  DISCOVERY_SOURCES,
+  ignoreConfigFlow,
+  localizeConfigFlowTitle,
+} from "../../../data/config_flow";
+import type { IntegrationManifest } from "../../../data/integration";
+import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-config-flow";
+import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
+import type { HomeAssistant } from "../../../types";
+import type { DataEntryFlowProgressExtended } from "./ha-config-integrations";
+import "./ha-integration-action-card";
+
+@customElement("ha-config-flow-card")
+export class HaConfigFlowCard extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property() public flow!: DataEntryFlowProgressExtended;
+
+  @property() public manifest?: IntegrationManifest;
+
+  protected render(): TemplateResult {
+    const attention = ATTENTION_SOURCES.includes(this.flow.context.source);
+    return html`
+      <ha-integration-action-card
+        class=${classMap({
+          discovered: !attention,
+          attention: attention,
+        })}
+        .hass=${this.hass}
+        .manifest=${this.manifest}
+        .banner=${this.hass.localize(
+          `ui.panel.config.integrations.${
+            attention ? "attention" : "discovered"
+          }`
+        )}
+        .domain=${this.flow.handler}
+        .label=${this.flow.localized_title}
+      >
+        <mwc-button
+          unelevated
+          @click=${this._continueFlow}
+          .label=${this.hass.localize(
+            `ui.panel.config.integrations.${
+              attention ? "reconfigure" : "configure"
+            }`
+          )}
+        ></mwc-button>
+        ${DISCOVERY_SOURCES.includes(this.flow.context.source) &&
+        this.flow.context.unique_id
+          ? html`
+              <mwc-button
+                @click=${this._ignoreFlow}
+                .label=${this.hass.localize(
+                  "ui.panel.config.integrations.ignore.ignore"
+                )}
+              ></mwc-button>
+            `
+          : ""}
+      </ha-integration-action-card>
+    `;
+  }
+
+  private _continueFlow() {
+    showConfigFlowDialog(this, {
+      continueFlowId: this.flow.flow_id,
+      dialogClosedCallback: () => {
+        this._handleFlowUpdated();
+      },
+    });
+  }
+
+  private async _ignoreFlow() {
+    const confirmed = await showConfirmationDialog(this, {
+      title: this.hass!.localize(
+        "ui.panel.config.integrations.ignore.confirm_ignore_title",
+        "name",
+        localizeConfigFlowTitle(this.hass.localize, this.flow)
+      ),
+      text: this.hass!.localize(
+        "ui.panel.config.integrations.ignore.confirm_ignore"
+      ),
+      confirmText: this.hass!.localize(
+        "ui.panel.config.integrations.ignore.ignore"
+      ),
+    });
+    if (!confirmed) {
+      return;
+    }
+    await ignoreConfigFlow(
+      this.hass,
+      this.flow.flow_id,
+      localizeConfigFlowTitle(this.hass.localize, this.flow)
+    );
+    this._handleFlowUpdated();
+  }
+
+  private _handleFlowUpdated() {
+    fireEvent(this, "change", undefined, {
+      bubbles: false,
+    });
+  }
+
+  static styles = css`
+    .attention {
+      --state-color: var(--error-color);
+      --text-on-state-color: var(--text-primary-color);
+    }
+    .discovered {
+      --state-color: var(--primary-color);
+      --text-on-state-color: var(--text-primary-color);
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-config-flow-card": HaConfigFlowCard;
+  }
+}
diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts
index b0823087f0..3bfe8bb69b 100644
--- a/src/panels/config/integrations/ha-config-integrations.ts
+++ b/src/panels/config/integrations/ha-config-integrations.ts
@@ -2,9 +2,8 @@ import "@material/mwc-icon-button";
 import { ActionDetail } from "@material/mwc-list";
 import "@material/mwc-list/mwc-list-item";
 import { mdiFilterVariant, mdiPlus } from "@mdi/js";
-import "@polymer/app-route/app-route";
 import Fuse from "fuse.js";
-import { UnsubscribeFunc } from "home-assistant-js-websocket";
+import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import {
   css,
   CSSResult,
@@ -16,31 +15,15 @@ import {
   PropertyValues,
   TemplateResult,
 } from "lit-element";
-import { classMap } from "lit-html/directives/class-map";
 import { ifDefined } from "lit-html/directives/if-defined";
 import memoizeOne from "memoize-one";
-import { HASSDomEvent } from "../../../common/dom/fire_event";
 import { navigate } from "../../../common/navigate";
-import "../../../common/search/search-input";
 import { caseInsensitiveCompare } from "../../../common/string/compare";
-import { LocalizeFunc } from "../../../common/translations/localize";
 import { extractSearchParam } from "../../../common/url/search-params";
 import { nextRender } from "../../../common/util/render-status";
-import "../../../components/ha-button-menu";
-import "../../../components/ha-card";
-import "../../../components/ha-fab";
-import "../../../components/ha-checkbox";
-import "../../../components/ha-svg-icon";
+import { ConfigEntry, getConfigEntries } from "../../../data/config_entries";
 import {
-  ConfigEntry,
-  deleteConfigEntry,
-  getConfigEntries,
-} from "../../../data/config_entries";
-import {
-  ATTENTION_SOURCES,
-  DISCOVERY_SOURCES,
   getConfigFlowInProgressCollection,
-  ignoreConfigFlow,
   localizeConfigFlowTitle,
   subscribeConfigFlowInProgress,
 } from "../../../data/config_flow";
@@ -55,26 +38,49 @@ import {
 } from "../../../data/entity_registry";
 import {
   domainToName,
+  fetchIntegrationManifest,
   fetchIntegrationManifests,
   IntegrationManifest,
 } from "../../../data/integration";
 import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-config-flow";
 import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
-import "../../../layouts/hass-loading-screen";
-import "../../../layouts/hass-tabs-subpage";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
-import { HomeAssistant, Route } from "../../../types";
-import { brandsUrl } from "../../../util/brands-url";
 import { configSections } from "../ha-panel-config";
-import "./ha-integration-card";
-import type {
-  ConfigEntryRemovedEvent,
-  ConfigEntryUpdatedEvent,
-  HaIntegrationCard,
-} from "./ha-integration-card";
 
-interface DataEntryFlowProgressExtended extends DataEntryFlowProgress {
+import type { HomeAssistant, Route } from "../../../types";
+import type { HASSDomEvent } from "../../../common/dom/fire_event";
+import type { LocalizeFunc } from "../../../common/translations/localize";
+import type { HaIntegrationCard } from "./ha-integration-card";
+
+import "../../../common/search/search-input";
+import "../../../components/ha-button-menu";
+import "../../../components/ha-fab";
+import "../../../components/ha-checkbox";
+import "../../../components/ha-svg-icon";
+import "../../../layouts/hass-loading-screen";
+import "../../../layouts/hass-tabs-subpage";
+import "./ha-integration-card";
+import "./ha-config-flow-card";
+import "./ha-ignored-config-entry-card";
+
+export interface ConfigEntryUpdatedEvent {
+  entry: ConfigEntry;
+}
+
+export interface ConfigEntryRemovedEvent {
+  entryId: string;
+}
+
+declare global {
+  // for fire event
+  interface HASSDomEvents {
+    "entry-updated": ConfigEntryUpdatedEvent;
+    "entry-removed": ConfigEntryRemovedEvent;
+  }
+}
+
+export interface DataEntryFlowProgressExtended extends DataEntryFlowProgress {
   localized_title?: string;
 }
 
@@ -119,9 +125,10 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
   @internalProperty()
   private _deviceRegistryEntries: DeviceRegistryEntry[] = [];
 
-  @internalProperty() private _manifests!: {
-    [domain: string]: IntegrationManifest;
-  };
+  @internalProperty()
+  private _manifests: Record<string, IntegrationManifest> = {};
+
+  private _extraFetchedManifests?: Set<string>;
 
   @internalProperty() private _showIgnored = false;
 
@@ -150,15 +157,14 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
               this.hass.loadBackendTranslation("config", flow.handler)
             );
           }
+          this._fetchManifest(flow.handler);
         });
         await Promise.all(translationsPromisses);
         await nextRender();
-        this._configEntriesInProgress = flowsInProgress.map((flow) => {
-          return {
-            ...flow,
-            localized_title: localizeConfigFlowTitle(this.hass.localize, flow),
-          };
-        });
+        this._configEntriesInProgress = flowsInProgress.map((flow) => ({
+          ...flow,
+          localized_title: localizeConfigFlowTitle(this.hass.localize, flow),
+        }));
       }),
     ];
   }
@@ -217,12 +223,6 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
       configEntriesInProgress: DataEntryFlowProgressExtended[],
       filter?: string
     ): DataEntryFlowProgressExtended[] => {
-      configEntriesInProgress = configEntriesInProgress.map(
-        (flow: DataEntryFlowProgressExtended) => ({
-          ...flow,
-          title: localizeConfigFlowTitle(this.hass.localize, flow),
-        })
-      );
       if (!filter) {
         return configEntriesInProgress;
       }
@@ -349,11 +349,12 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
                         "number",
                         disabledConfigEntries.size
                       )}
-                      <mwc-button @click=${this._toggleShowDisabled}>
-                        ${this.hass.localize(
+                      <mwc-button
+                        @click=${this._toggleShowDisabled}
+                        .label=${this.hass.localize(
                           "ui.panel.config.integrations.disable.show"
                         )}
-                      </mwc-button>
+                      ></mwc-button>
                     </div>`
                   : ""}
                 ${filterMenu}
@@ -362,112 +363,31 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
 
         <div
           class="container"
-          @entry-removed=${this._handleRemoved}
-          @entry-updated=${this._handleUpdated}
+          @entry-removed=${this._handleEntryRemoved}
+          @entry-updated=${this._handleEntryUpdated}
         >
           ${this._showIgnored
             ? ignoredConfigEntries.map(
-                (item: ConfigEntryExtended) => html`
-                  <ha-card outlined class="ignored">
-                    <div class="header">
-                      ${this.hass.localize(
-                        "ui.panel.config.integrations.ignore.ignored"
-                      )}
-                    </div>
-                    <div class="card-content">
-                      <div class="image">
-                        <img
-                          src=${brandsUrl(item.domain, "logo")}
-                          referrerpolicy="no-referrer"
-                          @error=${this._onImageError}
-                          @load=${this._onImageLoad}
-                        />
-                      </div>
-                      <h2>
-                        ${// In 2020.2 we added support for item.title. All ignored entries before
-                        // that have title "Ignored" so we fallback to localized domain name.
-                        item.title === "Ignored"
-                          ? item.localized_domain_name
-                          : item.title}
-                      </h2>
-                      <mwc-button
-                        @click=${this._removeIgnoredIntegration}
-                        .entry=${item}
-                        aria-label=${this.hass.localize(
-                          "ui.panel.config.integrations.ignore.stop_ignore"
-                        )}
-                        >${this.hass.localize(
-                          "ui.panel.config.integrations.ignore.stop_ignore"
-                        )}</mwc-button
-                      >
-                    </div>
-                  </ha-card>
+                (entry: ConfigEntryExtended) => html`
+                  <ha-ignored-config-entry-card
+                    .hass=${this.hass}
+                    .manifest=${this._manifests[entry.domain]}
+                    .entry=${entry}
+                    @change=${this._handleFlowUpdated}
+                  ></ha-ignored-config-entry-card>
                 `
               )
             : ""}
           ${configEntriesInProgress.length
             ? configEntriesInProgress.map(
-                (flow: DataEntryFlowProgressExtended) => {
-                  const attention = ATTENTION_SOURCES.includes(
-                    flow.context.source
-                  );
-                  return html`
-                    <ha-card
-                      outlined
-                      class=${classMap({
-                        discovered: !attention,
-                        attention: attention,
-                      })}
-                    >
-                      <div class="header">
-                        ${this.hass.localize(
-                          `ui.panel.config.integrations.${
-                            attention ? "attention" : "discovered"
-                          }`
-                        )}
-                      </div>
-                      <div class="card-content">
-                        <div class="image">
-                          <img
-                            src=${brandsUrl(flow.handler, "logo")}
-                            referrerpolicy="no-referrer"
-                            @error=${this._onImageError}
-                            @load=${this._onImageLoad}
-                          />
-                        </div>
-                        <h2>
-                          ${flow.localized_title}
-                        </h2>
-                        <div>
-                          <mwc-button
-                            unelevated
-                            @click=${this._continueFlow}
-                            .flowId=${flow.flow_id}
-                          >
-                            ${this.hass.localize(
-                              `ui.panel.config.integrations.${
-                                attention ? "reconfigure" : "configure"
-                              }`
-                            )}
-                          </mwc-button>
-                          ${DISCOVERY_SOURCES.includes(flow.context.source) &&
-                          flow.context.unique_id
-                            ? html`
-                                <mwc-button
-                                  @click=${this._ignoreFlow}
-                                  .flow=${flow}
-                                >
-                                  ${this.hass.localize(
-                                    "ui.panel.config.integrations.ignore.ignore"
-                                  )}
-                                </mwc-button>
-                              `
-                            : ""}
-                        </div>
-                      </div>
-                    </ha-card>
-                  `;
-                }
+                (flow: DataEntryFlowProgressExtended) => html`
+                  <ha-config-flow-card
+                    .hass=${this.hass}
+                    .manifest=${this._manifests[flow.handler]}
+                    .flow=${flow}
+                    @change=${this._handleFlowUpdated}
+                  ></ha-config-flow-card>
+                `
               )
             : ""}
           ${this._showDisabled
@@ -498,25 +418,28 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
                     .deviceRegistryEntries=${this._deviceRegistryEntries}
                   ></ha-integration-card>`
               )
-            : !this._configEntries.length
+            : // If we're showing 0 cards, show empty state text
+            (!this._showIgnored || ignoredConfigEntries.length === 0) &&
+              (!this._showDisabled || disabledConfigEntries.size === 0) &&
+              groupedConfigEntries.size === 0
             ? html`
-                <ha-card outlined>
-                  <div class="card-content">
-                    <h1>
-                      ${this.hass.localize("ui.panel.config.integrations.none")}
-                    </h1>
-                    <p>
-                      ${this.hass.localize(
-                        "ui.panel.config.integrations.no_integrations"
-                      )}
-                    </p>
-                    <mwc-button @click=${this._createFlow} unelevated
-                      >${this.hass.localize(
-                        "ui.panel.config.integrations.add_integration"
-                      )}</mwc-button
-                    >
-                  </div>
-                </ha-card>
+                <div class="empty-message">
+                  <h1>
+                    ${this.hass.localize("ui.panel.config.integrations.none")}
+                  </h1>
+                  <p>
+                    ${this.hass.localize(
+                      "ui.panel.config.integrations.no_integrations"
+                    )}
+                  </p>
+                  <mwc-button
+                    @click=${this._createFlow}
+                    unelevated
+                    .label=${this.hass.localize(
+                      "ui.panel.config.integrations.add_integration"
+                    )}
+                  ></mwc-button>
+                </div>
               `
             : ""}
           ${this._filter &&
@@ -524,7 +447,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
           !groupedConfigEntries.size &&
           this._configEntries.length
             ? html`
-                <div class="none-found">
+                <div class="empty-message">
                   <h1>
                     ${this.hass.localize(
                       "ui.panel.config.integrations.none_found"
@@ -575,19 +498,40 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
   }
 
   private async _fetchManifests() {
-    const manifests = {};
     const fetched = await fetchIntegrationManifests(this.hass);
+    // Make a copy so we can keep track of previously loaded manifests
+    // for discovered flows (which are not part of these results)
+    const manifests = { ...this._manifests };
     for (const manifest of fetched) manifests[manifest.domain] = manifest;
     this._manifests = manifests;
   }
 
-  private _handleRemoved(ev: HASSDomEvent<ConfigEntryRemovedEvent>) {
+  private async _fetchManifest(domain: string) {
+    if (domain in this._manifests) {
+      return;
+    }
+    if (this._extraFetchedManifests) {
+      if (this._extraFetchedManifests.has(domain)) {
+        return;
+      }
+    } else {
+      this._extraFetchedManifests = new Set();
+    }
+    this._extraFetchedManifests.add(domain);
+    const manifest = await fetchIntegrationManifest(this.hass, domain);
+    this._manifests = {
+      ...this._manifests,
+      [domain]: manifest,
+    };
+  }
+
+  private _handleEntryRemoved(ev: HASSDomEvent<ConfigEntryRemovedEvent>) {
     this._configEntries = this._configEntries!.filter(
       (entry) => entry.entry_id !== ev.detail.entryId
     );
   }
 
-  private _handleUpdated(ev: HASSDomEvent<ConfigEntryUpdatedEvent>) {
+  private _handleEntryUpdated(ev: HASSDomEvent<ConfigEntryUpdatedEvent>) {
     const newEntry = ev.detail.entry;
     this._configEntries = this._configEntries!.map((entry) =>
       entry.entry_id === newEntry.entry_id
@@ -599,6 +543,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
   private _handleFlowUpdated() {
     this._loadConfigEntries();
     getConfigFlowInProgressCollection(this.hass.connection).refresh();
+    this._fetchManifests();
   }
 
   private _createFlow() {
@@ -608,50 +553,14 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
       },
       showAdvanced: this.showAdvanced,
     });
-    // For config entries. Also loading config flow ones for add integration
+    // For config entries. Also loading config flow ones for added integration
     this.hass.loadBackendTranslation("title", undefined, true);
   }
 
-  private _continueFlow(ev: Event) {
-    showConfigFlowDialog(this, {
-      continueFlowId: (ev.target! as any).flowId,
-      dialogClosedCallback: () => {
-        this._handleFlowUpdated();
-      },
-    });
-  }
-
-  private async _ignoreFlow(ev: Event) {
-    const flow = (ev.target! as any).flow;
-    const confirmed = await showConfirmationDialog(this, {
-      title: this.hass!.localize(
-        "ui.panel.config.integrations.ignore.confirm_ignore_title",
-        "name",
-        localizeConfigFlowTitle(this.hass.localize, flow)
-      ),
-      text: this.hass!.localize(
-        "ui.panel.config.integrations.ignore.confirm_ignore"
-      ),
-      confirmText: this.hass!.localize(
-        "ui.panel.config.integrations.ignore.ignore"
-      ),
-    });
-    if (!confirmed) {
-      return;
-    }
-    await ignoreConfigFlow(
-      this.hass,
-      flow.flow_id,
-      localizeConfigFlowTitle(this.hass.localize, flow)
-    );
-    this._loadConfigEntries();
-    getConfigFlowInProgressCollection(this.hass.connection).refresh();
-  }
-
   private _handleMenuAction(ev: CustomEvent<ActionDetail>) {
     switch (ev.detail.index) {
       case 0:
-        this._toggleShowIgnored();
+        this._showIgnored = !this._showIgnored;
         break;
       case 1:
         this._toggleShowDisabled();
@@ -659,54 +568,14 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
     }
   }
 
-  private _toggleShowIgnored() {
-    this._showIgnored = !this._showIgnored;
-  }
-
   private _toggleShowDisabled() {
     this._showDisabled = !this._showDisabled;
   }
 
-  private async _removeIgnoredIntegration(ev: Event) {
-    const entry = (ev.target! as any).entry;
-    showConfirmationDialog(this, {
-      title: this.hass!.localize(
-        "ui.panel.config.integrations.ignore.confirm_delete_ignore_title",
-        "name",
-        this.hass.localize(`component.${entry.domain}.title`)
-      ),
-      text: this.hass!.localize(
-        "ui.panel.config.integrations.ignore.confirm_delete_ignore"
-      ),
-      confirmText: this.hass!.localize(
-        "ui.panel.config.integrations.ignore.stop_ignore"
-      ),
-      confirm: async () => {
-        const result = await deleteConfigEntry(this.hass, entry.entry_id);
-        if (result.require_restart) {
-          alert(
-            this.hass.localize(
-              "ui.panel.config.integrations.config_entry.restart_confirm"
-            )
-          );
-        }
-        this._loadConfigEntries();
-      },
-    });
-  }
-
   private _handleSearchChange(ev: CustomEvent) {
     this._filter = ev.detail.value;
   }
 
-  private _onImageLoad(ev) {
-    ev.target.style.visibility = "initial";
-  }
-
-  private _onImageError(ev) {
-    ev.target.style.visibility = "hidden";
-  }
-
   private async _highlightEntry() {
     await nextRender();
     const entryId = this._searchParms.get("config_entry")!;
@@ -769,66 +638,18 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
           padding: 8px 16px 16px;
           margin-bottom: 64px;
         }
-        ha-card {
+        .container > * {
           max-width: 500px;
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
         }
-        .attention {
-          --ha-card-border-color: var(--error-color);
-        }
-        .attention .header {
-          background: var(--error-color);
-          color: var(--text-primary-color);
-          padding: 8px;
-          text-align: center;
-        }
-        .attention mwc-button {
-          --mdc-theme-primary: var(--error-color);
-        }
-        .discovered {
-          --ha-card-border-color: var(--primary-color);
-        }
-        .discovered .header {
-          background: var(--primary-color);
-          color: var(--text-primary-color);
-          padding: 8px;
-          text-align: center;
-        }
-        .ignored {
-          --ha-card-border-color: var(--light-theme-disabled-color);
-        }
-        .ignored img {
-          filter: grayscale(1);
-        }
-        .ignored .header {
-          background: var(--light-theme-disabled-color);
-          color: var(--text-primary-color);
-          padding: 8px;
-          text-align: center;
-        }
-        .card-content {
-          display: flex;
-          height: 100%;
-          margin-top: 0;
-          padding: 16px;
-          text-align: center;
-          flex-direction: column;
-          justify-content: space-between;
-        }
-        .image {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          height: 60px;
-          margin-bottom: 16px;
-          vertical-align: middle;
-        }
-        .none-found {
+
+        .empty-message {
           margin: auto;
           text-align: center;
         }
+        .empty-message h1 {
+          margin-bottom: 0;
+        }
+
         search-input.header {
           display: block;
           position: relative;
@@ -848,27 +669,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
           position: relative;
           top: 2px;
         }
-        img {
-          max-height: 100%;
-          max-width: 90%;
-        }
-        .none-found {
-          margin: auto;
-          text-align: center;
-        }
-        h1 {
-          margin-bottom: 0;
-        }
-        h2 {
-          margin-top: 0;
-          word-wrap: break-word;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 3;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: normal;
-        }
+
         .active-filters {
           color: var(--primary-text-color);
           position: relative;
diff --git a/src/panels/config/integrations/ha-ignored-config-entry-card.ts b/src/panels/config/integrations/ha-ignored-config-entry-card.ts
new file mode 100644
index 0000000000..cbd6c476b7
--- /dev/null
+++ b/src/panels/config/integrations/ha-ignored-config-entry-card.ts
@@ -0,0 +1,95 @@
+import {
+  customElement,
+  LitElement,
+  property,
+  css,
+  html,
+  TemplateResult,
+} from "lit-element";
+import { fireEvent } from "../../../common/dom/fire_event";
+import { deleteConfigEntry } from "../../../data/config_entries";
+import type { IntegrationManifest } from "../../../data/integration";
+import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box";
+import type { HomeAssistant } from "../../../types";
+import type { ConfigEntryExtended } from "./ha-config-integrations";
+import "./ha-integration-action-card";
+
+@customElement("ha-ignored-config-entry-card")
+export class HaIgnoredConfigEntryCard extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property() public entry!: ConfigEntryExtended;
+
+  @property() public manifest?: IntegrationManifest;
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-integration-action-card
+        .hass=${this.hass}
+        .manifest=${this.manifest}
+        .banner=${this.hass.localize(
+          "ui.panel.config.integrations.ignore.ignored"
+        )}
+        .domain=${this.entry.domain}
+        .localizedDomainName=${this.entry.localized_domain_name}
+        .label=${this.entry.title === "Ignored"
+          ? // In 2020.2 we added support for entry.title. All ignored entries before
+            // that have title "Ignored" so we fallback to localized domain name.
+            this.entry.localized_domain_name
+          : this.entry.title}
+      >
+        <mwc-button
+          @click=${this._removeIgnoredIntegration}
+          .label=${this.hass.localize(
+            "ui.panel.config.integrations.ignore.stop_ignore"
+          )}
+        ></mwc-button>
+      </ha-integration-action-card>
+    `;
+  }
+
+  private async _removeIgnoredIntegration() {
+    showConfirmationDialog(this, {
+      title: this.hass!.localize(
+        "ui.panel.config.integrations.ignore.confirm_delete_ignore_title",
+        "name",
+        this.hass.localize(`component.${this.entry.domain}.title`)
+      ),
+      text: this.hass!.localize(
+        "ui.panel.config.integrations.ignore.confirm_delete_ignore"
+      ),
+      confirmText: this.hass!.localize(
+        "ui.panel.config.integrations.ignore.stop_ignore"
+      ),
+      confirm: async () => {
+        const result = await deleteConfigEntry(this.hass, this.entry.entry_id);
+        if (result.require_restart) {
+          alert(
+            this.hass.localize(
+              "ui.panel.config.integrations.config_entry.restart_confirm"
+            )
+          );
+        }
+        fireEvent(this, "change", undefined, {
+          bubbles: false,
+        });
+      },
+    });
+  }
+
+  static styles = css`
+    :host {
+      --state-color: var(--divider-color, #e0e0e0);
+    }
+
+    mwc-button {
+      --mdc-theme-primary: var(--primary-color);
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-ignored-config-entry-card": HaIgnoredConfigEntryCard;
+  }
+}
diff --git a/src/panels/config/integrations/ha-integration-action-card.ts b/src/panels/config/integrations/ha-integration-action-card.ts
new file mode 100644
index 0000000000..2470067684
--- /dev/null
+++ b/src/panels/config/integrations/ha-integration-action-card.ts
@@ -0,0 +1,77 @@
+import {
+  TemplateResult,
+  html,
+  customElement,
+  LitElement,
+  property,
+  css,
+} from "lit-element";
+import type { IntegrationManifest } from "../../../data/integration";
+import type { HomeAssistant } from "../../../types";
+import "./ha-integration-header";
+
+@customElement("ha-integration-action-card")
+export class HaIntegrationActionCard extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property() public banner!: string;
+
+  @property() public localizedDomainName?: string;
+
+  @property() public domain!: string;
+
+  @property() public label!: string;
+
+  @property() public manifest?: IntegrationManifest;
+
+  protected render(): TemplateResult {
+    return html`
+      <ha-card outlined>
+        <ha-integration-header
+          .hass=${this.hass}
+          .banner=${this.banner}
+          .domain=${this.domain}
+          .label=${this.label}
+          .localizedDomainName=${this.localizedDomainName}
+          .manifest=${this.manifest}
+        ></ha-integration-header>
+        <div class="filler"></div>
+        <div class="actions"><slot></slot></div>
+      </ha-card>
+    `;
+  }
+
+  static styles = css`
+    ha-card {
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+      --ha-card-border-color: var(--state-color);
+      --mdc-theme-primary: var(--state-color);
+    }
+    .filler {
+      flex: 1;
+    }
+    .attention {
+      --state-color: var(--error-color);
+      --text-on-state-color: var(--text-primary-color);
+    }
+    .discovered {
+      --state-color: var(--primary-color);
+      --text-on-state-color: var(--text-primary-color);
+    }
+    .actions {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 8px 6px 0;
+      height: 48px;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-integration-action-card": HaIntegrationActionCard;
+  }
+}
diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts
index be687830cc..44a4b8cc83 100644
--- a/src/panels/config/integrations/ha-integration-card.ts
+++ b/src/panels/config/integrations/ha-integration-card.ts
@@ -1,4 +1,8 @@
 import type { RequestSelectedDetail } from "@material/mwc-list/mwc-list-item";
+import "@material/mwc-list/mwc-list-item";
+import "@polymer/paper-listbox";
+import "@material/mwc-button";
+import "@polymer/paper-item";
 import "@polymer/paper-tooltip/paper-tooltip";
 import { mdiAlertCircle, mdiDotsVertical, mdiOpenInNew } from "@mdi/js";
 import {
@@ -14,7 +18,9 @@ import { classMap } from "lit-html/directives/class-map";
 import { fireEvent } from "../../../common/dom/fire_event";
 import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event";
 import "../../../components/ha-icon-next";
+import "../../../components/ha-button-menu";
 import "../../../components/ha-svg-icon";
+import "../../../components/ha-card";
 import {
   ConfigEntry,
   deleteConfigEntry,
@@ -23,9 +29,9 @@ import {
   reloadConfigEntry,
   updateConfigEntry,
 } from "../../../data/config_entries";
-import { DeviceRegistryEntry } from "../../../data/device_registry";
-import { EntityRegistryEntry } from "../../../data/entity_registry";
-import { domainToName, IntegrationManifest } from "../../../data/integration";
+import type { DeviceRegistryEntry } from "../../../data/device_registry";
+import type { EntityRegistryEntry } from "../../../data/entity_registry";
+import type { IntegrationManifest } from "../../../data/integration";
 import { showConfigEntrySystemOptionsDialog } from "../../../dialogs/config-entry-system-options/show-dialog-config-entry-system-options";
 import { showOptionsFlowDialog } from "../../../dialogs/config-flow/show-dialog-options-flow";
 import {
@@ -34,51 +40,23 @@ import {
   showPromptDialog,
 } from "../../../dialogs/generic/show-dialog-box";
 import { haStyle } from "../../../resources/styles";
-import { HomeAssistant } from "../../../types";
-import { brandsUrl } from "../../../util/brands-url";
-import { ConfigEntryExtended } from "./ha-config-integrations";
+import type { HomeAssistant } from "../../../types";
+import type { ConfigEntryExtended } from "./ha-config-integrations";
+import "./ha-integration-header";
 
-export interface ConfigEntryUpdatedEvent {
-  entry: ConfigEntry;
-}
-
-export interface ConfigEntryRemovedEvent {
-  entryId: string;
-}
-
-declare global {
-  // for fire event
-  interface HASSDomEvents {
-    "entry-updated": ConfigEntryUpdatedEvent;
-    "entry-removed": ConfigEntryRemovedEvent;
-  }
-}
+const ERROR_STATES: ConfigEntry["state"][] = [
+  "migration_error",
+  "setup_error",
+  "setup_retry",
+];
 
 const integrationsWithPanel = {
-  hassio: {
-    buttonLocalizeKey: "ui.panel.config.hassio.button",
-    path: "/hassio/dashboard",
-  },
-  mqtt: {
-    buttonLocalizeKey: "ui.panel.config.mqtt.button",
-    path: "/config/mqtt",
-  },
-  zha: {
-    buttonLocalizeKey: "ui.panel.config.zha.button",
-    path: "/config/zha/dashboard",
-  },
-  ozw: {
-    buttonLocalizeKey: "ui.panel.config.ozw.button",
-    path: "/config/ozw/dashboard",
-  },
-  zwave: {
-    buttonLocalizeKey: "ui.panel.config.zwave.button",
-    path: "/config/zwave",
-  },
-  zwave_js: {
-    buttonLocalizeKey: "ui.panel.config.zwave_js.button",
-    path: "/config/zwave_js/dashboard",
-  },
+  hassio: "/hassio/dashboard",
+  mqtt: "/config/mqtt",
+  zha: "/config/zha/dashboard",
+  ozw: "/config/ozw/dashboard",
+  zwave: "/config/zwave",
+  zwave_js: "/config/zwave_js/dashboard",
 };
 
 @customElement("ha-integration-card")
@@ -89,7 +67,7 @@ export class HaIntegrationCard extends LitElement {
 
   @property() public items!: ConfigEntryExtended[];
 
-  @property() public manifest!: IntegrationManifest;
+  @property() public manifest?: IntegrationManifest;
 
   @property() public entityRegistryEntries!: EntityRegistryEntry[];
 
@@ -99,80 +77,97 @@ export class HaIntegrationCard extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-  }
-
   protected render(): TemplateResult {
+    let item = this._selectededConfigEntry;
+
     if (this.items.length === 1) {
-      return this._renderSingleEntry(this.items[0]);
-    }
-    if (this.selectedConfigEntryId) {
-      const configEntry = this.items.find(
+      item = this.items[0];
+    } else if (this.selectedConfigEntryId) {
+      item = this.items.find(
         (entry) => entry.entry_id === this.selectedConfigEntryId
       );
-      if (configEntry) {
-        return this._renderSingleEntry(configEntry);
-      }
     }
-    return this._renderGroupedIntegration();
+
+    const hasItem = item !== undefined;
+
+    return html`
+      <ha-card
+        outlined
+        class="${classMap({
+          single: hasItem,
+          group: !hasItem,
+          hasMultiple: this.items.length > 1,
+          disabled: this.disabled,
+          "state-not-loaded": hasItem && item!.state === "not_loaded",
+          "state-failed-unload": hasItem && item!.state === "failed_unload",
+          "state-error": hasItem && ERROR_STATES.includes(item!.state),
+        })}"
+        .configEntry=${item}
+      >
+        <ha-integration-header
+          .hass=${this.hass}
+          .banner=${this.disabled
+            ? this.hass.localize(
+                "ui.panel.config.integrations.config_entry.disable.disabled"
+              )
+            : undefined}
+          .domain=${this.domain}
+          .label=${item
+            ? item.title || item.localized_domain_name || this.domain
+            : undefined}
+          .localizedDomainName=${item ? item.localized_domain_name : undefined}
+          .manifest=${this.manifest}
+        >
+          ${this.items.length > 1
+            ? html`
+                <div class="back-btn" slot="above-header">
+                  <ha-icon-button
+                    icon="hass:chevron-left"
+                    @click=${this._back}
+                  ></ha-icon-button>
+                </div>
+              `
+            : ""}
+        </ha-integration-header>
+
+        ${item
+          ? this._renderSingleEntry(item)
+          : this._renderGroupedIntegration()}
+      </ha-card>
+    `;
   }
 
   private _renderGroupedIntegration(): TemplateResult {
     return html`
-      <ha-card outlined class="group ${classMap({ disabled: this.disabled })}">
-        ${this.disabled
-          ? html`<div class="header">
-              ${this.hass.localize(
-                "ui.panel.config.integrations.config_entry.disable.disabled"
-              )}
-            </div>`
-          : ""}
-        <div class="group-header">
-          <img
-            src=${brandsUrl(this.domain, "icon")}
-            referrerpolicy="no-referrer"
-            @error=${this._onImageError}
-            @load=${this._onImageLoad}
-          />
-          <h2>
-            ${domainToName(this.hass.localize, this.domain)}
-          </h2>
-        </div>
-        <paper-listbox>
-          ${this.items.map(
-            (item) =>
-              html`<paper-item
-                .entryId=${item.entry_id}
-                @click=${this._selectConfigEntry}
-                ><paper-item-body
-                  >${item.title ||
-                  this.hass.localize(
-                    "ui.panel.config.integrations.config_entry.unnamed_entry"
-                  )}</paper-item-body
-                >
-                ${item.state === "not_loaded"
-                  ? html`<span>
-                      <ha-svg-icon
-                        class="error"
-                        .path=${mdiAlertCircle}
-                      ></ha-svg-icon
-                      ><paper-tooltip animation-delay="0" position="left">
-                        ${this.hass.localize(
-                          "ui.panel.config.integrations.config_entry.not_loaded",
-                          "logs_link",
-                          this.hass.localize(
-                            "ui.panel.config.integrations.config_entry.logs"
-                          )
-                        )}
-                      </paper-tooltip>
-                    </span>`
-                  : ""}
-                <ha-icon-next></ha-icon-next>
-              </paper-item>`
-          )}
-        </paper-listbox>
-      </ha-card>
+      <paper-listbox>
+        ${this.items.map(
+          (item) =>
+            html`<paper-item
+              .entryId=${item.entry_id}
+              @click=${this._selectConfigEntry}
+              ><paper-item-body
+                >${item.title ||
+                this.hass.localize(
+                  "ui.panel.config.integrations.config_entry.unnamed_entry"
+                )}</paper-item-body
+              >
+              ${ERROR_STATES.includes(item.state)
+                ? html`<span>
+                    <ha-svg-icon
+                      class="error"
+                      .path=${mdiAlertCircle}
+                    ></ha-svg-icon
+                    ><paper-tooltip animation-delay="0" position="left">
+                      ${this.hass.localize(
+                        `ui.panel.config.integrations.config_entry.state.${item.state}`
+                      )}
+                    </paper-tooltip>
+                  </span>`
+                : ""}
+              <ha-icon-next></ha-icon-next>
+            </paper-item>`
+        )}
+      </paper-listbox>
     `;
   }
 
@@ -181,209 +176,220 @@ export class HaIntegrationCard extends LitElement {
     const services = this._getServices(item);
     const entities = this._getEntities(item);
 
+    let stateText: [string, ...unknown[]] | undefined;
+    let stateTextExtra: TemplateResult | string | undefined;
+
+    if (item.disabled_by) {
+      stateText = [
+        "ui.panel.config.integrations.config_entry.disable.disabled_cause",
+        "cause",
+        this.hass.localize(
+          `ui.panel.config.integrations.config_entry.disable.disabled_by.${item.disabled_by}`
+        ) || item.disabled_by,
+      ];
+      if (item.state === "failed_unload") {
+        stateTextExtra = html`.
+        ${this.hass.localize(
+          "ui.panel.config.integrations.config_entry.disable_restart_confirm"
+        )}.`;
+      }
+    } else if (item.state === "not_loaded") {
+      stateText = ["ui.panel.config.integrations.config_entry.not_loaded"];
+    } else if (ERROR_STATES.includes(item.state)) {
+      stateText = [
+        `ui.panel.config.integrations.config_entry.state.${item.state}`,
+      ];
+      if (item.reason) {
+        this.hass.loadBackendTranslation("config", item.domain);
+        stateTextExtra = html`:
+        ${this.hass.localize(
+          `component.${item.domain}.config.error.${item.reason}`
+        ) || item.reason}`;
+      } else {
+        stateTextExtra = html`
+          <br />
+          <a href="/config/logs"
+            >${this.hass.localize(
+              "ui.panel.config.integrations.config_entry.check_the_logs"
+            )}</a
+          >
+        `;
+      }
+    }
+
     return html`
-      <ha-card
-        outlined
-        class="single integration ${classMap({
-          disabled: Boolean(item.disabled_by),
-          "not-loaded": !item.disabled_by && item.state === "not_loaded",
-        })}"
-        .configEntry=${item}
-        .id=${item.entry_id}
-      >
-        ${this.items.length > 1
-          ? html`<ha-icon-button
-              class="back-btn"
-              icon="hass:chevron-left"
-              @click=${this._back}
-            ></ha-icon-button>`
+      ${stateText
+        ? html`
+            <div class="message">
+              <ha-svg-icon .path=${mdiAlertCircle}></ha-svg-icon>
+              <div>
+                ${this.hass.localize(...stateText)}${stateTextExtra}
+              </div>
+            </div>
+          `
+        : ""}
+      <div class="content">
+        ${devices.length || services.length || entities.length
+          ? html`
+              <div>
+                ${devices.length
+                  ? html`
+                      <a
+                        href=${`/config/devices/dashboard?historyBack=1&config_entry=${item.entry_id}`}
+                        >${this.hass.localize(
+                          "ui.panel.config.integrations.config_entry.devices",
+                          "count",
+                          devices.length
+                        )}</a
+                      >${services.length ? "," : ""}
+                    `
+                  : ""}
+                ${services.length
+                  ? html`
+                      <a
+                        href=${`/config/devices/dashboard?historyBack=1&config_entry=${item.entry_id}`}
+                        >${this.hass.localize(
+                          "ui.panel.config.integrations.config_entry.services",
+                          "count",
+                          services.length
+                        )}</a
+                      >
+                    `
+                  : ""}
+                ${(devices.length || services.length) && entities.length
+                  ? this.hass.localize("ui.common.and")
+                  : ""}
+                ${entities.length
+                  ? html`
+                      <a
+                        href=${`/config/entities?historyBack=1&config_entry=${item.entry_id}`}
+                        >${this.hass.localize(
+                          "ui.panel.config.integrations.config_entry.entities",
+                          "count",
+                          entities.length
+                        )}</a
+                      >
+                    `
+                  : ""}
+              </div>
+            `
           : ""}
-        ${item.disabled_by
-          ? html`<div class="header">
-              ${this.hass.localize(
-                "ui.panel.config.integrations.config_entry.disable.disabled_cause",
-                "cause",
-                this.hass.localize(
-                  `ui.panel.config.integrations.config_entry.disable.disabled_by.${item.disabled_by}`
-                ) || item.disabled_by
-              )}
-            </div>`
-          : item.state === "not_loaded"
-          ? html`<div class="header">
-              ${this.hass.localize(
-                "ui.panel.config.integrations.config_entry.not_loaded",
-                "logs_link",
-                html`<a href="/config/logs"
-                  >${this.hass.localize(
-                    "ui.panel.config.integrations.config_entry.logs"
-                  )}</a
-                >`
-              )}
-            </div>`
-          : ""}
-        <div class="card-content">
-          <div class="image">
-            <img
-              src=${brandsUrl(item.domain, "logo")}
-              referrerpolicy="no-referrer"
-              @error=${this._onImageError}
-              @load=${this._onImageLoad}
-            />
-          </div>
-          <h2>
-            ${item.localized_domain_name}
-          </h2>
-          <h3>
-            ${item.localized_domain_name === item.title ? "" : item.title}
-          </h3>
-          ${devices.length || services.length || entities.length
+      </div>
+      <div class="actions">
+        <div>
+          ${item.disabled_by === "user"
+            ? html`<mwc-button unelevated @click=${this._handleEnable}>
+                ${this.hass.localize("ui.common.enable")}
+              </mwc-button>`
+            : item.domain in integrationsWithPanel
+            ? html`<a
+                href=${`${integrationsWithPanel[item.domain]}?config_entry=${
+                  item.entry_id
+                }`}
+                ><mwc-button>
+                  ${this.hass.localize(
+                    "ui.panel.config.integrations.config_entry.configure"
+                  )}
+                </mwc-button></a
+              >`
+            : item.supports_options
             ? html`
-                <div>
-                  ${devices.length
-                    ? html`
-                        <a
-                          href=${`/config/devices/dashboard?historyBack=1&config_entry=${item.entry_id}`}
-                          >${this.hass.localize(
-                            "ui.panel.config.integrations.config_entry.devices",
-                            "count",
-                            devices.length
-                          )}</a
-                        >${services.length ? "," : ""}
-                      `
-                    : ""}
-                  ${services.length
-                    ? html`
-                        <a
-                          href=${`/config/devices/dashboard?historyBack=1&config_entry=${item.entry_id}`}
-                          >${this.hass.localize(
-                            "ui.panel.config.integrations.config_entry.services",
-                            "count",
-                            services.length
-                          )}</a
-                        >
-                      `
-                    : ""}
-                  ${(devices.length || services.length) && entities.length
-                    ? this.hass.localize("ui.common.and")
-                    : ""}
-                  ${entities.length
-                    ? html`
-                        <a
-                          href=${`/config/entities?historyBack=1&config_entry=${item.entry_id}`}
-                          >${this.hass.localize(
-                            "ui.panel.config.integrations.config_entry.entities",
-                            "count",
-                            entities.length
-                          )}</a
-                        >
-                      `
-                    : ""}
-                </div>
+                <mwc-button @click=${this._showOptions}>
+                  ${this.hass.localize(
+                    "ui.panel.config.integrations.config_entry.configure"
+                  )}
+                </mwc-button>
               `
             : ""}
         </div>
-        <div class="card-actions">
-          <div>
-            ${item.disabled_by === "user"
-              ? html`<mwc-button unelevated @click=${this._handleEnable}>
-                  ${this.hass.localize("ui.common.enable")}
-                </mwc-button>`
-              : ""}
-            <mwc-button @click=${this._editEntryName}>
-              ${this.hass.localize(
-                "ui.panel.config.integrations.config_entry.rename"
-              )}
-            </mwc-button>
-            ${item.domain in integrationsWithPanel
-              ? html`<a
-                  href=${`${
-                    integrationsWithPanel[item.domain].path
-                  }?config_entry=${item.entry_id}`}
-                  ><mwc-button>
+        ${!this.manifest
+          ? ""
+          : html`
+              <ha-button-menu corner="BOTTOM_START">
+                <mwc-icon-button
+                  .title=${this.hass.localize("ui.common.menu")}
+                  .label=${this.hass.localize("ui.common.overflow_menu")}
+                  slot="trigger"
+                >
+                  <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
+                </mwc-icon-button>
+                <mwc-list-item @request-selected="${this._editEntryName}">
+                  ${this.hass.localize(
+                    "ui.panel.config.integrations.config_entry.rename"
+                  )}
+                </mwc-list-item>
+                <mwc-list-item @request-selected="${this._handleSystemOptions}">
+                  ${this.hass.localize(
+                    "ui.panel.config.integrations.config_entry.system_options"
+                  )}
+                </mwc-list-item>
+
+                <a
+                  href=${this.manifest.documentation}
+                  rel="noreferrer"
+                  target="_blank"
+                >
+                  <mwc-list-item hasMeta>
                     ${this.hass.localize(
-                      integrationsWithPanel[item.domain].buttonLocalizeKey
-                    )}
-                  </mwc-button></a
-                >`
-              : item.supports_options
-              ? html`
-                  <mwc-button @click=${this._showOptions}>
-                    ${this.hass.localize(
-                      "ui.panel.config.integrations.config_entry.options"
-                    )}
-                  </mwc-button>
-                `
-              : ""}
-          </div>
-          <ha-button-menu corner="BOTTOM_START">
-            <mwc-icon-button
-              .title=${this.hass.localize("ui.common.menu")}
-              .label=${this.hass.localize("ui.common.overflow_menu")}
-              slot="trigger"
-            >
-              <ha-svg-icon .path=${mdiDotsVertical}></ha-svg-icon>
-            </mwc-icon-button>
-            <mwc-list-item @request-selected="${this._handleSystemOptions}">
-              ${this.hass.localize(
-                "ui.panel.config.integrations.config_entry.system_options"
-              )}
-            </mwc-list-item>
-            ${!this.manifest
-              ? ""
-              : html`
-                  <a
-                    href=${this.manifest.documentation}
-                    rel="noreferrer"
-                    target="_blank"
-                  >
-                    <mwc-list-item hasMeta>
+                      "ui.panel.config.integrations.config_entry.documentation"
+                    )}<ha-svg-icon
+                      slot="meta"
+                      .path=${mdiOpenInNew}
+                    ></ha-svg-icon>
+                  </mwc-list-item>
+                </a>
+                ${!item.disabled_by &&
+                item.state === "loaded" &&
+                item.supports_unload &&
+                item.source !== "system"
+                  ? html`<mwc-list-item
+                      @request-selected="${this._handleReload}"
+                    >
                       ${this.hass.localize(
-                        "ui.panel.config.integrations.config_entry.documentation"
-                      )}<ha-svg-icon
-                        slot="meta"
-                        .path=${mdiOpenInNew}
-                      ></ha-svg-icon>
-                    </mwc-list-item>
-                  </a>
-                `}
-            ${!item.disabled_by &&
-            item.state === "loaded" &&
-            item.supports_unload &&
-            item.source !== "system"
-              ? html`<mwc-list-item @request-selected="${this._handleReload}">
-                  ${this.hass.localize(
-                    "ui.panel.config.integrations.config_entry.reload"
-                  )}
-                </mwc-list-item>`
-              : ""}
-            ${item.disabled_by === "user"
-              ? html`<mwc-list-item @request-selected="${this._handleEnable}">
-                  ${this.hass.localize("ui.common.enable")}
-                </mwc-list-item>`
-              : item.source !== "system"
-              ? html`<mwc-list-item
-                  class="warning"
-                  @request-selected="${this._handleDisable}"
-                >
-                  ${this.hass.localize("ui.common.disable")}
-                </mwc-list-item>`
-              : ""}
-            ${item.source !== "system"
-              ? html`<mwc-list-item
-                  class="warning"
-                  @request-selected="${this._handleDelete}"
-                >
-                  ${this.hass.localize(
-                    "ui.panel.config.integrations.config_entry.delete"
-                  )}
-                </mwc-list-item>`
-              : ""}
-          </ha-button-menu>
-        </div>
-      </ha-card>
+                        "ui.panel.config.integrations.config_entry.reload"
+                      )}
+                    </mwc-list-item>`
+                  : ""}
+                ${item.disabled_by === "user"
+                  ? html`<mwc-list-item
+                      @request-selected="${this._handleEnable}"
+                    >
+                      ${this.hass.localize("ui.common.enable")}
+                    </mwc-list-item>`
+                  : item.source !== "system"
+                  ? html`<mwc-list-item
+                      class="warning"
+                      @request-selected="${this._handleDisable}"
+                    >
+                      ${this.hass.localize("ui.common.disable")}
+                    </mwc-list-item>`
+                  : ""}
+                ${item.source !== "system"
+                  ? html`<mwc-list-item
+                      class="warning"
+                      @request-selected="${this._handleDelete}"
+                    >
+                      ${this.hass.localize(
+                        "ui.panel.config.integrations.config_entry.delete"
+                      )}
+                    </mwc-list-item>`
+                  : ""}
+              </ha-button-menu>
+            `}
+      </div>
     `;
   }
 
+  private get _selectededConfigEntry(): ConfigEntryExtended | undefined {
+    return this.items.length === 1
+      ? this.items[0]
+      : this.selectedConfigEntryId
+      ? this.items.find(
+          (entry) => entry.entry_id === this.selectedConfigEntryId
+        )
+      : undefined;
+  }
+
   private _selectConfigEntry(ev: Event) {
     this.selectedConfigEntryId = (ev.currentTarget as any).entryId;
   }
@@ -424,14 +430,6 @@ export class HaIntegrationCard extends LitElement {
     );
   }
 
-  private _onImageLoad(ev) {
-    ev.target.style.visibility = "initial";
-  }
-
-  private _onImageError(ev) {
-    ev.target.style.visibility = "hidden";
-  }
-
   private _showOptions(ev) {
     showOptionsFlowDialog(this, ev.target.closest("ha-card").configEntry);
   }
@@ -589,123 +587,115 @@ export class HaIntegrationCard extends LitElement {
     return [
       haStyle,
       css`
-        :host {
-          max-width: 500px;
-        }
         ha-card {
           display: flex;
           flex-direction: column;
           height: 100%;
+          --state-color: var(--divider-color, #e0e0e0);
+          --ha-card-border-color: var(--state-color);
+          --state-message-color: var(--state-color);
         }
-        ha-card.single {
-          justify-content: space-between;
+        .state-error {
+          --state-color: var(--error-color);
+          --text-on-state-color: var(--text-primary-color);
+        }
+        .state-failed-unload {
+          --state-color: var(--warning-color);
+          --text-on-state-color: var(--primary-text-color);
+        }
+        .state-not-loaded {
+          --state-message-color: var(--primary-text-color);
         }
         :host(.highlight) ha-card {
-          border: 1px solid var(--accent-color);
+          --state-color: var(--primary-color);
+          --text-on-state-color: var(--text-primary-color);
         }
-        .disabled {
-          --ha-card-border-color: var(--warning-color);
+
+        .back-btn {
+          background-color: var(--state-color);
+          color: var(--text-on-state-color);
+          --mdc-icon-button-size: 32px;
+          transition: height 0.1s;
+          overflow: hidden;
         }
-        .not-loaded {
-          --ha-card-border-color: var(--error-color);
+        .hasMultiple.single .back-btn {
+          height: 24px;
+          display: flex;
+          align-items: center;
         }
-        .header {
-          padding: 8px;
-          text-align: center;
+        .hasMultiple.group .back-btn {
+          height: 0px;
         }
-        .disabled .header {
-          background: var(--warning-color);
-          color: var(--text-primary-color);
+
+        .message {
+          font-weight: bold;
+          padding-bottom: 16px;
+          display: flex;
+          margin-left: 40px;
         }
-        .not-loaded .header {
-          background: var(--error-color);
-          color: var(--text-primary-color);
+        .message ha-svg-icon {
+          color: var(--state-message-color);
         }
-        .not-loaded .header a {
-          color: var(--text-primary-color);
+        .message div {
+          flex: 1;
+          margin-left: 8px;
+          padding-top: 2px;
         }
-        .card-content {
-          padding: 16px;
-          text-align: center;
+
+        .content {
+          flex: 1;
+          padding: 0px 16px 0 72px;
         }
-        ha-card.integration .card-content {
-          padding-bottom: 3px;
-        }
-        .card-actions {
-          border-top: none;
+
+        .actions {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          padding-right: 5px;
+          padding: 8px 0 0 8px;
+          height: 48px;
         }
-        .group-header {
-          display: flex;
-          align-items: center;
-          height: 40px;
-          padding: 16px 16px 8px 16px;
-          justify-content: center;
-        }
-        .group-header h1 {
-          margin: 0;
-        }
-        .group-header img {
-          margin-right: 8px;
-        }
-        .image {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          height: 60px;
-          margin-bottom: 16px;
-          vertical-align: middle;
-        }
-        img {
-          max-height: 100%;
-          max-width: 90%;
-        }
-        .none-found {
-          margin: auto;
-          text-align: center;
+        .actions a {
+          text-decoration: none;
         }
         a {
           color: var(--primary-color);
         }
-        h1 {
-          margin-bottom: 0;
-        }
-        h2 {
-          min-height: 24px;
-        }
-        h3 {
-          word-wrap: break-word;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 3;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
         ha-button-menu {
           color: var(--secondary-text-color);
           --mdc-menu-min-width: 200px;
         }
         @media (min-width: 563px) {
+          ha-card.group {
+            position: relative;
+            min-height: 164px;
+          }
           paper-listbox {
-            max-height: 150px;
+            position: absolute;
+            top: 64px;
+            left: 0;
+            right: 0;
+            bottom: 0;
             overflow: auto;
           }
+          .disabled paper-listbox {
+            top: 88px;
+          }
         }
         paper-item {
           cursor: pointer;
           min-height: 35px;
         }
+        paper-item-body {
+          word-wrap: break-word;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
         mwc-list-item ha-svg-icon {
           color: var(--secondary-text-color);
         }
-        .back-btn {
-          position: absolute;
-          background: rgba(var(--rgb-card-background-color), 0.6);
-          border-radius: 50%;
-        }
       `,
     ];
   }
diff --git a/src/panels/config/integrations/ha-integration-header.ts b/src/panels/config/integrations/ha-integration-header.ts
new file mode 100644
index 0000000000..6ace567a6d
--- /dev/null
+++ b/src/panels/config/integrations/ha-integration-header.ts
@@ -0,0 +1,176 @@
+import { mdiPackageVariant, mdiCloud } from "@mdi/js";
+import "@polymer/paper-tooltip/paper-tooltip";
+import {
+  css,
+  html,
+  customElement,
+  property,
+  LitElement,
+  TemplateResult,
+} from "lit-element";
+import { domainToName, IntegrationManifest } from "../../../data/integration";
+import { HomeAssistant } from "../../../types";
+import { brandsUrl } from "../../../util/brands-url";
+
+@customElement("ha-integration-header")
+export class HaIntegrationHeader extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property() public banner!: string;
+
+  @property() public localizedDomainName?: string;
+
+  @property() public domain!: string;
+
+  @property() public label!: string;
+
+  @property() public manifest?: IntegrationManifest;
+
+  protected render(): TemplateResult {
+    let primary: string;
+    let secondary: string | undefined;
+
+    const domainName =
+      this.localizedDomainName ||
+      domainToName(this.hass.localize, this.domain, this.manifest);
+
+    if (this.label) {
+      primary = this.label;
+      secondary = primary === domainName ? undefined : domainName;
+    } else {
+      primary = domainName;
+    }
+
+    const icons: [string, string][] = [];
+
+    if (this.manifest) {
+      if (!this.manifest.is_built_in) {
+        icons.push([
+          mdiPackageVariant,
+          this.hass.localize(
+            "ui.panel.config.integrations.config_entry.provided_by_custom_integration"
+          ),
+        ]);
+      }
+
+      if (
+        this.manifest.iot_class &&
+        this.manifest.iot_class.startsWith("cloud_")
+      ) {
+        icons.push([
+          mdiCloud,
+          this.hass.localize(
+            "ui.panel.config.integrations.config_entry.depends_on_cloud"
+          ),
+        ]);
+      }
+    }
+
+    return html`
+      ${!this.banner
+        ? ""
+        : html`<div class="banner">
+            ${this.banner}
+          </div>`}
+      <slot name="above-header"></slot>
+      <div class="header">
+        <img
+          src=${brandsUrl(this.domain, "icon")}
+          referrerpolicy="no-referrer"
+          @error=${this._onImageError}
+          @load=${this._onImageLoad}
+        />
+        <div class="info">
+          <div class="primary">${primary}</div>
+          ${secondary ? html`<div class="secondary">${secondary}</div>` : ""}
+        </div>
+        ${icons.length === 0
+          ? ""
+          : html`
+              <div class="icons">
+                ${icons.map(
+                  ([icon, description]) => html`
+                    <span>
+                      <ha-svg-icon .path=${icon}></ha-svg-icon>
+                      <paper-tooltip animation-delay="0"
+                        >${description}</paper-tooltip
+                      >
+                    </span>
+                  `
+                )}
+              </div>
+            `}
+      </div>
+    `;
+  }
+
+  private _onImageLoad(ev) {
+    ev.target.style.visibility = "initial";
+  }
+
+  private _onImageError(ev) {
+    ev.target.style.visibility = "hidden";
+  }
+
+  static styles = css`
+    .banner {
+      background-color: var(--state-color);
+      color: var(--text-on-state-color);
+      text-align: center;
+      padding: 2px;
+    }
+    .header {
+      display: flex;
+      position: relative;
+      padding: 16px 8px 8px 16px;
+    }
+    .header img {
+      margin-right: 16px;
+      width: 40px;
+      height: 40px;
+    }
+    .header .info {
+      align-self: center;
+    }
+    .header .info div {
+      word-wrap: break-word;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .primary {
+      font-size: 16px;
+      font-weight: 400;
+      color: var(--primary-text-color);
+    }
+    .secondary {
+      font-size: 14px;
+      color: var(--secondary-text-color);
+    }
+    .icons {
+      position: absolute;
+      top: 0px;
+      right: 16px;
+      color: var(--text-on-state-color, var(--secondary-text-color));
+      background-color: var(--state-color, #e0e0e0);
+      border-bottom-left-radius: 4px;
+      border-bottom-right-radius: 4px;
+      padding: 1px 4px 2px;
+    }
+    .icons ha-svg-icon {
+      width: 20px;
+      height: 20px;
+    }
+    paper-tooltip {
+      white-space: nowrap;
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-integration-header": HaIntegrationHeader;
+  }
+}
diff --git a/src/panels/config/integrations/integration-panels/zha/dialog-zha-device-children.ts b/src/panels/config/integrations/integration-panels/zha/dialog-zha-device-children.ts
index 31869775cc..135776a74a 100644
--- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-device-children.ts
+++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-device-children.ts
@@ -76,9 +76,7 @@ class DialogZHADeviceChildren extends LitElement {
     },
   };
 
-  public showDialog(
-    params: ZHADeviceChildrenDialogParams
-  ): void {
+  public showDialog(params: ZHADeviceChildrenDialogParams): void {
     this._device = params.device;
     this._fetchData();
   }
diff --git a/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts b/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts
index 8e29d5af94..e32e984729 100644
--- a/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts
+++ b/src/panels/config/integrations/integration-panels/zha/dialog-zha-reconfigure-device.ts
@@ -8,42 +8,62 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
-import { createCloseHeading } from "../../../../../components/ha-dialog";
+import { mdiCheckCircle, mdiCloseCircle } from "@mdi/js";
+import "@material/mwc-button/mwc-button";
 import { haStyleDialog } from "../../../../../resources/styles";
 import { HomeAssistant } from "../../../../../types";
 import { ZHAReconfigureDeviceDialogParams } from "./show-dialog-zha-reconfigure-device";
-import { IronAutogrowTextareaElement } from "@polymer/iron-autogrow-textarea";
-import "@polymer/paper-input/paper-textarea";
 import "../../../../../components/ha-circular-progress";
-import { LOG_OUTPUT, reconfigureNode } from "../../../../../data/zha";
+import "../../../../../components/ha-svg-icon";
+import {
+  AttributeConfigurationStatus,
+  Cluster,
+  ClusterConfigurationEvent,
+  ClusterConfigurationStatus,
+  fetchClustersForZhaNode,
+  reconfigureNode,
+  ZHA_CHANNEL_CFG_DONE,
+  ZHA_CHANNEL_MSG_BIND,
+  ZHA_CHANNEL_MSG_CFG_RPT,
+} from "../../../../../data/zha";
 import { fireEvent } from "../../../../../common/dom/fire_event";
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
+import { createCloseHeading } from "../../../../../components/ha-dialog";
 
 @customElement("dialog-zha-reconfigure-device")
 class DialogZHAReconfigureDevice extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @internalProperty() private _active = false;
+  @internalProperty() private _status?: string;
 
-  @internalProperty() private _formattedEvents = "";
+  @internalProperty() private _stages?: string[];
 
-  @internalProperty()
-  private _params: ZHAReconfigureDeviceDialogParams | undefined = undefined;
+  @internalProperty() private _clusterConfigurationStatuses?: Map<
+    number,
+    ClusterConfigurationStatus
+  > = new Map();
 
-  private _subscribed?: Promise<() => Promise<void>>;
+  @internalProperty() private _params:
+    | ZHAReconfigureDeviceDialogParams
+    | undefined = undefined;
 
-  private _reconfigureDeviceTimeoutHandle: any = undefined;
+  @internalProperty() private _allSuccessful = true;
 
-  public async showDialog(
-    params: ZHAReconfigureDeviceDialogParams
-  ): Promise<void> {
+  @internalProperty() private _showDetails = false;
+
+  private _subscribed?: Promise<UnsubscribeFunc>;
+
+  public showDialog(params: ZHAReconfigureDeviceDialogParams): void {
     this._params = params;
-    this._subscribe(params);
+    this._stages = undefined;
   }
 
   public closeDialog(): void {
     this._unsubscribe();
-    this._formattedEvents = "";
     this._params = undefined;
+    this._status = undefined;
+    this._stages = undefined;
+    this._clusterConfigurationStatuses = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
@@ -51,58 +71,311 @@ class DialogZHAReconfigureDevice extends LitElement {
     if (!this._params) {
       return html``;
     }
+
     return html`
       <ha-dialog
         open
-        hideActions
-        @closing="${this.closeDialog}"
+        @closed="${this.closeDialog}"
         .heading=${createCloseHeading(
           this.hass,
-          this.hass.localize(`ui.dialogs.zha_reconfigure_device.heading`)
+          this.hass.localize(`ui.dialogs.zha_reconfigure_device.heading`) +
+            ": " +
+            (this._params?.device.user_given_name || this._params?.device.name)
         )}
       >
-        <div class="searching">
-          ${this._active
-            ? html`
-                <h1>
-                  ${this._params?.device.user_given_name ||
-                  this._params?.device.name}
-                </h1>
-                <ha-circular-progress
-                  active
-                  alt="Searching"
-                ></ha-circular-progress>
-              `
-            : ""}
-        </div>
-        <paper-textarea
-          readonly
-          max-rows="10"
-          class="log"
-          value="${this._formattedEvents}"
-        >
-        </paper-textarea>
+        ${!this._status
+          ? html`
+              <p>
+                ${this.hass.localize(
+                  "ui.dialogs.zha_reconfigure_device.introduction"
+                )}
+              </p>
+              <p>
+                <em>
+                  ${this.hass.localize(
+                    "ui.dialogs.zha_reconfigure_device.battery_device_warning"
+                  )}
+                </em>
+              </p>
+              <mwc-button
+                slot="primaryAction"
+                @click=${this._startReconfiguration}
+              >
+                ${this.hass.localize(
+                  "ui.dialogs.zha_reconfigure_device.start_reconfiguration"
+                )}
+              </mwc-button>
+            `
+          : ``}
+        ${this._status === "started"
+          ? html`
+              <div class="flex-container">
+                <ha-circular-progress active></ha-circular-progress>
+                <div class="status">
+                  <p>
+                    <b>
+                      ${this.hass.localize(
+                        "ui.dialogs.zha_reconfigure_device.in_progress"
+                      )}
+                    </b>
+                  </p>
+                  <p>
+                    ${this.hass.localize(
+                      "ui.dialogs.zha_reconfigure_device.run_in_background"
+                    )}
+                  </p>
+                </div>
+              </div>
+              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
+                ${this.hass.localize("ui.dialogs.generic.close")}
+              </mwc-button>
+              <mwc-button slot="secondaryAction" @click=${this._toggleDetails}>
+                ${this._showDetails
+                  ? this.hass.localize(
+                      `ui.dialogs.zha_reconfigure_device.button_hide`
+                    )
+                  : this.hass.localize(
+                      `ui.dialogs.zha_reconfigure_device.button_show`
+                    )}
+              </mwc-button>
+            `
+          : ``}
+        ${this._status === "failed"
+          ? html`
+              <div class="flex-container">
+                <ha-svg-icon
+                  .path=${mdiCloseCircle}
+                  class="failed"
+                ></ha-svg-icon>
+                <div class="status">
+                  <p>
+                    ${this.hass.localize(
+                      "ui.dialogs.zha_reconfigure_device.configuration_failed"
+                    )}
+                  </p>
+                </div>
+              </div>
+              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
+                ${this.hass.localize("ui.dialogs.generic.close")}
+              </mwc-button>
+              <mwc-button slot="secondaryAction" @click=${this._toggleDetails}>
+                ${this._showDetails
+                  ? this.hass.localize(
+                      `ui.dialogs.zha_reconfigure_device.button_hide`
+                    )
+                  : this.hass.localize(
+                      `ui.dialogs.zha_reconfigure_device.button_show`
+                    )}
+              </mwc-button>
+            `
+          : ``}
+        ${this._status === "finished"
+          ? html`
+              <div class="flex-container">
+                <ha-svg-icon
+                  .path=${mdiCheckCircle}
+                  class="success"
+                ></ha-svg-icon>
+                <div class="status">
+                  <p>
+                    ${this.hass.localize(
+                      "ui.dialogs.zha_reconfigure_device.configuration_complete"
+                    )}
+                  </p>
+                </div>
+              </div>
+              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
+                ${this.hass.localize("ui.dialogs.generic.close")}
+              </mwc-button>
+              <mwc-button slot="secondaryAction" @click=${this._toggleDetails}>
+                ${this._showDetails
+                  ? this.hass.localize(
+                      `ui.dialogs.zha_reconfigure_device.button_hide`
+                    )
+                  : this.hass.localize(
+                      `ui.dialogs.zha_reconfigure_device.button_show`
+                    )}
+              </mwc-button>
+            `
+          : ``}
+        ${this._stages
+          ? html`
+              <div class="stages">
+                ${this._stages.map(
+                  (stage) => html`
+                    <span class="stage">
+                      <ha-svg-icon
+                        .path=${mdiCheckCircle}
+                        class="success"
+                      ></ha-svg-icon>
+                      ${stage}
+                    </span>
+                  `
+                )}
+              </div>
+            `
+          : ""}
+        ${this._showDetails
+          ? html`
+              <div class="wrapper">
+                <h2 class="grid-item">
+                  ${this.hass.localize(
+                    `ui.dialogs.zha_reconfigure_device.cluster_header`
+                  )}
+                </h2>
+                <h2 class="grid-item">
+                  ${this.hass.localize(
+                    `ui.dialogs.zha_reconfigure_device.bind_header`
+                  )}
+                </h2>
+                <h2 class="grid-item">
+                  ${this.hass.localize(
+                    `ui.dialogs.zha_reconfigure_device.reporting_header`
+                  )}
+                </h2>
+
+                ${this._clusterConfigurationStatuses!.size > 0
+                  ? html`
+                      ${Array.from(
+                        this._clusterConfigurationStatuses!.values()
+                      ).map(
+                        (clusterStatus) => html`
+                          <div class="grid-item">
+                            ${clusterStatus.cluster.name}
+                          </div>
+                          <div class="grid-item">
+                            ${clusterStatus.bindSuccess !== undefined
+                              ? clusterStatus.bindSuccess
+                                ? html`
+                                    <span class="stage">
+                                      <ha-svg-icon
+                                        .path=${mdiCheckCircle}
+                                        class="success"
+                                      ></ha-svg-icon>
+                                    </span>
+                                  `
+                                : html`
+                                    <span class="stage">
+                                      <ha-svg-icon
+                                        .path=${mdiCloseCircle}
+                                        class="failed"
+                                      ></ha-svg-icon>
+                                    </span>
+                                  `
+                              : ""}
+                          </div>
+                          <div class="grid-item">
+                            ${clusterStatus.attributes.size > 0
+                              ? html`
+                                  <div class="attributes">
+                                    <div class="grid-item">
+                                      ${this.hass.localize(
+                                        `ui.dialogs.zha_reconfigure_device.attribute`
+                                      )}
+                                    </div>
+                                    <div class="grid-item">
+                                      <div>
+                                        ${this.hass.localize(
+                                          `ui.dialogs.zha_reconfigure_device.min_max_change`
+                                        )}
+                                      </div>
+                                    </div>
+                                    ${Array.from(
+                                      clusterStatus.attributes.values()
+                                    ).map(
+                                      (attribute) => html`
+                                        <span class="grid-item">
+                                          ${attribute.name}:
+                                          ${attribute.success
+                                            ? html`
+                                                <span class="stage">
+                                                  <ha-svg-icon
+                                                    .path=${mdiCheckCircle}
+                                                    class="success"
+                                                  ></ha-svg-icon>
+                                                </span>
+                                              `
+                                            : html`
+                                                <span class="stage">
+                                                  <ha-svg-icon
+                                                    .path=${mdiCloseCircle}
+                                                    class="failed"
+                                                  ></ha-svg-icon>
+                                                </span>
+                                              `}
+                                        </span>
+                                        <div class="grid-item">
+                                          ${attribute.min}/${attribute.max}/${attribute.change}
+                                        </div>
+                                      `
+                                    )}
+                                  </div>
+                                `
+                              : ""}
+                          </div>
+                        `
+                      )}
+                    `
+                  : ""}
+              </div>
+            `
+          : ""}
       </ha-dialog>
     `;
   }
 
-  private _handleMessage(message: any): void {
-    if (message.type === LOG_OUTPUT) {
-      this._formattedEvents += message.log_entry.message + "\n";
-      const paperTextArea = this.shadowRoot!.querySelector("paper-textarea");
-      if (paperTextArea) {
-        const textArea = (paperTextArea.inputElement as IronAutogrowTextareaElement)
-          .textarea;
-        textArea.scrollTop = textArea.scrollHeight;
+  private async _startReconfiguration(): Promise<void> {
+    if (!this.hass || !this._params) {
+      return;
+    }
+    this._clusterConfigurationStatuses = new Map(
+      (await fetchClustersForZhaNode(this.hass, this._params.device.ieee)).map(
+        (cluster: Cluster) => [
+          cluster.id,
+          {
+            cluster: cluster,
+            bindSuccess: undefined,
+            attributes: new Map<number, AttributeConfigurationStatus>(),
+          },
+        ]
+      )
+    );
+    this._subscribe(this._params);
+    this._status = "started";
+  }
+
+  private _handleMessage(message: ClusterConfigurationEvent): void {
+    if (message.type === ZHA_CHANNEL_CFG_DONE) {
+      this._unsubscribe();
+      this._status = this._allSuccessful ? "finished" : "failed";
+    } else {
+      const clusterConfigurationStatus = this._clusterConfigurationStatuses!.get(
+        message.zha_channel_msg_data.cluster_id
+      );
+      if (message.type === ZHA_CHANNEL_MSG_BIND) {
+        if (!this._stages) {
+          this._stages = ["binding"];
+        }
+        const success = message.zha_channel_msg_data.success;
+        clusterConfigurationStatus!.bindSuccess = success;
+        this._allSuccessful = this._allSuccessful && success;
       }
+      if (message.type === ZHA_CHANNEL_MSG_CFG_RPT) {
+        if (this._stages && !this._stages.includes("reporting")) {
+          this._stages.push("reporting");
+        }
+        const attributes = message.zha_channel_msg_data.attributes;
+        Object.keys(attributes).forEach((name) => {
+          const attribute = attributes[name];
+          clusterConfigurationStatus!.attributes.set(attribute.id, attribute);
+          this._allSuccessful = this._allSuccessful && attribute.success;
+        });
+      }
+      this.requestUpdate();
     }
   }
 
   private _unsubscribe(): void {
-    this._active = false;
-    if (this._reconfigureDeviceTimeoutHandle) {
-      clearTimeout(this._reconfigureDeviceTimeoutHandle);
-    }
     if (this._subscribed) {
       this._subscribed.then((unsub) => unsub());
       this._subscribed = undefined;
@@ -113,33 +386,66 @@ class DialogZHAReconfigureDevice extends LitElement {
     if (!this.hass) {
       return;
     }
-    this._active = true;
     this._subscribed = reconfigureNode(
       this.hass,
       params.device.ieee,
       this._handleMessage.bind(this)
     );
-    this._reconfigureDeviceTimeoutHandle = setTimeout(
-      () => this._unsubscribe(),
-      60000
-    );
+  }
+
+  private _toggleDetails() {
+    this._showDetails = !this._showDetails;
   }
 
   static get styles(): CSSResult[] {
     return [
       haStyleDialog,
       css`
-        ha-circular-progress {
-          padding: 20px;
+        .wrapper {
+          display: grid;
+          grid-template-columns: 3fr 1fr 2fr;
         }
-        .searching {
-          margin-top: 20px;
+        .attributes {
+          display: grid;
+          grid-template-columns: 1fr 1fr;
+        }
+        .grid-item {
+          border: 1px solid;
+          padding: 7px;
+        }
+        .success {
+          color: var(--success-color);
+        }
+
+        .failed {
+          color: var(--warning-color);
+        }
+
+        .flex-container {
           display: flex;
-          flex-direction: column;
           align-items: center;
         }
-        .log {
-          padding: 16px;
+
+        .stages {
+          margin-top: 16px;
+        }
+
+        .stage ha-svg-icon {
+          width: 16px;
+          height: 16px;
+        }
+        .stage {
+          padding: 8px;
+        }
+
+        ha-svg-icon {
+          width: 68px;
+          height: 48px;
+        }
+
+        .flex-container ha-circular-progress,
+        .flex-container ha-svg-icon {
+          margin-right: 20px;
         }
       `,
     ];
diff --git a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts
index a1fcbf1bbf..5fc0a889f9 100644
--- a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts
+++ b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts
@@ -9,6 +9,7 @@ import {
   html,
   LitElement,
   property,
+  PropertyValues,
   TemplateResult,
 } from "lit-element";
 import { computeRTL } from "../../../../../common/util/compute_rtl";
@@ -20,6 +21,12 @@ import type { PageNavigation } from "../../../../../layouts/hass-tabs-subpage";
 import { haStyle } from "../../../../../resources/styles";
 import type { HomeAssistant, Route } from "../../../../../types";
 import "../../../ha-config-section";
+import "../../../../../components/ha-form/ha-form";
+import {
+  fetchZHAConfiguration,
+  updateZHAConfiguration,
+  ZHAConfiguration,
+} from "../../../../../data/zha";
 
 export const zhaTabs: PageNavigation[] = [
   {
@@ -51,6 +58,15 @@ class ZHAConfigDashboard extends LitElement {
 
   @property() public configEntryId?: string;
 
+  @property() private _configuration?: ZHAConfiguration;
+
+  protected firstUpdated(changedProperties: PropertyValues): void {
+    super.firstUpdated(changedProperties);
+    if (this.hass) {
+      this._fetchConfiguration();
+    }
+  }
+
   protected render(): TemplateResult {
     return html`
       <hass-tabs-subpage
@@ -60,10 +76,11 @@ class ZHAConfigDashboard extends LitElement {
         .tabs=${zhaTabs}
         back-path="/config/integrations"
       >
-        <ha-card header="Zigbee Network">
-          <div class="card-content">
-            In the future you can change network settings for ZHA here.
-          </div>
+        <ha-card
+          header=${this.hass.localize(
+            "ui.panel.config.zha.configuration_page.shortcuts_title"
+          )}
+        >
           ${this.configEntryId
             ? html`<div class="card-actions">
                 <a
@@ -87,6 +104,38 @@ class ZHAConfigDashboard extends LitElement {
               </div>`
             : ""}
         </ha-card>
+        ${this._configuration
+          ? Object.entries(this._configuration.schemas).map(
+              ([section, schema]) => html` <ha-card
+                header=${this.hass.localize(
+                  `ui.panel.config.zha.configuration_page.${section}.title`
+                )}
+              >
+                <div class="card-content">
+                  <ha-form
+                    .schema=${schema}
+                    .data=${this._configuration!.data[section]}
+                    @value-changed=${this._dataChanged}
+                    .section=${section}
+                    .computeLabel=${this._computeLabelCallback(
+                      this.hass.localize,
+                      section
+                    )}
+                  ></ha-form>
+                </div>
+              </ha-card>`
+            )
+          : ""}
+        <ha-card>
+          <div class="card-actions">
+            <mwc-button @click=${this._updateConfiguration}>
+              ${this.hass.localize(
+                "ui.panel.config.zha.configuration_page.update_button"
+              )}
+            </mwc-button>
+          </div>
+        </ha-card>
+
         <a href="/config/zha/add" slot="fab">
           <ha-fab
             .label=${this.hass.localize("ui.panel.config.zha.add_device")}
@@ -100,6 +149,26 @@ class ZHAConfigDashboard extends LitElement {
     `;
   }
 
+  private async _fetchConfiguration(): Promise<void> {
+    this._configuration = await fetchZHAConfiguration(this.hass!);
+  }
+
+  private _dataChanged(ev) {
+    this._configuration!.data[ev.currentTarget!.section] = ev.detail.value;
+  }
+
+  private async _updateConfiguration(): Promise<any> {
+    await updateZHAConfiguration(this.hass!, this._configuration!.data);
+  }
+
+  private _computeLabelCallback(localize, section: string) {
+    // Returns a callback for ha-form to calculate labels per schema object
+    return (schema) =>
+      localize(
+        `ui.panel.config.zha.configuration_page.${section}.${schema.name}`
+      ) || schema.name;
+  }
+
   static get styles(): CSSResultArray {
     return [
       haStyle,
diff --git a/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts b/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts
index 0cf283011e..c810a397ee 100644
--- a/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts
+++ b/src/panels/config/integrations/integration-panels/zha/zha-device-card.ts
@@ -159,7 +159,7 @@ class ZHADeviceCard extends SubscribeMixin(LitElement) {
       }
 
       if (!newName && !newEntityId) {
-        return new Promise((resolve) => resolve());
+        return undefined;
       }
 
       return updateEntityRegistryEntry(this.hass!, entity.entity_id, {
@@ -177,7 +177,7 @@ class ZHADeviceCard extends SubscribeMixin(LitElement) {
     });
   }
 
-  private _computeEntityName(entity: EntityRegistryEntry): string {
+  private _computeEntityName(entity: EntityRegistryEntry): string | null {
     if (this.hass.states[entity.entity_id]) {
       return computeStateName(this.hass.states[entity.entity_id]);
     }
diff --git a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts
index 382f53e0c4..c1937537c1 100644
--- a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts
+++ b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts
@@ -17,8 +17,8 @@ import {
   refreshTopology,
   ZHADevice,
 } from "../../../../../data/zha";
-import "../../../../../layouts/hass-subpage";
-import type { HomeAssistant } from "../../../../../types";
+import "../../../../../layouts/hass-tabs-subpage";
+import type { HomeAssistant, Route } from "../../../../../types";
 import { Network, Edge, Node, EdgeOptions } from "vis-network";
 import "../../../../../common/search/search-input";
 import "../../../../../components/device/ha-device-picker";
@@ -29,12 +29,17 @@ import { formatAsPaddedHex } from "./functions";
 import { DeviceRegistryEntry } from "../../../../../data/device_registry";
 import "../../../../../components/ha-checkbox";
 import type { HaCheckbox } from "../../../../../components/ha-checkbox";
+import { zhaTabs } from "./zha-config-dashboard";
 
 @customElement("zha-network-visualization-page")
 export class ZHANetworkVisualizationPage extends LitElement {
-  @property({ type: Object }) public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ type: Boolean, reflect: true }) public narrow = false;
+  @property({ attribute: false }) public route!: Route;
+
+  @property({ type: Boolean }) public narrow!: boolean;
+
+  @property({ type: Boolean }) public isWide!: boolean;
 
   @property()
   public zoomedDeviceId?: string;
@@ -133,9 +138,12 @@ export class ZHANetworkVisualizationPage extends LitElement {
 
   protected render() {
     return html`
-      <hass-subpage
+      <hass-tabs-subpage
+        .tabs=${zhaTabs}
         .hass=${this.hass}
         .narrow=${this.narrow}
+        .isWide=${this.isWide}
+        .route=${this.route}
         .header=${this.hass.localize(
           "ui.panel.config.zha.visualization.header"
         )}
@@ -172,7 +180,7 @@ export class ZHANetworkVisualizationPage extends LitElement {
           >
         </div>
         <div id="visualization"></div>
-      </hass-subpage>
+      </hass-tabs-subpage>
     `;
   }
 
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts
new file mode 100644
index 0000000000..7dfc9a999a
--- /dev/null
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-reinterview-node.ts
@@ -0,0 +1,262 @@
+import "@material/mwc-button/mwc-button";
+import { mdiCheckCircle, mdiCloseCircle } from "@mdi/js";
+import {
+  CSSResult,
+  customElement,
+  html,
+  LitElement,
+  property,
+  internalProperty,
+  TemplateResult,
+  css,
+} from "lit-element";
+import "../../../../../components/ha-circular-progress";
+import { createCloseHeading } from "../../../../../components/ha-dialog";
+import { haStyleDialog } from "../../../../../resources/styles";
+import { HomeAssistant } from "../../../../../types";
+import { ZWaveJSReinterviewNodeDialogParams } from "./show-dialog-zwave_js-reinterview-node";
+import { fireEvent } from "../../../../../common/dom/fire_event";
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
+import { reinterviewNode } from "../../../../../data/zwave_js";
+
+@customElement("dialog-zwave_js-reinterview-node")
+class DialogZWaveJSReinterviewNode extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @internalProperty() private entry_id?: string;
+
+  @internalProperty() private node_id?: number;
+
+  @internalProperty() private _status?: string;
+
+  @internalProperty() private _stages?: string[];
+
+  private _subscribed?: Promise<UnsubscribeFunc>;
+
+  public async showDialog(
+    params: ZWaveJSReinterviewNodeDialogParams
+  ): Promise<void> {
+    this._stages = undefined;
+    this.entry_id = params.entry_id;
+    this.node_id = params.node_id;
+  }
+
+  protected render(): TemplateResult {
+    if (!this.entry_id) {
+      return html``;
+    }
+
+    return html`
+      <ha-dialog
+        open
+        @closed=${this.closeDialog}
+        .heading=${createCloseHeading(
+          this.hass,
+          this.hass.localize("ui.panel.config.zwave_js.reinterview_node.title")
+        )}
+      >
+        ${!this._status
+          ? html`
+              <p>
+                ${this.hass.localize(
+                  "ui.panel.config.zwave_js.reinterview_node.introduction"
+                )}
+              </p>
+              <p>
+                <em>
+                  ${this.hass.localize(
+                    "ui.panel.config.zwave_js.reinterview_node.battery_device_warning"
+                  )}
+                </em>
+              </p>
+              <mwc-button slot="primaryAction" @click=${this._startReinterview}>
+                ${this.hass.localize(
+                  "ui.panel.config.zwave_js.reinterview_node.start_reinterview"
+                )}
+              </mwc-button>
+            `
+          : ``}
+        ${this._status === "started"
+          ? html`
+              <div class="flex-container">
+                <ha-circular-progress active></ha-circular-progress>
+                <div class="status">
+                  <p>
+                    <b>
+                      ${this.hass.localize(
+                        "ui.panel.config.zwave_js.reinterview_node.in_progress"
+                      )}
+                    </b>
+                  </p>
+                  <p>
+                    ${this.hass.localize(
+                      "ui.panel.config.zwave_js.reinterview_node.run_in_background"
+                    )}
+                  </p>
+                </div>
+              </div>
+              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
+                ${this.hass.localize("ui.panel.config.zwave_js.common.close")}
+              </mwc-button>
+            `
+          : ``}
+        ${this._status === "failed"
+          ? html`
+              <div class="flex-container">
+                <ha-svg-icon
+                  .path=${mdiCloseCircle}
+                  class="failed"
+                ></ha-svg-icon>
+                <div class="status">
+                  <p>
+                    ${this.hass.localize(
+                      "ui.panel.config.zwave_js.reinterview_node.interview_failed"
+                    )}
+                  </p>
+                </div>
+              </div>
+              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
+                ${this.hass.localize("ui.panel.config.zwave_js.common.close")}
+              </mwc-button>
+            `
+          : ``}
+        ${this._status === "finished"
+          ? html`
+              <div class="flex-container">
+                <ha-svg-icon
+                  .path=${mdiCheckCircle}
+                  class="success"
+                ></ha-svg-icon>
+                <div class="status">
+                  <p>
+                    ${this.hass.localize(
+                      "ui.panel.config.zwave_js.reinterview_node.interview_complete"
+                    )}
+                  </p>
+                </div>
+              </div>
+              <mwc-button slot="primaryAction" @click=${this.closeDialog}>
+                ${this.hass.localize("ui.panel.config.zwave_js.common.close")}
+              </mwc-button>
+            `
+          : ``}
+        ${this._stages
+          ? html`
+              <div class="stages">
+                ${this._stages.map(
+                  (stage) => html`
+                    <span class="stage">
+                      <ha-svg-icon
+                        .path=${mdiCheckCircle}
+                        class="success"
+                      ></ha-svg-icon>
+                      ${stage}
+                    </span>
+                  `
+                )}
+              </div>
+            `
+          : ""}
+      </ha-dialog>
+    `;
+  }
+
+  private _startReinterview(): void {
+    if (!this.hass) {
+      return;
+    }
+    this._subscribed = reinterviewNode(
+      this.hass,
+      this.entry_id!,
+      this.node_id!,
+      this._handleMessage.bind(this)
+    );
+  }
+
+  private _handleMessage(message: any): void {
+    if (message.event === "interview started") {
+      this._status = "started";
+    }
+    if (message.event === "interview stage completed") {
+      if (this._stages === undefined) {
+        this._stages = [message.stage];
+      } else {
+        this._stages = [...this._stages, message.stage];
+      }
+    }
+    if (message.event === "interview failed") {
+      this._unsubscribe();
+      this._status = "failed";
+    }
+    if (message.event === "interview completed") {
+      this._unsubscribe();
+      this._status = "finished";
+    }
+  }
+
+  private _unsubscribe(): void {
+    if (this._subscribed) {
+      this._subscribed.then((unsub) => unsub());
+      this._subscribed = undefined;
+    }
+  }
+
+  public closeDialog(): void {
+    this.entry_id = undefined;
+    this.node_id = undefined;
+    this._status = undefined;
+    this._stages = undefined;
+
+    this._unsubscribe();
+
+    fireEvent(this, "dialog-closed", { dialog: this.localName });
+  }
+
+  static get styles(): CSSResult[] {
+    return [
+      haStyleDialog,
+      css`
+        .success {
+          color: var(--success-color);
+        }
+
+        .failed {
+          color: var(--warning-color);
+        }
+
+        .flex-container {
+          display: flex;
+          align-items: center;
+        }
+
+        .stages {
+          margin-top: 16px;
+        }
+
+        .stage ha-svg-icon {
+          width: 16px;
+          height: 16px;
+        }
+        .stage {
+          padding: 8px;
+        }
+
+        ha-svg-icon {
+          width: 68px;
+          height: 48px;
+        }
+
+        .flex-container ha-circular-progress,
+        .flex-container ha-svg-icon {
+          margin-right: 20px;
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "dialog-zwave_js-reinterview-node": DialogZWaveJSReinterviewNode;
+  }
+}
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/show-dialog-zwave_js-reinterview-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/show-dialog-zwave_js-reinterview-node.ts
new file mode 100644
index 0000000000..7755786750
--- /dev/null
+++ b/src/panels/config/integrations/integration-panels/zwave_js/show-dialog-zwave_js-reinterview-node.ts
@@ -0,0 +1,20 @@
+import { fireEvent } from "../../../../../common/dom/fire_event";
+
+export interface ZWaveJSReinterviewNodeDialogParams {
+  entry_id: string;
+  node_id: number;
+}
+
+export const loadReinterviewNodeDialog = () =>
+  import("./dialog-zwave_js-reinterview-node");
+
+export const showZWaveJSReinterviewNodeDialog = (
+  element: HTMLElement,
+  reinterviewNodeDialogParams: ZWaveJSReinterviewNodeDialogParams
+): void => {
+  fireEvent(element, "show-dialog", {
+    dialogTag: "dialog-zwave_js-reinterview-node",
+    dialogImport: loadReinterviewNodeDialog,
+    dialogParams: reinterviewNodeDialogParams,
+  });
+};
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
index bc219081a4..eb53eeafba 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-dashboard.ts
@@ -17,9 +17,11 @@ import "../../../../../components/ha-svg-icon";
 import "../../../../../components/ha-icon-next";
 import { getSignedPath } from "../../../../../data/auth";
 import {
+  fetchDataCollectionStatus,
   fetchNetworkStatus,
   fetchNodeStatus,
   NodeStatus,
+  setDataCollectionPreference,
   ZWaveJSNetwork,
   ZWaveJSNode,
 } from "../../../../../data/zwave_js";
@@ -55,6 +57,8 @@ class ZWaveJSConfigDashboard extends LitElement {
 
   @internalProperty() private _icon = mdiCircle;
 
+  @internalProperty() private _dataCollectionOptIn?: boolean;
+
   protected firstUpdated() {
     if (this.hass) {
       this._fetchData();
@@ -167,6 +171,39 @@ class ZWaveJSConfigDashboard extends LitElement {
                     </mwc-button>
                   </div>
                 </ha-card>
+                <ha-card>
+                  <div class="card-header">
+                    <h1>Third-Party Data Reporting</h1>
+                    ${this._dataCollectionOptIn !== undefined
+                      ? html`
+                          <ha-switch
+                            .checked=${this._dataCollectionOptIn === true}
+                            @change=${this._dataCollectionToggled}
+                          ></ha-switch>
+                        `
+                      : html`
+                          <ha-circular-progress
+                            size="small"
+                            active
+                          ></ha-circular-progress>
+                        `}
+                  </div>
+                  <div class="card-content">
+                    <p>
+                      Enable the reporting of anonymized telemetry and
+                      statistics to the <em>Z-Wave JS organization</em>. This
+                      data will be used to focus development efforts and improve
+                      the user experience. Information about the data that is
+                      collected and how it is used, including an example of the
+                      data collected, can be found in the
+                      <a
+                        target="_blank"
+                        href="https://zwave-js.github.io/node-zwave-js/#/data-collection/data-collection?id=usage-statistics"
+                        >Z-Wave JS data collection documentation</a
+                      >.
+                    </p>
+                  </div>
+                </ha-card>
               `
             : ``}
           <button class="link dump" @click=${this._dumpDebugClicked}>
@@ -183,11 +220,22 @@ class ZWaveJSConfigDashboard extends LitElement {
     if (!this.configEntryId) {
       return;
     }
-    this._network = await fetchNetworkStatus(this.hass!, this.configEntryId);
+    const [network, dataCollectionStatus] = await Promise.all([
+      fetchNetworkStatus(this.hass!, this.configEntryId),
+      fetchDataCollectionStatus(this.hass!, this.configEntryId),
+    ]);
+
+    this._network = network;
+
     this._status = this._network.client.state;
     if (this._status === "connected") {
       this._icon = mdiCheckCircle;
     }
+
+    this._dataCollectionOptIn =
+      dataCollectionStatus.opted_in === true ||
+      dataCollectionStatus.enabled === true;
+
     this._fetchNodeStatus();
   }
 
@@ -213,6 +261,14 @@ class ZWaveJSConfigDashboard extends LitElement {
     });
   }
 
+  private _dataCollectionToggled(ev) {
+    setDataCollectionPreference(
+      this.hass!,
+      this.configEntryId!,
+      ev.target.checked
+    );
+  }
+
   private async _dumpDebugClicked() {
     await this._fetchNodeStatus();
 
@@ -321,8 +377,19 @@ class ZWaveJSConfigDashboard extends LitElement {
           font-size: 1rem;
         }
 
+        .card-header {
+          display: flex;
+        }
+        .card-header h1 {
+          flex: 1;
+        }
+        .card-header ha-switch {
+          width: 48px;
+          margin-top: 16px;
+        }
+
         ha-card {
-          margin: 0 auto;
+          margin: 0px auto 24px;
           max-width: 600px;
         }
 
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts
index a30eedaebf..2973f17c3b 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-config-router.ts
@@ -7,7 +7,7 @@ import { HomeAssistant } from "../../../../../types";
 import { navigate } from "../../../../../common/navigate";
 import { PageNavigation } from "../../../../../layouts/hass-tabs-subpage";
 
-import { mdiServerNetwork } from "@mdi/js";
+import { mdiServerNetwork, mdiMathLog } from "@mdi/js";
 
 export const configTabs: PageNavigation[] = [
   {
@@ -15,6 +15,11 @@ export const configTabs: PageNavigation[] = [
     path: `/config/zwave_js/dashboard`,
     iconPath: mdiServerNetwork,
   },
+  {
+    translationKey: "ui.panel.config.zwave_js.navigation.logs",
+    path: `/config/zwave_js/logs`,
+    iconPath: mdiMathLog,
+  },
 ];
 
 @customElement("zwave_js-config-router")
@@ -41,6 +46,10 @@ class ZWaveJSConfigRouter extends HassRouterPage {
         tag: "zwave_js-node-config",
         load: () => import("./zwave_js-node-config"),
       },
+      logs: {
+        tag: "zwave_js-logs",
+        load: () => import("./zwave_js-logs"),
+      },
     },
   };
 
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts
new file mode 100644
index 0000000000..730f79b483
--- /dev/null
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-logs.ts
@@ -0,0 +1,157 @@
+import { UnsubscribeFunc } from "home-assistant-js-websocket";
+import {
+  css,
+  html,
+  property,
+  customElement,
+  LitElement,
+  CSSResultArray,
+  internalProperty,
+  query,
+} from "lit-element";
+import "@polymer/paper-listbox/paper-listbox";
+import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
+import {
+  fetchZWaveJSLogConfig,
+  setZWaveJSLogLevel,
+  subscribeZWaveJSLogs,
+  ZWaveJSLogConfig,
+} from "../../../../../data/zwave_js";
+import { SubscribeMixin } from "../../../../../mixins/subscribe-mixin";
+import { HomeAssistant, Route } from "../../../../../types";
+import { configTabs } from "./zwave_js-config-router";
+import "../../../../../layouts/hass-tabs-subpage";
+import { haStyle } from "../../../../../resources/styles";
+
+@customElement("zwave_js-logs")
+class ZWaveJSLogs extends SubscribeMixin(LitElement) {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Object }) public route!: Route;
+
+  @property({ type: Boolean }) public narrow!: boolean;
+
+  @property() public configEntryId!: string;
+
+  @internalProperty() private _logConfig?: ZWaveJSLogConfig;
+
+  @query("textarea", true) private _textarea?: HTMLTextAreaElement;
+
+  public hassSubscribe(): Array<UnsubscribeFunc | Promise<UnsubscribeFunc>> {
+    return [
+      subscribeZWaveJSLogs(this.hass, this.configEntryId, (log) => {
+        if (!this.hasUpdated) {
+          return;
+        }
+        if (Array.isArray(log.message)) {
+          for (const line of log.message) {
+            this._textarea!.value += `${line}\n`;
+          }
+        } else {
+          this._textarea!.value += `${log.message}\n`;
+        }
+      }),
+    ];
+  }
+
+  protected render() {
+    return html`
+      <hass-tabs-subpage
+        .hass=${this.hass}
+        .narrow=${this.narrow}
+        .route=${this.route}
+        .tabs=${configTabs}
+      >
+        <div class="container">
+          <ha-card>
+            <div class="card-header">
+              <h1>
+                ${this.hass.localize("ui.panel.config.zwave_js.logs.title")}
+              </h1>
+            </div>
+            <div class="card-content">
+              ${this._logConfig
+                ? html`
+                    <paper-dropdown-menu
+                      dynamic-align
+                      .label=${this.hass.localize(
+                        "ui.panel.config.zwave_js.logs.log_level"
+                      )}
+                    >
+                      <paper-listbox
+                        slot="dropdown-content"
+                        .selected=${this._logConfig.level}
+                        attr-for-selected="value"
+                        @iron-select=${this._dropdownSelected}
+                      >
+                        <paper-item value="error">Error</paper-item>
+                        <paper-item value="warn">Warn</paper-item>
+                        <paper-item value="info">Info</paper-item>
+                        <paper-item value="verbose">Verbose</paper-item>
+                        <paper-item value="debug">Debug</paper-item>
+                        <paper-item value="silly">Silly</paper-item>
+                      </paper-listbox>
+                    </paper-dropdown-menu>
+                  `
+                : ""}
+            </div>
+          </ha-card>
+          <textarea readonly></textarea>
+        </div>
+      </hass-tabs-subpage>
+    `;
+  }
+
+  protected firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+    this._fetchData();
+  }
+
+  private async _fetchData() {
+    if (!this.configEntryId) {
+      return;
+    }
+    this._logConfig = await fetchZWaveJSLogConfig(
+      this.hass!,
+      this.configEntryId
+    );
+  }
+
+  private _dropdownSelected(ev) {
+    if (ev.target === undefined || this._logConfig === undefined) {
+      return;
+    }
+    if (this._logConfig.level === ev.target.selected) {
+      return;
+    }
+    setZWaveJSLogLevel(this.hass!, this.configEntryId, ev.target.selected);
+  }
+
+  static get styles(): CSSResultArray {
+    return [
+      haStyle,
+      css`
+        .container {
+          display: flex;
+          flex-direction: column;
+          height: 100%;
+          box-sizing: border-box;
+          padding: 16px;
+        }
+        textarea {
+          flex-grow: 1;
+          padding: 16px;
+        }
+        ha-card {
+          margin: 16px 0;
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "zwave_js-logs": ZWaveJSLogs;
+  }
+}
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
index a9ddcf897e..bc850d348f 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts
@@ -1,3 +1,9 @@
+import {
+  mdiCheckCircle,
+  mdiCircle,
+  mdiProgressClock,
+  mdiCloseCircle,
+} from "@mdi/js";
 import "../../../../../components/ha-settings-row";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
@@ -24,6 +30,7 @@ import {
   fetchNodeConfigParameters,
   setNodeConfigParameter,
   ZWaveJSNodeConfigParams,
+  ZWaveJSSetConfigParamResult,
 } from "../../../../../data/zwave_js";
 import "../../../../../layouts/hass-tabs-subpage";
 import { haStyle } from "../../../../../resources/styles";
@@ -38,6 +45,13 @@ import {
 import { SubscribeMixin } from "../../../../../mixins/subscribe-mixin";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import memoizeOne from "memoize-one";
+import { classMap } from "lit-html/directives/class-map";
+
+const icons = {
+  accepted: mdiCheckCircle,
+  queued: mdiProgressClock,
+  error: mdiCloseCircle,
+};
 
 const getDevice = memoizeOne(
   (
@@ -77,7 +91,12 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
   @property({ type: Array })
   private _deviceRegistryEntries?: DeviceRegistryEntry[];
 
-  @internalProperty() private _config?: ZWaveJSNodeConfigParams[];
+  @internalProperty() private _config?: ZWaveJSNodeConfigParams;
+
+  @internalProperty() private _results: Record<
+    string,
+    ZWaveJSSetConfigParamResult
+  > = {};
 
   @internalProperty() private _error?: string;
 
@@ -178,6 +197,7 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
   }
 
   private _generateConfigBox(id, item): TemplateResult {
+    const result = this._results[id];
     const labelAndDescription = html`
       <span slot="heading">${item.metadata.label}</span>
       <span slot="description">
@@ -192,6 +212,26 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
               )}
             </em>`
           : ""}
+        ${result?.status
+          ? html` <p
+              class="result ${classMap({
+                [result.status]: true,
+              })}"
+            >
+              <ha-svg-icon
+                .path=${icons[result.status] ? icons[result.status] : mdiCircle}
+                class="result-icon"
+                slot="item-icon"
+              ></ha-svg-icon>
+              ${this.hass.localize(
+                "ui.panel.config.zwave_js.node_config.set_param_" +
+                  result.status
+              )}
+              ${result.status === "error" && result.error
+                ? html` <br /><em>${result.error}</em> `
+                : ""}
+            </p>`
+          : ""}
       </span>
     `;
 
@@ -293,6 +333,7 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
   }
 
   private _switchToggled(ev) {
+    this.setResult(ev.target.key, undefined);
     this._updateConfigParameter(ev.target, ev.target.checked ? 1 : 0);
   }
 
@@ -303,6 +344,7 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
     if (this._config![ev.target.key].value === ev.target.selected) {
       return;
     }
+    this.setResult(ev.target.key, undefined);
 
     this._updateConfigParameter(ev.target, Number(ev.target.selected));
   }
@@ -321,20 +363,41 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
     if (Number(this._config![ev.target.key].value) === value) {
       return;
     }
+    this.setResult(ev.target.key, undefined);
     this.debouncedUpdate(ev.target, value);
   }
 
-  private _updateConfigParameter(target, value) {
+  private async _updateConfigParameter(target, value) {
     const nodeId = getNodeId(this._device!);
-    setNodeConfigParameter(
-      this.hass,
-      this.configEntryId!,
-      nodeId!,
-      target.property,
-      value,
-      target.propertyKey ? target.propertyKey : undefined
-    );
-    this._config![target.key].value = value;
+    try {
+      const result = await setNodeConfigParameter(
+        this.hass,
+        this.configEntryId!,
+        nodeId!,
+        target.property,
+        value,
+        target.propertyKey ? target.propertyKey : undefined
+      );
+      this._config![target.key].value = value;
+
+      this.setResult(target.key, result.status);
+    } catch (error) {
+      this.setError(target.key, error.message);
+    }
+  }
+
+  private setResult(key: string, value: string | undefined) {
+    if (value === undefined) {
+      delete this._results[key];
+      this.requestUpdate();
+    } else {
+      this._results = { ...this._results, [key]: { status: value } };
+    }
+  }
+
+  private setError(key: string, message: string) {
+    const errorParam = { status: "error", error: message };
+    this._results = { ...this._results, [key]: errorParam };
   }
 
   private get _device(): DeviceRegistryEntry | undefined {
@@ -369,6 +432,18 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) {
     return [
       haStyle,
       css`
+        .accepted {
+          color: var(--success-color);
+        }
+
+        .queued {
+          color: var(--warning-color);
+        }
+
+        .error {
+          color: var(--error-color);
+        }
+
         .secondary {
           color: var(--secondary-text-color);
         }
diff --git a/src/panels/config/logs/dialog-system-log-detail.ts b/src/panels/config/logs/dialog-system-log-detail.ts
index 90d4670eff..db8a33c244 100644
--- a/src/panels/config/logs/dialog-system-log-detail.ts
+++ b/src/panels/config/logs/dialog-system-log-detail.ts
@@ -1,5 +1,5 @@
 import "@material/mwc-icon-button/mwc-icon-button";
-import { mdiClose, mdiContentCopy } from "@mdi/js";
+import { mdiClose, mdiContentCopy, mdiPackageVariant } from "@mdi/js";
 import "@polymer/paper-tooltip/paper-tooltip";
 import {
   css,
@@ -21,7 +21,10 @@ import {
   integrationIssuesUrl,
   IntegrationManifest,
 } from "../../../data/integration";
-import { getLoggedErrorIntegration } from "../../../data/system_log";
+import {
+  getLoggedErrorIntegration,
+  isCustomIntegrationError,
+} from "../../../data/system_log";
 import { haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
 import { showToast } from "../../../util/toast";
@@ -65,6 +68,12 @@ class DialogSystemLogDetail extends LitElement {
 
     const integration = getLoggedErrorIntegration(item);
 
+    const showDocumentation =
+      this._manifest &&
+      (this._manifest.is_built_in ||
+        // Custom components with our offical docs should not link to our docs
+        !this._manifest.documentation.includes("www.home-assistant.io"));
+
     return html`
       <ha-dialog open @closed=${this.closeDialog} hideActions heading=${true}>
         <ha-header-bar slot="heading">
@@ -86,6 +95,14 @@ class DialogSystemLogDetail extends LitElement {
             <ha-svg-icon .path=${mdiContentCopy}></ha-svg-icon>
           </mwc-icon-button>
         </ha-header-bar>
+        ${this.isCustomIntegration
+          ? html`<div class="custom">
+              <ha-svg-icon .path=${mdiPackageVariant}></ha-svg-icon>
+              ${this.hass.localize(
+                "ui.panel.config.logs.error_from_custom_integration"
+              )}
+            </div>`
+          : ""}
         <div class="contents">
           <p>
             Logger: ${item.name}<br />
@@ -96,7 +113,7 @@ class DialogSystemLogDetail extends LitElement {
                   Integration: ${domainToName(this.hass.localize, integration)}
                   ${!this._manifest ||
                   // Can happen with custom integrations
-                  !this._manifest.documentation
+                  !showDocumentation
                     ? ""
                     : html`
                         (<a
@@ -144,6 +161,12 @@ class DialogSystemLogDetail extends LitElement {
     `;
   }
 
+  private get isCustomIntegration(): boolean {
+    return this._manifest
+      ? !this._manifest.is_built_in
+      : isCustomIntegrationError(this._params!.item);
+  }
+
   private async _fetchManifest(integration: string) {
     try {
       this._manifest = await fetchIntegrationManifest(this.hass, integration);
@@ -157,7 +180,18 @@ class DialogSystemLogDetail extends LitElement {
       ".contents"
     ) as HTMLElement;
 
-    await copyToClipboard(copyElement.innerText);
+    let text = copyElement.innerText;
+
+    if (this.isCustomIntegration) {
+      text =
+        this.hass.localize(
+          "ui.panel.config.logs.error_from_custom_integration"
+        ) +
+        "\n\n" +
+        text;
+    }
+
+    await copyToClipboard(text);
     showToast(this, {
       message: this.hass.localize("ui.common.copied_clipboard"),
     });
@@ -167,6 +201,10 @@ class DialogSystemLogDetail extends LitElement {
     return [
       haStyleDialog,
       css`
+        ha-dialog {
+          --dialog-content-padding: 0px;
+        }
+
         a {
           color: var(--primary-color);
         }
@@ -177,6 +215,13 @@ class DialogSystemLogDetail extends LitElement {
           margin-bottom: 0;
           font-family: var(--code-font-family, monospace);
         }
+        .custom {
+          padding: 8px 16px;
+          background-color: var(--warning-color);
+        }
+        .contents {
+          padding: 16px;
+        }
         .error {
           color: var(--error-color);
         }
diff --git a/src/panels/config/logs/system-log-card.ts b/src/panels/config/logs/system-log-card.ts
index deff14e5f5..c1ff9183ff 100644
--- a/src/panels/config/logs/system-log-card.ts
+++ b/src/panels/config/logs/system-log-card.ts
@@ -19,6 +19,7 @@ import { domainToName } from "../../../data/integration";
 import {
   fetchSystemLog,
   getLoggedErrorIntegration,
+  isCustomIntegrationError,
   LoggedError,
 } from "../../../data/system_log";
 import { HomeAssistant } from "../../../types";
@@ -78,10 +79,16 @@ export class SystemLogCard extends LitElement {
                                   )}</span
                                 >) `}
                               ${integrations[idx]
-                                ? domainToName(
+                                ? `${domainToName(
                                     this.hass!.localize,
                                     integrations[idx]!
-                                  )
+                                  )}${
+                                    isCustomIntegrationError(item)
+                                      ? ` (${this.hass.localize(
+                                          "ui.panel.config.logs.custom_integration"
+                                        )})`
+                                      : ""
+                                  }`
                                 : item.source[0]}
                               ${item.count > 1
                                 ? html`
diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts
index 177d7da864..2aebf9293a 100644
--- a/src/panels/config/scene/ha-scene-dashboard.ts
+++ b/src/panels/config/scene/ha-scene-dashboard.ts
@@ -228,7 +228,7 @@ class HaSceneDashboard extends LitElement {
 
   private async _activateScene(ev) {
     ev.stopPropagation();
-    const scene = ev.target.scene as SceneEntity;
+    const scene = ev.currentTarget.scene as SceneEntity;
     await activateScene(this.hass, scene.entity_id);
     showToast(this, {
       message: this.hass.localize(
diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts
index 1f02dec32c..63a0e8df14 100644
--- a/src/panels/config/scene/ha-scene-editor.ts
+++ b/src/panels/config/scene/ha-scene-editor.ts
@@ -556,20 +556,18 @@ export class HaSceneEditor extends SubscribeMixin(
     if (this._entities.includes(entityId)) {
       return;
     }
-    this._entities = [...this._entities, entityId];
-    this._storeState(entityId);
-
     const entityRegistry = this._entityRegistryEntries.find(
       (entityReg) => entityReg.entity_id === entityId
     );
-
     if (
       entityRegistry?.device_id &&
       !this._devices.includes(entityRegistry.device_id)
     ) {
-      this._devices = [...this._devices, entityRegistry.device_id];
+      this._pickDevice(entityRegistry.device_id);
+    } else {
+      this._entities = [...this._entities, entityId];
+      this._storeState(entityId);
     }
-
     this._dirty = true;
   }
 
@@ -582,14 +580,12 @@ export class HaSceneEditor extends SubscribeMixin(
     this._dirty = true;
   }
 
-  private _devicePicked(ev: CustomEvent) {
-    const device = ev.detail.value;
-    (ev.target as any).value = "";
-    if (this._devices.includes(device)) {
+  private _pickDevice(device_id: string) {
+    if (this._devices.includes(device_id)) {
       return;
     }
-    this._devices = [...this._devices, device];
-    const deviceEntities = this._deviceEntityLookup[device];
+    this._devices = [...this._devices, device_id];
+    const deviceEntities = this._deviceEntityLookup[device_id];
     if (!deviceEntities) {
       return;
     }
@@ -600,6 +596,12 @@ export class HaSceneEditor extends SubscribeMixin(
     this._dirty = true;
   }
 
+  private _devicePicked(ev: CustomEvent) {
+    const device = ev.detail.value;
+    (ev.target as any).value = "";
+    this._pickDevice(device);
+  }
+
   private _deleteDevice(ev: Event) {
     const deviceId = (ev.target as any).device;
     this._devices = this._devices.filter((device) => device !== deviceId);
@@ -627,7 +629,12 @@ export class HaSceneEditor extends SubscribeMixin(
     if ((this._config![name] || "") === newVal) {
       return;
     }
-    this._config = { ...this._config!, [name]: newVal };
+    if (!newVal) {
+      delete this._config![name];
+      this._config = { ...this._config! };
+    } else {
+      this._config = { ...this._config!, [name]: newVal };
+    }
     this._dirty = true;
   }
 
diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts
index 16c90ebc1e..03f57fc674 100644
--- a/src/panels/config/script/ha-script-editor.ts
+++ b/src/panels/config/script/ha-script-editor.ts
@@ -176,7 +176,11 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
         ${this.narrow
           ? html` <span slot="header">${this._config?.alias}</span> `
           : ""}
-        <div class="content">
+        <div
+          class="content ${classMap({
+            "yaml-mode": this._mode === "yaml",
+          })}"
+        >
           ${this._errors
             ? html` <div class="errors">${this._errors}</div> `
             : ""}
@@ -350,44 +354,43 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
               `
             : this._mode === "yaml"
             ? html`
-                <ha-config-section vertical .isWide=${false}>
-                  ${!this.narrow
-                    ? html`<span slot="header">${this._config?.alias}</span>`
-                    : ``}
-                  <ha-card>
-                    <div class="card-content">
-                      <ha-yaml-editor
-                        .defaultValue=${this._preprocessYaml()}
-                        @value-changed=${this._yamlChanged}
-                      ></ha-yaml-editor>
-                      <mwc-button @click=${this._copyYaml}>
-                        ${this.hass.localize(
-                          "ui.panel.config.automation.editor.copy_to_clipboard"
-                        )}
-                      </mwc-button>
-                    </div>
-                    ${this.scriptEntityId
-                      ? html`
-                          <div
-                            class="card-actions layout horizontal justified center"
+                ${!this.narrow
+                  ? html`
+                      <ha-card
+                        ><div class="card-header">
+                          ${this._config?.alias}
+                        </div>
+                        <div
+                          class="card-actions layout horizontal justified center"
+                        >
+                          <mwc-button
+                            @click=${this._runScript}
+                            title="${this.hass.localize(
+                              "ui.panel.config.script.picker.run_script"
+                            )}"
+                            ?disabled=${this._dirty}
                           >
-                            <span></span>
-                            <mwc-button
-                              @click=${this._runScript}
-                              title="${this.hass.localize(
-                                "ui.panel.config.script.picker.run_script"
-                              )}"
-                              ?disabled=${this._dirty}
-                            >
-                              ${this.hass.localize(
-                                "ui.panel.config.script.picker.run_script"
-                              )}
-                            </mwc-button>
-                          </div>
-                        `
-                      : ``}
-                  </ha-card>
-                </ha-config-section>
+                            ${this.hass.localize(
+                              "ui.panel.config.script.picker.run_script"
+                            )}
+                          </mwc-button>
+                        </div>
+                      </ha-card>
+                    `
+                  : ``}
+                <ha-yaml-editor
+                  .defaultValue=${this._preprocessYaml()}
+                  @value-changed=${this._yamlChanged}
+                ></ha-yaml-editor>
+                <ha-card
+                  ><div class="card-actions">
+                    <mwc-button @click=${this._copyYaml}>
+                      ${this.hass.localize(
+                        "ui.panel.config.automation.editor.copy_to_clipboard"
+                      )}
+                    </mwc-button>
+                  </div>
+                </ha-card>
               `
             : ``}
         </div>
@@ -532,7 +535,12 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
     if ((this._config![name] || "") === newVal) {
       return;
     }
-    this._config = { ...this._config!, [name]: newVal };
+    if (!newVal) {
+      delete this._config![name];
+      this._config = { ...this._config! };
+    } else {
+      this._config = { ...this._config!, [name]: newVal };
+    }
     this._dirty = true;
   }
 
@@ -693,6 +701,22 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
         .content {
           padding-bottom: 20px;
         }
+        .yaml-mode {
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          padding-bottom: 0;
+        }
+        ha-yaml-editor {
+          flex-grow: 1;
+          --code-mirror-height: 100%;
+          min-height: 0;
+        }
+        .yaml-mode ha-card {
+          overflow: initial;
+          --ha-card-border-radius: 0;
+          border-bottom: 1px solid var(--divider-color);
+        }
         span[slot="introduction"] a {
           color: var(--primary-color);
         }
diff --git a/src/panels/config/users/dialog-add-user.ts b/src/panels/config/users/dialog-add-user.ts
index 04c65c7738..b18bfc7a7e 100644
--- a/src/panels/config/users/dialog-add-user.ts
+++ b/src/panels/config/users/dialog-add-user.ts
@@ -270,6 +270,7 @@ export class DialogAddUser extends LitElement {
       css`
         ha-dialog {
           --mdc-dialog-max-width: 500px;
+          --dialog-z-index: 10;
         }
         ha-switch {
           margin-top: 8px;
diff --git a/src/panels/developer-tools/event/developer-tools-event.js b/src/panels/developer-tools/event/developer-tools-event.js
index 7da723ee44..163c034b2b 100644
--- a/src/panels/developer-tools/event/developer-tools-event.js
+++ b/src/panels/developer-tools/event/developer-tools-event.js
@@ -24,17 +24,21 @@ class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) {
     return html`
       <style include="ha-style iron-flex iron-positioning"></style>
       <style>
+        .content {
+          padding: 16px;
+          max-width: 1200px;
+          margin: auto;
+        }
+
         :host {
           -ms-user-select: initial;
           -webkit-user-select: initial;
           -moz-user-select: initial;
           @apply --paper-font-body1;
-          padding: 16px;
           display: block;
         }
 
-        .ha-form {
-          margin-right: 16px;
+        .inputs {
           max-width: 400px;
         }
 
@@ -42,14 +46,17 @@ class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) {
           margin-top: 8px;
         }
 
+        .code-editor {
+          margin-right: 16px;
+        }
+
         .header {
           @apply --paper-font-title;
         }
 
         event-subscribe-card {
           display: block;
-          max-width: 800px;
-          margin: 16px auto;
+          margin: 16px 16px 0 0;
         }
 
         a {
@@ -70,7 +77,7 @@ class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) {
               )]]
             </a>
           </p>
-          <div class="ha-form">
+          <div class="inputs">
             <paper-input
               label="[[localize(
                 'ui.panel.developer-tools.tabs.events.type'
@@ -82,17 +89,20 @@ class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) {
             <p>
               [[localize( 'ui.panel.developer-tools.tabs.events.data' )]]
             </p>
+          </div>
+          <div class="code-editor">
             <ha-code-editor
               mode="yaml"
               value="[[eventData]]"
               error="[[!validJSON]]"
               on-value-changed="_yamlChanged"
             ></ha-code-editor>
-            <mwc-button on-click="fireEvent" raised disabled="[[!validJSON]]"
-              >[[localize( 'ui.panel.developer-tools.tabs.events.fire_event'
-              )]]</mwc-button
-            >
           </div>
+          <mwc-button on-click="fireEvent" raised disabled="[[!validJSON]]"
+            >[[localize( 'ui.panel.developer-tools.tabs.events.fire_event'
+            )]]</mwc-button
+          >
+          <event-subscribe-card hass="[[hass]]"></event-subscribe-card>
         </div>
 
         <div>
@@ -106,7 +116,6 @@ class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) {
           ></events-list>
         </div>
       </div>
-      <event-subscribe-card hass="[[hass]]"></event-subscribe-card>
     `;
   }
 
@@ -185,7 +194,7 @@ class HaPanelDevEvent extends EventsMixin(LocalizeMixin(PolymerElement)) {
   }
 
   computeFormClasses(narrow) {
-    return narrow ? "" : "layout horizontal";
+    return narrow ? "content" : "content layout horizontal";
   }
 }
 
diff --git a/src/panels/developer-tools/event/event-subscribe-card.ts b/src/panels/developer-tools/event/event-subscribe-card.ts
index 5324b31acf..58a8fc27a7 100644
--- a/src/panels/developer-tools/event/event-subscribe-card.ts
+++ b/src/panels/developer-tools/event/event-subscribe-card.ts
@@ -122,19 +122,23 @@ class EventSubscribeCard extends LitElement {
     return css`
       form {
         display: block;
-        padding: 16px;
+        padding: 0 0 16px 16px;
       }
       paper-input {
         display: inline-block;
         width: 200px;
       }
+      mwc-button {
+        vertical-align: middle;
+      }
       .events {
         margin: -16px 0;
         padding: 0 16px;
       }
       .event {
-        border-bottom: 1px solid var(--divider-color);
-        padding-bottom: 16px;
+        border-top: 1px solid var(--divider-color);
+        padding-top: 8px;
+        padding-bottom: 8px;
         margin: 16px 0;
       }
       .event:last-child {
diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts
index 4ad74bcd53..38ec7a2462 100644
--- a/src/panels/developer-tools/service/developer-tools-service.ts
+++ b/src/panels/developer-tools/service/developer-tools-service.ts
@@ -1,3 +1,5 @@
+import { mdiHelpCircle } from "@mdi/js";
+import { ERR_CONNECTION_LOST } from "home-assistant-js-websocket";
 import { safeLoad } from "js-yaml";
 import {
   css,
@@ -22,12 +24,18 @@ import "../../../components/ha-service-control";
 import "../../../components/ha-service-picker";
 import "../../../components/ha-yaml-editor";
 import type { HaYamlEditor } from "../../../components/ha-yaml-editor";
+import { forwardHaptic } from "../../../data/haptics";
 import { ServiceAction } from "../../../data/script";
-import { callExecuteScript } from "../../../data/service";
+import {
+  callExecuteScript,
+  serviceCallWillDisconnect,
+} from "../../../data/service";
 import { haStyle } from "../../../resources/styles";
 import "../../../styles/polymer-ha-style";
 import { HomeAssistant } from "../../../types";
 import "../../../util/app-localstorage-document";
+import { documentationUrl } from "../../../util/documentation-url";
+import { showToast } from "../../../util/toast";
 
 class HaPanelDevService extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -156,12 +164,39 @@ class HaPanelDevService extends LitElement {
               outlined
               .expanded=${this._yamlMode}
             >
-              ${this._yamlMode && target
-                ? html`<h3>
-                    ${this.hass.localize(
-                      "ui.panel.developer-tools.tabs.services.accepts_target"
-                    )}
-                  </h3>`
+              ${this._yamlMode
+                ? html` <div class="description">
+                    <h3>
+                      ${target
+                        ? html`
+                            ${this.hass.localize(
+                              "ui.panel.developer-tools.tabs.services.accepts_target"
+                            )}
+                          `
+                        : ""}
+                    </h3>
+                    ${this._serviceData?.service
+                      ? html` <a
+                          href="${documentationUrl(
+                            this.hass,
+                            "/integrations/" +
+                              computeDomain(this._serviceData?.service)
+                          )}"
+                          title="${this.hass.localize(
+                            "ui.components.service-control.integration_doc"
+                          )}"
+                          target="_blank"
+                          rel="noreferrer"
+                        >
+                          <mwc-icon-button>
+                            <ha-svg-icon
+                              path=${mdiHelpCircle}
+                              class="help-icon"
+                            ></ha-svg-icon>
+                          </mwc-icon-button>
+                        </a>`
+                      : ""}
+                  </div>`
                 : ""}
               <table class="attributes">
                 <tr>
@@ -267,11 +302,30 @@ class HaPanelDevService extends LitElement {
     }
   );
 
-  private _callService() {
+  private async _callService() {
     if (!this._serviceData?.service) {
       return;
     }
-    callExecuteScript(this.hass, [this._serviceData]);
+    try {
+      await callExecuteScript(this.hass, [this._serviceData]);
+    } catch (err) {
+      const [domain, service] = this._serviceData.service.split(".", 2);
+      if (
+        err.error?.code === ERR_CONNECTION_LOST &&
+        serviceCallWillDisconnect(domain, service)
+      ) {
+        return;
+      }
+      forwardHaptic("failure");
+      showToast(this, {
+        message:
+          this.hass.localize(
+            "ui.notification_toast.service_call_failed",
+            "service",
+            this._serviceData.service
+          ) + ` ${err.message}`,
+      });
+    }
   }
 
   private _toggleYaml() {
@@ -394,6 +448,15 @@ class HaPanelDevService extends LitElement {
           padding: 4px;
           vertical-align: middle;
         }
+
+        .help-icon {
+          color: var(--secondary-text-color);
+        }
+        .description {
+          justify-content: space-between;
+          display: flex;
+          align-items: center;
+        }
       `,
     ];
   }
diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts
index 2a0fc4dcc6..2c535a8bba 100644
--- a/src/panels/lovelace/cards/hui-button-card.ts
+++ b/src/panels/lovelace/cards/hui-button-card.ts
@@ -28,7 +28,7 @@ import { stateIcon } from "../../../common/entity/state_icon";
 import { isValidEntityId } from "../../../common/entity/valid_entity_id";
 import { iconColorCSS } from "../../../common/style/icon_color_css";
 import "../../../components/ha-card";
-import { LightEntity } from "../../../data/light";
+import { getLightRgbColor, LightEntity } from "../../../data/light";
 import { ActionHandlerEvent } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { actionHandler } from "../common/directives/action-handler-directive";
@@ -301,14 +301,14 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
   }
 
   private _computeColor(stateObj: HassEntity | LightEntity): string {
-    if (!stateObj.attributes.hs_color || !this._config?.state_color) {
+    if (
+      !this._config?.state_color ||
+      computeStateDomain(stateObj) !== "light"
+    ) {
       return "";
     }
-    const [hue, sat] = stateObj.attributes.hs_color;
-    if (sat <= 10) {
-      return "";
-    }
-    return `hsl(${hue}, 100%, ${100 - sat / 2}%)`;
+    const rgb = getLightRgbColor(stateObj as LightEntity);
+    return rgb ? `rgb(${rgb.slice(0, 3).join(",")})` : "";
   }
 
   private _handleAction(ev: ActionHandlerEvent) {
diff --git a/src/panels/lovelace/cards/hui-error-card.ts b/src/panels/lovelace/cards/hui-error-card.ts
index 7739390717..1e9b0fc779 100644
--- a/src/panels/lovelace/cards/hui-error-card.ts
+++ b/src/panels/lovelace/cards/hui-error-card.ts
@@ -31,11 +31,18 @@ export class HuiErrorCard extends LitElement implements LovelaceCard {
       return html``;
     }
 
+    let dumped: string | undefined;
+
+    if (this._config.origConfig) {
+      try {
+        dumped = safeDump(this._config.origConfig);
+      } catch (err) {
+        dumped = `[Error dumping ${this._config.origConfig}]`;
+      }
+    }
+
     return html`
-      ${this._config.error}
-      ${this._config.origConfig
-        ? html`<pre>${safeDump(this._config.origConfig)}</pre>`
-        : ""}
+      ${this._config.error}${dumped ? html`<pre>${dumped}</pre>` : ""}
     `;
   }
 
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index 521cc5c7b8..c92d6dbbca 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -18,11 +18,14 @@ import { fireEvent } from "../../../common/dom/fire_event";
 import { computeStateDisplay } from "../../../common/entity/compute_state_display";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import { stateIcon } from "../../../common/entity/state_icon";
-import { supportsFeature } from "../../../common/entity/supports-feature";
 import "../../../components/ha-card";
 import "../../../components/ha-icon-button";
 import { UNAVAILABLE, UNAVAILABLE_STATES } from "../../../data/entity";
-import { LightEntity, SUPPORT_BRIGHTNESS } from "../../../data/light";
+import {
+  getLightRgbColor,
+  LightEntity,
+  lightSupportsDimming,
+} from "../../../data/light";
 import { ActionHandlerEvent } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { actionHandler } from "../common/directives/action-handler-directive";
@@ -121,17 +124,14 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
                 @value-changing=${this._dragEvent}
                 @value-changed=${this._setBrightness}
                 style=${styleMap({
-                  visibility: supportsFeature(stateObj, SUPPORT_BRIGHTNESS)
+                  visibility: lightSupportsDimming(stateObj)
                     ? "visible"
                     : "hidden",
                 })}
               ></round-slider>
               <ha-icon-button
                 class="light-button ${classMap({
-                  "slider-center": supportsFeature(
-                    stateObj,
-                    SUPPORT_BRIGHTNESS
-                  ),
+                  "slider-center": lightSupportsDimming(stateObj),
                   "state-on": stateObj.state === "on",
                   "state-unavailable": stateObj.state === UNAVAILABLE,
                 })}"
@@ -244,14 +244,11 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
   }
 
   private _computeColor(stateObj: LightEntity): string {
-    if (stateObj.state === "off" || !stateObj.attributes.hs_color) {
+    if (stateObj.state === "off") {
       return "";
     }
-    const [hue, sat] = stateObj.attributes.hs_color;
-    if (sat <= 10) {
-      return "";
-    }
-    return `hsl(${hue}, 100%, ${100 - sat / 2}%)`;
+    const rgb = getLightRgbColor(stateObj);
+    return rgb ? `rgb(${rgb.slice(0, 3).join(",")})` : "";
   }
 
   private _handleAction(ev: ActionHandlerEvent) {
diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts
index cd53ba0f4b..c1fd6788d9 100644
--- a/src/panels/lovelace/cards/hui-media-control-card.ts
+++ b/src/panels/lovelace/cards/hui-media-control-card.ts
@@ -666,6 +666,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
 
       ha-icon-button[action="media_play"],
       ha-icon-button[action="media_play_pause"],
+      ha-icon-button[action="media_pause"],
       ha-icon-button[action="media_stop"],
       ha-icon-button[action="turn_on"],
       ha-icon-button[action="turn_off"] {
@@ -743,6 +744,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
 
       .narrow ha-icon-button[action="media_play"],
       .narrow ha-icon-button[action="media_play_pause"],
+      .narrow ha-icon-button[action="media_pause"],
       .narrow ha-icon-button[action="turn_on"] {
         --mdc-icon-button-size: 50px;
         --mdc-icon-size: 36px;
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index 26e6337213..e07ac79bc5 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -1,40 +1,16 @@
-import {
-  HassEntities,
-  HassEntity,
-  STATE_NOT_RUNNING,
-} from "home-assistant-js-websocket";
+import { HassEntities, HassEntity } from "home-assistant-js-websocket";
 import { computeDomain } from "../../../common/entity/compute_domain";
-import { computeObjectId } from "../../../common/entity/compute_object_id";
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
 import { computeStateName } from "../../../common/entity/compute_state_name";
-import { extractViews } from "../../../common/entity/extract_views";
-import { getViewEntities } from "../../../common/entity/get_view_entities";
 import { splitByGroups } from "../../../common/entity/split_by_groups";
 import { compare } from "../../../common/string/compare";
 import { LocalizeFunc } from "../../../common/translations/localize";
-import { subscribeOne } from "../../../common/util/subscribe-one";
-import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import {
-  AreaRegistryEntry,
-  subscribeAreaRegistry,
-} from "../../../data/area_registry";
-import {
-  DeviceRegistryEntry,
-  subscribeDeviceRegistry,
-} from "../../../data/device_registry";
-import {
-  EntityRegistryEntry,
-  subscribeEntityRegistry,
-} from "../../../data/entity_registry";
-import { GroupEntity } from "../../../data/group";
+import type { AreaRegistryEntry } from "../../../data/area_registry";
+import type { DeviceRegistryEntry } from "../../../data/device_registry";
+import type { EntityRegistryEntry } from "../../../data/entity_registry";
 import { domainToName } from "../../../data/integration";
-import {
-  LovelaceCardConfig,
-  LovelaceConfig,
-  LovelaceViewConfig,
-} from "../../../data/lovelace";
+import { LovelaceCardConfig, LovelaceViewConfig } from "../../../data/lovelace";
 import { SENSOR_DEVICE_CLASS_BATTERY } from "../../../data/sensor";
-import { HomeAssistant } from "../../../types";
 import {
   AlarmPanelCardConfig,
   EntitiesCardConfig,
@@ -45,7 +21,6 @@ import {
 } from "../cards/types";
 import { LovelaceRowConfig } from "../entity-rows/types";
 
-const DEFAULT_VIEW_ENTITY_ID = "group.default_view";
 const HIDE_DOMAIN = new Set([
   "automation",
   "configurator",
@@ -57,8 +32,6 @@ const HIDE_DOMAIN = new Set([
 
 const HIDE_PLATFORM = new Set(["mobile_app"]);
 
-let subscribedRegistries = false;
-
 interface SplittedByAreas {
   areasWithEntities: Array<[AreaRegistryEntry, HassEntity[]]>;
   otherEntities: HassEntities;
@@ -181,7 +154,8 @@ export const computeCards = (
         titlePrefix &&
         stateObj &&
         // eslint-disable-next-line no-cond-assign
-        (name = computeStateName(stateObj)).startsWith(titlePrefix)
+        (name = computeStateName(stateObj)) !== titlePrefix &&
+        name.startsWith(titlePrefix)
           ? {
               entity: entityId,
               name: adjustName(name.substr(titlePrefix.length)),
@@ -238,7 +212,7 @@ const computeDefaultViewStates = (
   return states;
 };
 
-const generateViewConfig = (
+export const generateViewConfig = (
   localize: LocalizeFunc,
   path: string,
   title: string | undefined,
@@ -372,141 +346,3 @@ export const generateDefaultViewConfig = (
 
   return config;
 };
-
-export const generateLovelaceConfigFromData = async (
-  hass: HomeAssistant,
-  areaEntries: AreaRegistryEntry[],
-  deviceEntries: DeviceRegistryEntry[],
-  entityEntries: EntityRegistryEntry[],
-  entities: HassEntities,
-  localize: LocalizeFunc
-): Promise<LovelaceConfig> => {
-  if (hass.config.safe_mode) {
-    return {
-      title: hass.config.location_name,
-      views: [
-        {
-          cards: [{ type: "safe-mode" }],
-        },
-      ],
-    };
-  }
-
-  const viewEntities = extractViews(entities);
-
-  const views = viewEntities.map((viewEntity: GroupEntity) => {
-    const states = getViewEntities(entities, viewEntity);
-
-    // In the case of a normal view, we use group order as specified in view
-    const groupOrders = {};
-    Object.keys(states).forEach((entityId, idx) => {
-      groupOrders[entityId] = idx;
-    });
-
-    return generateViewConfig(
-      localize,
-      computeObjectId(viewEntity.entity_id),
-      computeStateName(viewEntity),
-      viewEntity.attributes.icon,
-      states,
-      groupOrders
-    );
-  });
-
-  let title = hass.config.location_name;
-
-  // User can override default view. If they didn't, we will add one
-  // that contains all entities.
-  if (
-    viewEntities.length === 0 ||
-    viewEntities[0].entity_id !== DEFAULT_VIEW_ENTITY_ID
-  ) {
-    views.unshift(
-      generateDefaultViewConfig(
-        areaEntries,
-        deviceEntries,
-        entityEntries,
-        entities,
-        localize
-      )
-    );
-
-    // Add map of geo locations to default view if loaded
-    if (isComponentLoaded(hass, "geo_location")) {
-      if (views[0] && views[0].cards) {
-        views[0].cards.push({
-          type: "map",
-          geo_location_sources: ["all"],
-        });
-      }
-    }
-
-    // Make sure we don't have Home as title and first tab.
-    if (views.length > 1 && title === "Home") {
-      title = "Home Assistant";
-    }
-  }
-
-  // User has no entities
-  if (views.length === 1 && views[0].cards!.length === 0) {
-    views[0].cards!.push({
-      type: "empty-state",
-    });
-  }
-
-  return {
-    title,
-    views,
-  };
-};
-
-export const generateLovelaceConfigFromHass = async (
-  hass: HomeAssistant,
-  localize?: LocalizeFunc
-): Promise<LovelaceConfig> => {
-  if (hass.config.state === STATE_NOT_RUNNING) {
-    return {
-      title: hass.config.location_name,
-      views: [
-        {
-          cards: [{ type: "starting" }],
-        },
-      ],
-    };
-  }
-
-  if (hass.config.safe_mode) {
-    return {
-      title: hass.config.location_name,
-      views: [
-        {
-          cards: [{ type: "safe-mode" }],
-        },
-      ],
-    };
-  }
-
-  // We want to keep the registry subscriptions alive after generating the UI
-  // so that we don't serve up stale data after changing areas.
-  if (!subscribedRegistries) {
-    subscribedRegistries = true;
-    subscribeAreaRegistry(hass.connection, () => undefined);
-    subscribeDeviceRegistry(hass.connection, () => undefined);
-    subscribeEntityRegistry(hass.connection, () => undefined);
-  }
-
-  const [areaEntries, deviceEntries, entityEntries] = await Promise.all([
-    subscribeOne(hass.connection, subscribeAreaRegistry),
-    subscribeOne(hass.connection, subscribeDeviceRegistry),
-    subscribeOne(hass.connection, subscribeEntityRegistry),
-  ]);
-
-  return generateLovelaceConfigFromData(
-    hass,
-    areaEntries,
-    deviceEntries,
-    entityEntries,
-    hass.states,
-    localize || hass.localize
-  );
-};
diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts
index 9bf8fa1c24..2449ddf277 100644
--- a/src/panels/lovelace/components/hui-generic-entity-row.ts
+++ b/src/panels/lovelace/components/hui-generic-entity-row.ts
@@ -129,7 +129,8 @@ class HuiGenericEntityRow extends LitElement {
                     stateObj.attributes.brightness
                   ? html`${Math.round(
                       (stateObj.attributes.brightness / 255) * 100
-                    )} %`
+                    )}
+                    %`
                   : "")}
               </div>
             `
diff --git a/src/panels/lovelace/create-element/create-view-element.ts b/src/panels/lovelace/create-element/create-view-element.ts
index d8cec5fa48..3e5b69b612 100644
--- a/src/panels/lovelace/create-element/create-view-element.ts
+++ b/src/panels/lovelace/create-element/create-view-element.ts
@@ -2,6 +2,7 @@ import {
   LovelaceViewConfig,
   LovelaceViewElement,
 } from "../../../data/lovelace";
+import { HuiErrorCard } from "../cards/hui-error-card";
 import "../views/hui-masonry-view";
 import { createLovelaceElement } from "./create-element-base";
 
@@ -13,7 +14,7 @@ const LAZY_LOAD_LAYOUTS = {
 
 export const createViewElement = (
   config: LovelaceViewConfig
-): LovelaceViewElement => {
+): LovelaceViewElement | HuiErrorCard => {
   return createLovelaceElement(
     "view",
     config,
diff --git a/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts
index 7c12ea1fce..47ceac2f9d 100644
--- a/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts
@@ -112,7 +112,7 @@ export class HuiGaugeCardEditor extends LitElement
             "ui.panel.lovelace.editor.card.config.optional"
           )})"
           .value=${this._unit}
-          configValue="unit"
+          .configValue=${"unit"}
           @value-changed=${this._valueChanged}
         ></paper-input>
         <hui-theme-select-editor
diff --git a/src/panels/lovelace/editor/hui-dialog-save-config.ts b/src/panels/lovelace/editor/hui-dialog-save-config.ts
index f2b2602fbe..acf32993e4 100644
--- a/src/panels/lovelace/editor/hui-dialog-save-config.ts
+++ b/src/panels/lovelace/editor/hui-dialog-save-config.ts
@@ -19,13 +19,15 @@ import "../../../components/ha-formfield";
 import "../../../components/ha-svg-icon";
 import "../../../components/ha-switch";
 import "../../../components/ha-yaml-editor";
+import type { LovelaceConfig } from "../../../data/lovelace";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
 import { haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
 import { documentationUrl } from "../../../util/documentation-url";
+import { expandLovelaceConfigStrategies } from "../strategies/get-strategy";
 import type { SaveDialogParams } from "./show-save-config-dialog";
 
-const EMPTY_CONFIG = { views: [] };
+const EMPTY_CONFIG: LovelaceConfig = { views: [{ title: "Home" }] };
 
 @customElement("hui-dialog-save-config")
 export class HuiSaveConfig extends LitElement implements HassDialog {
@@ -125,14 +127,17 @@ export class HuiSaveConfig extends LitElement implements HassDialog {
         </div>
         ${this._params.mode === "storage"
           ? html`
-              <mwc-button slot="primaryAction" @click=${this.closeDialog}
-                >${this.hass!.localize(
-                  "ui.panel.lovelace.editor.save_config.cancel"
-                )}
-              </mwc-button>
+              <mwc-button
+                slot="primaryAction"
+                .label=${this.hass!.localize("ui.common.cancel")}
+                @click=${this.closeDialog}
+              ></mwc-button>
               <mwc-button
                 slot="primaryAction"
                 ?disabled=${this._saving}
+                aria-label=${this.hass!.localize(
+                  "ui.panel.lovelace.editor.save_config.save"
+                )}
                 @click=${this._saveConfig}
               >
                 ${this._saving
@@ -148,11 +153,13 @@ export class HuiSaveConfig extends LitElement implements HassDialog {
               </mwc-button>
             `
           : html`
-              <mwc-button slot="primaryAction" @click=${this.closeDialog}
-                >${this.hass!.localize(
+              <mwc-button
+                slot="primaryAction"
+                .label=${this.hass!.localize(
                   "ui.panel.lovelace.editor.save_config.close"
                 )}
-              </mwc-button>
+                @click=${this.closeDialog}
+              ></mwc-button>
             `}
       </ha-dialog>
     `;
@@ -177,7 +184,13 @@ export class HuiSaveConfig extends LitElement implements HassDialog {
     try {
       const lovelace = this._params!.lovelace;
       await lovelace.saveConfig(
-        this._emptyConfig ? EMPTY_CONFIG : lovelace.config
+        this._emptyConfig
+          ? EMPTY_CONFIG
+          : await expandLovelaceConfigStrategies({
+              config: lovelace.config,
+              hass: this.hass!,
+              narrow: this._params!.narrow,
+            })
       );
       lovelace.setEditMode(true);
       this._saving = false;
diff --git a/src/panels/lovelace/editor/show-save-config-dialog.ts b/src/panels/lovelace/editor/show-save-config-dialog.ts
index a1be39ddcf..cda486ef15 100644
--- a/src/panels/lovelace/editor/show-save-config-dialog.ts
+++ b/src/panels/lovelace/editor/show-save-config-dialog.ts
@@ -14,6 +14,7 @@ const dialogTag = "hui-dialog-save-config";
 export interface SaveDialogParams {
   lovelace: Lovelace;
   mode: "yaml" | "storage";
+  narrow: boolean;
 }
 
 let registeredDialog = false;
diff --git a/src/panels/lovelace/elements/hui-state-label-element.ts b/src/panels/lovelace/elements/hui-state-label-element.ts
index be5a114d7a..8b78064d82 100644
--- a/src/panels/lovelace/elements/hui-state-label-element.ts
+++ b/src/panels/lovelace/elements/hui-state-label-element.ts
@@ -57,7 +57,7 @@ class HuiStateLabelElement extends LitElement implements LovelaceElement {
 
     if (
       this._config.attribute &&
-      !stateObj.attributes[this._config.attribute]
+      !(this._config.attribute in stateObj.attributes)
     ) {
       return html`
         <hui-warning-element
diff --git a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
index f252ea2b88..f92f5eadfe 100644
--- a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
+++ b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts
@@ -115,7 +115,7 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
         ? html`
             <ha-icon-button
               icon=${this._computeControlIcon(stateObj)}
-              @click=${this._playPause}
+              @click=${this._playPauseStop}
             ></ha-icon-button>
           `
         : ""}
@@ -256,8 +256,17 @@ class HuiMediaPlayerEntityRow extends LitElement implements LovelaceRow {
     );
   }
 
-  private _playPause(): void {
-    this.hass!.callService("media_player", "media_play_pause", {
+  private _playPauseStop(): void {
+    const stateObj = this.hass!.states[this._config!.entity];
+
+    const service =
+      stateObj.state !== "playing"
+        ? "media_play"
+        : supportsFeature(stateObj, SUPPORT_PAUSE)
+        ? "media_pause"
+        : "media_stop";
+
+    this.hass!.callService("media_player", service, {
       entity_id: this._config!.entity,
     });
   }
diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts
index 0d6b38716a..a499aa54e0 100644
--- a/src/panels/lovelace/ha-panel-lovelace.ts
+++ b/src/panels/lovelace/ha-panel-lovelace.ts
@@ -7,6 +7,11 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
+import { constructUrlCurrentPath } from "../../common/url/construct-url";
+import {
+  addSearchParam,
+  removeSearchParam,
+} from "../../common/url/search-params";
 import { domainToName } from "../../data/integration";
 import {
   deleteConfig,
@@ -21,14 +26,16 @@ import "../../layouts/hass-error-screen";
 import "../../layouts/hass-loading-screen";
 import { HomeAssistant, PanelInfo, Route } from "../../types";
 import { showToast } from "../../util/toast";
-import { generateLovelaceConfigFromHass } from "./common/generate-lovelace-config";
 import { loadLovelaceResources } from "./common/load-resources";
 import { showSaveDialog } from "./editor/show-save-config-dialog";
 import "./hui-root";
+import { generateLovelaceDashboardStrategy } from "./strategies/get-strategy";
 import { Lovelace } from "./types";
 
 (window as any).loadCardHelpers = () => import("./custom-card-helpers");
 
+const DEFAULT_STRATEGY = "original-states";
+
 interface LovelacePanelConfig {
   mode: "yaml" | "storage";
 }
@@ -71,7 +78,11 @@ class LovelacePanel extends LitElement {
       this.lovelace.locale !== this.hass.locale
     ) {
       // language has been changed, rebuild UI
-      this._setLovelaceConfig(this.lovelace.config, this.lovelace.mode);
+      this._setLovelaceConfig(
+        this.lovelace.config,
+        this.lovelace.rawConfig,
+        this.lovelace.mode
+      );
     } else if (this.lovelace && this.lovelace.mode === "generated") {
       // When lovelace is generated, we re-generate each time a user goes
       // to the states panel to make sure new entities are shown.
@@ -139,7 +150,9 @@ class LovelacePanel extends LitElement {
     `;
   }
 
-  protected firstUpdated() {
+  protected firstUpdated(changedProps) {
+    super.firstUpdated(changedProps);
+
     this._fetchConfig(false);
     if (!this._unsubUpdates) {
       this._subscribeUpdates();
@@ -153,8 +166,14 @@ class LovelacePanel extends LitElement {
   }
 
   private async _regenerateConfig() {
-    const conf = await generateLovelaceConfigFromHass(this.hass!);
-    this._setLovelaceConfig(conf, "generated");
+    const conf = await generateLovelaceDashboardStrategy(
+      {
+        hass: this.hass!,
+        narrow: this.narrow,
+      },
+      DEFAULT_STRATEGY
+    );
+    this._setLovelaceConfig(conf, undefined, "generated");
     this._state = "loaded";
   }
 
@@ -202,6 +221,7 @@ class LovelacePanel extends LitElement {
 
   private async _fetchConfig(forceDiskRefresh: boolean) {
     let conf: LovelaceConfig;
+    let rawConf: LovelaceConfig | undefined;
     let confMode: Lovelace["mode"] = this.panel!.config.mode;
     let confProm: Promise<LovelaceConfig> | undefined;
     const llWindow = window as WindowWithLovelaceProm;
@@ -236,7 +256,18 @@ class LovelacePanel extends LitElement {
     }
 
     try {
-      conf = await confProm!;
+      rawConf = await confProm!;
+
+      // If strategy defined, apply it here.
+      if (rawConf.strategy) {
+        conf = await generateLovelaceDashboardStrategy({
+          config: rawConf,
+          hass: this.hass!,
+          narrow: this.narrow,
+        });
+      } else {
+        conf = rawConf;
+      }
     } catch (err) {
       if (err.code !== "config_not_found") {
         // eslint-disable-next-line
@@ -245,8 +276,13 @@ class LovelacePanel extends LitElement {
         this._errorMsg = err.message;
         return;
       }
-      const localize = await this.hass!.loadBackendTranslation("title");
-      conf = await generateLovelaceConfigFromHass(this.hass!, localize);
+      conf = await generateLovelaceDashboardStrategy(
+        {
+          hass: this.hass!,
+          narrow: this.narrow,
+        },
+        DEFAULT_STRATEGY
+      );
       confMode = "generated";
     } finally {
       // Ignore updates for another 2 seconds.
@@ -258,7 +294,7 @@ class LovelacePanel extends LitElement {
     }
 
     this._state = this._state === "yaml-editor" ? this._state : "loaded";
-    this._setLovelaceConfig(conf, confMode);
+    this._setLovelaceConfig(conf, rawConf, confMode);
   }
 
   private _checkLovelaceConfig(config: LovelaceConfig) {
@@ -277,11 +313,16 @@ class LovelacePanel extends LitElement {
     return checkedConfig ? deepFreeze(checkedConfig) : config;
   }
 
-  private _setLovelaceConfig(config: LovelaceConfig, mode: Lovelace["mode"]) {
+  private _setLovelaceConfig(
+    config: LovelaceConfig,
+    rawConfig: LovelaceConfig | undefined,
+    mode: Lovelace["mode"]
+  ) {
     config = this._checkLovelaceConfig(config);
     const urlPath = this.urlPath;
     this.lovelace = {
       config,
+      rawConfig,
       mode,
       urlPath: this.urlPath,
       editMode: this.lovelace ? this.lovelace.editMode : false,
@@ -294,22 +335,39 @@ class LovelacePanel extends LitElement {
         this._state = "yaml-editor";
       },
       setEditMode: (editMode: boolean) => {
+        // If we use a strategy for dashboard, we cannot show the edit UI
+        // So go straight to the YAML editor
+        if (
+          this.lovelace!.rawConfig &&
+          this.lovelace!.rawConfig !== this.lovelace!.config
+        ) {
+          this.lovelace!.enableFullEditMode();
+          return;
+        }
+
         if (!editMode || this.lovelace!.mode !== "generated") {
           this._updateLovelace({ editMode });
           return;
         }
+
         showSaveDialog(this, {
           lovelace: this.lovelace!,
           mode: this.panel!.config.mode,
+          narrow: this.narrow!,
         });
       },
       saveConfig: async (newConfig: LovelaceConfig): Promise<void> => {
-        const { config: previousConfig, mode: previousMode } = this.lovelace!;
+        const {
+          config: previousConfig,
+          rawConfig: previousRawConfig,
+          mode: previousMode,
+        } = this.lovelace!;
         newConfig = this._checkLovelaceConfig(newConfig);
         try {
           // Optimistic update
           this._updateLovelace({
             config: newConfig,
+            rawConfig: undefined,
             mode: "storage",
           });
           this._ignoreNextUpdateEvent = true;
@@ -320,18 +378,30 @@ class LovelacePanel extends LitElement {
           // Rollback the optimistic update
           this._updateLovelace({
             config: previousConfig,
+            rawConfig: previousRawConfig,
             mode: previousMode,
           });
           throw err;
         }
       },
       deleteConfig: async (): Promise<void> => {
-        const { config: previousConfig, mode: previousMode } = this.lovelace!;
+        const {
+          config: previousConfig,
+          rawConfig: previousRawConfig,
+          mode: previousMode,
+        } = this.lovelace!;
         try {
           // Optimistic update
-          const localize = await this.hass!.loadBackendTranslation("title");
+          const generatedConf = await generateLovelaceDashboardStrategy(
+            {
+              hass: this.hass!,
+              narrow: this.narrow,
+            },
+            DEFAULT_STRATEGY
+          );
           this._updateLovelace({
-            config: await generateLovelaceConfigFromHass(this.hass!, localize),
+            config: generatedConf,
+            rawConfig: undefined,
             mode: "generated",
             editMode: false,
           });
@@ -343,6 +413,7 @@ class LovelacePanel extends LitElement {
           // Rollback the optimistic update
           this._updateLovelace({
             config: previousConfig,
+            rawConfig: previousRawConfig,
             mode: previousMode,
           });
           throw err;
@@ -356,6 +427,18 @@ class LovelacePanel extends LitElement {
       ...this.lovelace!,
       ...props,
     };
+
+    if ("editMode" in props) {
+      window.history.replaceState(
+        null,
+        "",
+        constructUrlCurrentPath(
+          props.editMode
+            ? addSearchParam({ edit: "1" })
+            : removeSearchParam("edit")
+        )
+      );
+    }
   }
 }
 
diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts
index 9766279d3d..eb0a8805e7 100644
--- a/src/panels/lovelace/hui-editor.ts
+++ b/src/panels/lovelace/hui-editor.ts
@@ -106,7 +106,7 @@ class LovelaceFullConfigEditor extends LitElement {
 
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
-    this.yamlEditor.value = safeDump(this.lovelace!.config);
+    this.yamlEditor.value = safeDump(this.lovelace!.rawConfig);
   }
 
   protected updated(changedProps: PropertyValues) {
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 2ccfc6ccc9..199c979e66 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -43,9 +43,7 @@ import { navigate } from "../../common/navigate";
 import {
   addSearchParam,
   extractSearchParam,
-  removeSearchParam,
 } from "../../common/url/search-params";
-import { constructUrlCurrentPath } from "../../common/url/construct-url";
 import { computeRTLDirection } from "../../common/util/compute_rtl";
 import { debounce } from "../../common/util/debounce";
 import { afterNextRender } from "../../common/util/render-status";
@@ -539,7 +537,7 @@ class HUIRoot extends LitElement {
   protected firstUpdated() {
     // Check for requested edit mode
     if (extractSearchParam("edit") === "1") {
-      this._enableEditMode();
+      this.lovelace!.setEditMode(true);
     }
   }
 
@@ -613,7 +611,7 @@ class HUIRoot extends LitElement {
       }
 
       if (!force && huiView) {
-        huiView.lovelace = this.lovelace;
+        huiView.lovelace = this.lovelace!;
       }
     }
 
@@ -715,25 +713,11 @@ class HUIRoot extends LitElement {
       });
       return;
     }
-    this._enableEditMode();
-  }
-
-  private _enableEditMode(): void {
     this.lovelace!.setEditMode(true);
-    window.history.replaceState(
-      null,
-      "",
-      constructUrlCurrentPath(addSearchParam({ edit: "1" }))
-    );
   }
 
   private _editModeDisable(): void {
     this.lovelace!.setEditMode(false);
-    window.history.replaceState(
-      null,
-      "",
-      constructUrlCurrentPath(removeSearchParam("edit"))
-    );
   }
 
   private _editLovelace() {
@@ -837,7 +821,7 @@ class HUIRoot extends LitElement {
     const viewConfig = this.config.views[viewIndex];
 
     if (!viewConfig) {
-      this._enableEditMode();
+      this.lovelace!.setEditMode(true);
       return;
     }
 
diff --git a/src/panels/lovelace/strategies/get-strategy.ts b/src/panels/lovelace/strategies/get-strategy.ts
new file mode 100644
index 0000000000..53be8262e7
--- /dev/null
+++ b/src/panels/lovelace/strategies/get-strategy.ts
@@ -0,0 +1,158 @@
+import { LovelaceConfig, LovelaceViewConfig } from "../../../data/lovelace";
+import { AsyncReturnType, HomeAssistant } from "../../../types";
+import { OriginalStatesStrategy } from "./original-states-strategy";
+
+const MAX_WAIT_STRATEGY_LOAD = 5000;
+const CUSTOM_PREFIX = "custom:";
+
+export interface LovelaceDashboardStrategy {
+  generateDashboard(info: {
+    config?: LovelaceConfig;
+    hass: HomeAssistant;
+    narrow: boolean | undefined;
+  }): Promise<LovelaceConfig>;
+}
+
+export interface LovelaceViewStrategy {
+  generateView(info: {
+    view: LovelaceViewConfig;
+    config: LovelaceConfig;
+    hass: HomeAssistant;
+    narrow: boolean | undefined;
+  }): Promise<LovelaceViewConfig>;
+}
+
+const strategies: Record<
+  string,
+  LovelaceDashboardStrategy & LovelaceViewStrategy
+> = {
+  "original-states": OriginalStatesStrategy,
+};
+
+const getLovelaceStrategy = async <
+  T extends LovelaceDashboardStrategy | LovelaceViewStrategy
+>(
+  strategyType: string
+): Promise<T> => {
+  if (strategyType in strategies) {
+    return strategies[strategyType] as T;
+  }
+
+  if (!strategyType.startsWith(CUSTOM_PREFIX)) {
+    throw new Error("Unknown strategy");
+  }
+
+  const tag = `ll-strategy-${strategyType.substr(CUSTOM_PREFIX.length)}`;
+
+  if (
+    (await Promise.race([
+      customElements.whenDefined(tag),
+      new Promise((resolve) =>
+        setTimeout(() => resolve(true), MAX_WAIT_STRATEGY_LOAD)
+      ),
+    ])) === true
+  ) {
+    throw new Error(
+      `Timeout waiting for strategy element ${tag} to be registered`
+    );
+  }
+
+  return customElements.get(tag);
+};
+
+interface GenerateMethods {
+  generateDashboard: LovelaceDashboardStrategy["generateDashboard"];
+  generateView: LovelaceViewStrategy["generateView"];
+}
+
+const generateStrategy = async <T extends keyof GenerateMethods>(
+  generateMethod: T,
+  renderError: (err: string | Error) => AsyncReturnType<GenerateMethods[T]>,
+  info: Parameters<GenerateMethods[T]>[0],
+  strategyType: string | undefined
+): Promise<ReturnType<GenerateMethods[T]>> => {
+  if (!strategyType) {
+    return renderError("No strategy type found");
+  }
+
+  try {
+    const strategy = (await getLovelaceStrategy(strategyType)) as any;
+    return await strategy[generateMethod](info);
+  } catch (err) {
+    if (err.message !== "timeout") {
+      // eslint-disable-next-line
+      console.error(err);
+    }
+
+    return renderError(err);
+  }
+};
+
+export const generateLovelaceDashboardStrategy = async (
+  info: Parameters<LovelaceDashboardStrategy["generateDashboard"]>[0],
+  strategyType?: string
+): ReturnType<LovelaceDashboardStrategy["generateDashboard"]> =>
+  generateStrategy(
+    "generateDashboard",
+    (err) => ({
+      views: [
+        {
+          title: "Error",
+          cards: [
+            {
+              type: "markdown",
+              content: `Error loading the dashboard strategy:\n> ${err}`,
+            },
+          ],
+        },
+      ],
+    }),
+    info,
+    strategyType || info.config?.strategy?.type
+  );
+
+export const generateLovelaceViewStrategy = async (
+  info: Parameters<LovelaceViewStrategy["generateView"]>[0],
+  strategyType?: string
+): ReturnType<LovelaceViewStrategy["generateView"]> =>
+  generateStrategy(
+    "generateView",
+    (err) => ({
+      cards: [
+        {
+          type: "markdown",
+          content: `Error loading the view strategy:\n> ${err}`,
+        },
+      ],
+    }),
+    info,
+    strategyType || info.view?.strategy?.type
+  );
+
+/**
+ * Find all references to strategies and replaces them with the generated output
+ */
+export const expandLovelaceConfigStrategies = async (
+  info: Parameters<LovelaceDashboardStrategy["generateDashboard"]>[0] & {
+    config: LovelaceConfig;
+  }
+): Promise<LovelaceConfig> => {
+  const config = info.config.strategy
+    ? await generateLovelaceDashboardStrategy(info)
+    : { ...info.config };
+
+  config.views = await Promise.all(
+    config.views.map((view) =>
+      view.strategy
+        ? generateLovelaceViewStrategy({
+            hass: info.hass,
+            narrow: info.narrow,
+            config,
+            view,
+          })
+        : view
+    )
+  );
+
+  return config;
+};
diff --git a/src/panels/lovelace/strategies/original-states-strategy.ts b/src/panels/lovelace/strategies/original-states-strategy.ts
new file mode 100644
index 0000000000..8ecdd922d1
--- /dev/null
+++ b/src/panels/lovelace/strategies/original-states-strategy.ts
@@ -0,0 +1,94 @@
+import { STATE_NOT_RUNNING } from "home-assistant-js-websocket";
+import { subscribeOne } from "../../../common/util/subscribe-one";
+import { subscribeAreaRegistry } from "../../../data/area_registry";
+import { subscribeDeviceRegistry } from "../../../data/device_registry";
+import { subscribeEntityRegistry } from "../../../data/entity_registry";
+import { generateDefaultViewConfig } from "../common/generate-lovelace-config";
+import {
+  LovelaceViewStrategy,
+  LovelaceDashboardStrategy,
+} from "./get-strategy";
+
+let subscribedRegistries = false;
+
+export class OriginalStatesStrategy {
+  static async generateView(
+    info: Parameters<LovelaceViewStrategy["generateView"]>[0]
+  ): ReturnType<LovelaceViewStrategy["generateView"]> {
+    const hass = info.hass;
+
+    if (hass.config.state === STATE_NOT_RUNNING) {
+      return {
+        cards: [{ type: "starting" }],
+      };
+    }
+
+    if (hass.config.safe_mode) {
+      return {
+        cards: [{ type: "safe-mode" }],
+      };
+    }
+
+    // We leave this here so we always have the freshest data.
+    if (!subscribedRegistries) {
+      subscribedRegistries = true;
+      subscribeAreaRegistry(hass.connection, () => undefined);
+      subscribeDeviceRegistry(hass.connection, () => undefined);
+      subscribeEntityRegistry(hass.connection, () => undefined);
+    }
+
+    const [
+      areaEntries,
+      deviceEntries,
+      entityEntries,
+      localize,
+    ] = await Promise.all([
+      subscribeOne(hass.connection, subscribeAreaRegistry),
+      subscribeOne(hass.connection, subscribeDeviceRegistry),
+      subscribeOne(hass.connection, subscribeEntityRegistry),
+      hass.loadBackendTranslation("title"),
+    ]);
+
+    // User can override default view. If they didn't, we will add one
+    // that contains all entities.
+    const view = generateDefaultViewConfig(
+      areaEntries,
+      deviceEntries,
+      entityEntries,
+      hass.states,
+      localize
+    );
+
+    // Add map of geo locations to default view if loaded
+    if (hass.config.components.includes("geo_location")) {
+      if (view && view.cards) {
+        view.cards.push({
+          type: "map",
+          geo_location_sources: ["all"],
+        });
+      }
+    }
+
+    // User has no entities
+    if (view.cards!.length === 0) {
+      view.cards!.push({
+        type: "empty-state",
+      });
+    }
+
+    return view;
+  }
+
+  static async generateDashboard(
+    info: Parameters<LovelaceDashboardStrategy["generateDashboard"]>[0]
+  ): ReturnType<LovelaceDashboardStrategy["generateDashboard"]> {
+    return {
+      views: [
+        {
+          strategy: { type: "original-states" },
+          title: info.hass.config.location_name,
+        },
+      ],
+    };
+  }
+}
diff --git a/src/panels/lovelace/types.ts b/src/panels/lovelace/types.ts
index 17bd8bc465..f9763be955 100644
--- a/src/panels/lovelace/types.ts
+++ b/src/panels/lovelace/types.ts
@@ -18,6 +18,8 @@ declare global {
 
 export interface Lovelace {
   config: LovelaceConfig;
+  // If not set, a strategy was used to generate everything
+  rawConfig: LovelaceConfig | undefined;
   editMode: boolean;
   urlPath: string | null;
   mode: "generated" | "yaml" | "storage";
diff --git a/src/panels/lovelace/views/hui-masonry-view.ts b/src/panels/lovelace/views/hui-masonry-view.ts
index 42914224af..0e7e49d21f 100644
--- a/src/panels/lovelace/views/hui-masonry-view.ts
+++ b/src/panels/lovelace/views/hui-masonry-view.ts
@@ -53,6 +53,8 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
 
   @property({ type: Number }) public index?: number;
 
+  @property({ type: Boolean }) public isStrategy = false;
+
   @property({ attribute: false }) public cards: Array<
     LovelaceCard | HuiErrorCard
   > = [];
@@ -228,7 +230,7 @@ export class MasonryView extends LitElement implements LovelaceViewElement {
 
   private _addCardToColumn(columnEl, index, editMode) {
     const card: LovelaceCard = this.cards[index];
-    if (!editMode) {
+    if (!editMode || this.isStrategy) {
       card.editMode = false;
       columnEl.appendChild(card);
     } else {
diff --git a/src/panels/lovelace/views/hui-panel-view.ts b/src/panels/lovelace/views/hui-panel-view.ts
index 7cf3a2dc8d..23898074aa 100644
--- a/src/panels/lovelace/views/hui-panel-view.ts
+++ b/src/panels/lovelace/views/hui-panel-view.ts
@@ -31,6 +31,8 @@ export class PanelView extends LitElement implements LovelaceViewElement {
 
   @property({ type: Number }) public index?: number;
 
+  @property({ type: Boolean }) public isStrategy = false;
+
   @property({ attribute: false }) public cards: Array<
     LovelaceCard | HuiErrorCard
   > = [];
@@ -101,10 +103,15 @@ export class PanelView extends LitElement implements LovelaceViewElement {
   }
 
   private _createCard(): void {
+    if (this.cards.length === 0) {
+      this._card = undefined;
+      return;
+    }
+
     const card: LovelaceCard = this.cards[0];
     card.isPanel = true;
 
-    if (!this.lovelace?.editMode) {
+    if (this.isStrategy || !this.lovelace?.editMode) {
       card.editMode = false;
       this._card = card;
       return;
diff --git a/src/panels/lovelace/views/hui-view.ts b/src/panels/lovelace/views/hui-view.ts
index 666e47e1f0..938662e24a 100644
--- a/src/panels/lovelace/views/hui-view.ts
+++ b/src/panels/lovelace/views/hui-view.ts
@@ -23,6 +23,7 @@ import { createViewElement } from "../create-element/create-view-element";
 import { showCreateCardDialog } from "../editor/card-editor/show-create-card-dialog";
 import { showEditCardDialog } from "../editor/card-editor/show-edit-card-dialog";
 import { confDeleteCard } from "../editor/delete-card";
+import { generateLovelaceViewStrategy } from "../strategies/get-strategy";
 import type { Lovelace, LovelaceBadge, LovelaceCard } from "../types";
 
 const DEFAULT_VIEW_LAYOUT = "masonry";
@@ -39,13 +40,13 @@ declare global {
 
 @customElement("hui-view")
 export class HUIView extends UpdatingElement {
-  @property({ attribute: false }) public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public lovelace?: Lovelace;
+  @property({ attribute: false }) public lovelace!: Lovelace;
 
   @property({ type: Boolean }) public narrow!: boolean;
 
-  @property({ type: Number }) public index?: number;
+  @property({ type: Number }) public index!: number;
 
   @internalProperty() private _cards: Array<LovelaceCard | HuiErrorCard> = [];
 
@@ -55,6 +56,8 @@ export class HUIView extends UpdatingElement {
 
   private _layoutElement?: LovelaceViewElement;
 
+  private _viewConfigTheme?: string;
+
   // Public to make demo happy
   public createCardElement(cardConfig: LovelaceCardConfig) {
     const element = createCardElement(cardConfig) as LovelaceCard;
@@ -89,129 +92,142 @@ export class HUIView extends UpdatingElement {
   protected updated(changedProperties: PropertyValues): void {
     super.updated(changedProperties);
 
-    const hass = this.hass!;
-    const lovelace = this.lovelace!;
+    /*
+      We need to handle the following use cases:
+       - initialization: create layout element, populate
+       - config changed to view with same layout element
+       - config changed to view with different layout element
+       - forwarded properties hass/narrow/lovelace/cards/badges change
+          - cards/badges change if one is rebuild when it was loaded later
+          - lovelace changes if edit mode is enabled or config has changed
+    */
 
-    const hassChanged = changedProperties.has("hass");
-    const oldLovelace = changedProperties.get("lovelace") as Lovelace;
-
-    let editModeChanged = false;
-    let configChanged = false;
-
-    if (changedProperties.has("index")) {
-      configChanged = true;
-    } else if (changedProperties.has("lovelace")) {
-      editModeChanged =
-        oldLovelace && lovelace.editMode !== oldLovelace.editMode;
-      configChanged = !oldLovelace || lovelace.config !== oldLovelace.config;
-    }
-
-    let viewConfig: LovelaceViewConfig | undefined;
-
-    if (configChanged) {
-      viewConfig = lovelace.config.views[this.index!];
-      viewConfig = {
-        ...viewConfig,
-        type: viewConfig.panel
-          ? PANEL_VIEW_LAYOUT
-          : viewConfig.type || DEFAULT_VIEW_LAYOUT,
-      };
-    }
-
-    let replace = false;
+    const oldLovelace = changedProperties.get("lovelace") as this["lovelace"];
 
+    // If config has changed, create element if necessary and set all values.
     if (
-      configChanged &&
-      (!this._layoutElement || this._layoutElementType !== viewConfig!.type)
+      changedProperties.has("index") ||
+      (changedProperties.has("lovelace") &&
+        (!oldLovelace ||
+          this.lovelace.config.views[this.index] !==
+            oldLovelace.config.views[this.index]))
     ) {
-      replace = true;
-      this._layoutElement = createViewElement(viewConfig!);
-      this._layoutElementType = viewConfig!.type;
-      this._layoutElement.addEventListener("ll-create-card", () => {
-        showCreateCardDialog(this, {
-          lovelaceConfig: this.lovelace!.config,
-          saveConfig: this.lovelace!.saveConfig,
-          path: [this.index!],
+      this._initializeConfig();
+      return;
+    }
+
+    // If no layout element, we're still creating one
+    if (this._layoutElement) {
+      // Config has not changed. Just props
+      if (changedProperties.has("hass")) {
+        this._badges.forEach((badge) => {
+          badge.hass = this.hass;
         });
-      });
-      this._layoutElement.addEventListener("ll-edit-card", (ev) => {
-        showEditCardDialog(this, {
-          lovelaceConfig: this.lovelace!.config,
-          saveConfig: this.lovelace!.saveConfig,
-          path: ev.detail.path,
+
+        this._cards.forEach((element) => {
+          element.hass = this.hass;
         });
-      });
-      this._layoutElement.addEventListener("ll-delete-card", (ev) => {
-        confDeleteCard(this, this.hass!, this.lovelace!, ev.detail.path);
-      });
-    }
 
-    if (configChanged) {
-      this._createBadges(viewConfig!);
-      this._createCards(viewConfig!);
-
-      this._layoutElement!.hass = this.hass;
-      this._layoutElement!.narrow = this.narrow;
-      this._layoutElement!.lovelace = lovelace;
-      this._layoutElement!.index = this.index;
-    }
-
-    if (hassChanged) {
-      this._badges.forEach((badge) => {
-        badge.hass = hass;
-      });
-
-      this._cards.forEach((element) => {
-        element.hass = hass;
-      });
-
-      this._layoutElement!.hass = this.hass;
-    }
-
-    if (changedProperties.has("narrow")) {
-      this._layoutElement!.narrow = this.narrow;
-    }
-
-    if (editModeChanged) {
-      this._layoutElement!.lovelace = lovelace;
-    }
-
-    if (
-      configChanged ||
-      hassChanged ||
-      editModeChanged ||
-      changedProperties.has("_cards") ||
-      changedProperties.has("_badges")
-    ) {
-      this._layoutElement!.cards = this._cards;
-      this._layoutElement!.badges = this._badges;
+        this._layoutElement.hass = this.hass;
+      }
+      if (changedProperties.has("narrow")) {
+        this._layoutElement.narrow = this.narrow;
+      }
+      if (changedProperties.has("lovelace")) {
+        this._layoutElement.lovelace = this.lovelace;
+      }
+      if (changedProperties.has("_cards")) {
+        this._layoutElement.cards = this._cards;
+      }
+      if (changedProperties.has("_badges")) {
+        this._layoutElement.badges = this._badges;
+      }
     }
 
     const oldHass = changedProperties.get("hass") as this["hass"] | undefined;
 
     if (
-      configChanged ||
-      editModeChanged ||
-      (hassChanged &&
-        oldHass &&
-        (hass.themes !== oldHass.themes ||
-          hass.selectedTheme !== oldHass.selectedTheme))
+      changedProperties.has("hass") &&
+      (!oldHass ||
+        this.hass.themes !== oldHass.themes ||
+        this.hass.selectedTheme !== oldHass.selectedTheme)
     ) {
-      applyThemesOnElement(
-        this,
-        hass.themes,
-        lovelace.config.views[this.index!].theme
-      );
+      applyThemesOnElement(this, this.hass.themes, this._viewConfigTheme);
+    }
+  }
+
+  private async _initializeConfig() {
+    let viewConfig = this.lovelace.config.views[this.index];
+    let isStrategy = false;
+
+    if (viewConfig.strategy) {
+      isStrategy = true;
+      viewConfig = await generateLovelaceViewStrategy({
+        hass: this.hass,
+        config: this.lovelace.config,
+        narrow: this.narrow,
+        view: viewConfig,
+      });
     }
 
-    if (this._layoutElement && replace) {
+    viewConfig = {
+      ...viewConfig,
+      type: viewConfig.panel
+        ? PANEL_VIEW_LAYOUT
+        : viewConfig.type || DEFAULT_VIEW_LAYOUT,
+    };
+
+    // Create a new layout element if necessary.
+    let addLayoutElement = false;
+
+    if (!this._layoutElement || this._layoutElementType !== viewConfig.type) {
+      addLayoutElement = true;
+      this._createLayoutElement(viewConfig);
+    }
+
+    this._createBadges(viewConfig);
+    this._createCards(viewConfig);
+    this._layoutElement!.isStrategy = isStrategy;
+    this._layoutElement!.hass = this.hass;
+    this._layoutElement!.narrow = this.narrow;
+    this._layoutElement!.lovelace = this.lovelace;
+    this._layoutElement!.index = this.index;
+    this._layoutElement!.cards = this._cards;
+    this._layoutElement!.badges = this._badges;
+
+    applyThemesOnElement(this, this.hass.themes, viewConfig.theme);
+    this._viewConfigTheme = viewConfig.theme;
+
+    if (addLayoutElement) {
       while (this.lastChild) {
         this.removeChild(this.lastChild);
       }
-      this.appendChild(this._layoutElement);
+      this.appendChild(this._layoutElement!);
     }
   }
 
+  private _createLayoutElement(config: LovelaceViewConfig): void {
+    this._layoutElement = createViewElement(config) as LovelaceViewElement;
+    this._layoutElementType = config.type;
+    this._layoutElement.addEventListener("ll-create-card", () => {
+      showCreateCardDialog(this, {
+        lovelaceConfig: this.lovelace.config,
+        saveConfig: this.lovelace.saveConfig,
+        path: [this.index],
+      });
+    });
+    this._layoutElement.addEventListener("ll-edit-card", (ev) => {
+      showEditCardDialog(this, {
+        lovelaceConfig: this.lovelace.config,
+        saveConfig: this.lovelace.saveConfig,
+        path: ev.detail.path,
+      });
+    });
+    this._layoutElement.addEventListener("ll-delete-card", (ev) => {
+      confDeleteCard(this, this.hass!, this.lovelace!, ev.detail.path);
+    });
+  }
+
   private _createBadges(config: LovelaceViewConfig): void {
     if (!config || !config.badges || !Array.isArray(config.badges)) {
       this._badges = [];
diff --git a/src/resources/codemirror.ts b/src/resources/codemirror.ts
index 75ed71495a..0c52dd5446 100644
--- a/src/resources/codemirror.ts
+++ b/src/resources/codemirror.ts
@@ -72,8 +72,6 @@ export const theme = EditorView.theme({
   ".cm-panels.top": { borderBottom: "1px solid var(--divider-color)" },
   ".cm-panels.bottom": { borderTop: "1px solid var(--divider-color)" },
 
-  ".cm-panel.search input": { margin: "4px 4px 0" },
-
   ".cm-button": {
     border: "1px solid var(--primary-color)",
     padding: "0px 16px",
diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts
index 52164b59a0..51406ad3d4 100644
--- a/src/state/connection-mixin.ts
+++ b/src/state/connection-mixin.ts
@@ -3,6 +3,7 @@ import {
   callService,
   Connection,
   ERR_INVALID_AUTH,
+  ERR_CONNECTION_LOST,
   HassConfig,
   subscribeConfig,
   subscribeEntities,
@@ -13,6 +14,7 @@ import { broadcastConnectionStatus } from "../data/connection-status";
 import { subscribeFrontendUserData } from "../data/frontend";
 import { forwardHaptic } from "../data/haptics";
 import { DEFAULT_PANEL } from "../data/panel";
+import { serviceCallWillDisconnect } from "../data/service";
 import { NumberFormat } from "../data/translation";
 import { subscribePanels } from "../data/ws-panels";
 import { translationMetadata } from "../resources/translations-metadata";
@@ -78,6 +80,12 @@ export const connectionMixin = <T extends Constructor<HassBaseEl>>(
               target
             )) as Promise<ServiceCallResponse>;
           } catch (err) {
+            if (
+              err.error?.code === ERR_CONNECTION_LOST &&
+              serviceCallWillDisconnect(domain, service)
+            ) {
+              throw err;
+            }
             if (__DEV__) {
               // eslint-disable-next-line no-console
               console.error(
diff --git a/src/state/dialog-manager-mixin.ts b/src/state/dialog-manager-mixin.ts
index b75db54c83..acb0c7c5e3 100644
--- a/src/state/dialog-manager-mixin.ts
+++ b/src/state/dialog-manager-mixin.ts
@@ -8,6 +8,7 @@ interface RegisterDialogParams {
   dialogShowEvent: keyof HASSDomEvents;
   dialogTag: keyof HTMLElementTagNameMap;
   dialogImport: () => Promise<unknown>;
+  addHistory?: boolean;
 }
 
 declare global {
@@ -38,6 +39,7 @@ export const dialogManagerMixin = <T extends Constructor<HassBaseEl>>(
       dialogShowEvent,
       dialogTag,
       dialogImport,
+      addHistory = true,
     }: RegisterDialogParams) {
       this.addEventListener(dialogShowEvent, (showEv) => {
         showDialog(
@@ -45,7 +47,8 @@ export const dialogManagerMixin = <T extends Constructor<HassBaseEl>>(
           this.shadowRoot!,
           dialogTag,
           (showEv as HASSDomEvent<unknown>).detail,
-          dialogImport
+          dialogImport,
+          addHistory
         );
       });
     }
diff --git a/src/state/disconnect-toast-mixin.ts b/src/state/disconnect-toast-mixin.ts
index 1bf402ce8f..98e36dea7a 100644
--- a/src/state/disconnect-toast-mixin.ts
+++ b/src/state/disconnect-toast-mixin.ts
@@ -2,13 +2,21 @@ import {
   STATE_NOT_RUNNING,
   STATE_RUNNING,
   STATE_STARTING,
+  UnsubscribeFunc,
 } from "home-assistant-js-websocket";
 import { Constructor } from "../types";
 import { showToast } from "../util/toast";
 import { HassBaseEl } from "./hass-base-mixin";
+import { domainToName } from "../data/integration";
+import {
+  subscribeBootstrapIntegrations,
+  BootstrapIntegrationsTimings,
+} from "../data/bootstrap_integrations";
 
 export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
+    private _subscribedBootstrapIntegrations?: Promise<UnsubscribeFunc>;
+
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
       // Need to load in advance because when disconnected, can't dynamically load code.
@@ -35,15 +43,19 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
           action: {
             text:
               this.hass!.localize("ui.notification_toast.dismiss") || "Dismiss",
-            action: () => {},
+            action: () => {
+              this._unsubscribeBootstrapIntergrations();
+            },
           },
         });
+        this._subscribeBootstrapIntergrations();
       } else if (
         oldHass?.config &&
         oldHass.config.state === STATE_NOT_RUNNING &&
         (this.hass!.config.state === STATE_STARTING ||
           this.hass!.config.state === STATE_RUNNING)
       ) {
+        this._unsubscribeBootstrapIntergrations();
         showToast(this, {
           message: this.hass!.localize("ui.notification_toast.started"),
           duration: 5000,
@@ -68,4 +80,71 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
         dismissable: false,
       });
     }
+
+    private _handleMessage(message: BootstrapIntegrationsTimings): void {
+      if (this.hass!.config.state !== STATE_NOT_RUNNING) {
+        return;
+      }
+
+      if (Object.keys(message).length === 0) {
+        showToast(this, {
+          message:
+            this.hass!.localize("ui.notification_toast.wrapping_up_startup") ||
+            `Wrapping up startup, not everything will be available until it is finished.`,
+          duration: 0,
+          dismissable: false,
+          action: {
+            text:
+              this.hass!.localize("ui.notification_toast.dismiss") || "Dismiss",
+            action: () => {
+              this._unsubscribeBootstrapIntergrations();
+            },
+          },
+        });
+        return;
+      }
+
+      // Show the integration that has been starting for the longest time
+      const integration = Object.entries(message).sort(
+        ([, a], [, b]) => b - a
+      )[0][0];
+
+      showToast(this, {
+        message:
+          this.hass!.localize(
+            "ui.notification_toast.intergration_starting",
+            "integration",
+            domainToName(this.hass!.localize, integration)
+          ) ||
+          `Starting ${integration}, not everything will be available until it is finished.`,
+        duration: 0,
+        dismissable: false,
+        action: {
+          text:
+            this.hass!.localize("ui.notification_toast.dismiss") || "Dismiss",
+          action: () => {
+            this._unsubscribeBootstrapIntergrations();
+          },
+        },
+      });
+    }
+
+    private _unsubscribeBootstrapIntergrations() {
+      if (this._subscribedBootstrapIntegrations) {
+        this._subscribedBootstrapIntegrations.then((unsub) => unsub());
+        this._subscribedBootstrapIntegrations = undefined;
+      }
+    }
+
+    private _subscribeBootstrapIntergrations() {
+      if (!this.hass) {
+        return;
+      }
+      this._subscribedBootstrapIntegrations = subscribeBootstrapIntegrations(
+        this.hass!,
+        (message) => {
+          this._handleMessage(message);
+        }
+      );
+    }
   };
diff --git a/src/state/haptic-mixin.ts b/src/state/haptic-mixin.ts
index 384c31b9a9..6a4483c3bb 100644
--- a/src/state/haptic-mixin.ts
+++ b/src/state/haptic-mixin.ts
@@ -40,6 +40,7 @@ export const hapticMixin = <T extends Constructor<HassBaseEl>>(superClass: T) =>
       super.firstUpdated(changedProps);
       this.addEventListener("hass-vibrate", (ev) => {
         const vibrate = ev.detail.vibrate;
+        // @ts-expect-error not all browsers support vibrate
         if (navigator.vibrate && vibrate) {
           window.addEventListener("haptic", handleHaptic);
         } else {
@@ -52,6 +53,7 @@ export const hapticMixin = <T extends Constructor<HassBaseEl>>(superClass: T) =>
 
     protected hassConnected() {
       super.hassConnected();
+      // @ts-expect-error not all browsers support vibrate
       if (navigator.vibrate && this.hass!.vibrate) {
         window.addEventListener("haptic", handleHaptic);
       }
diff --git a/src/state/notification-mixin.ts b/src/state/notification-mixin.ts
index 4c34ef77d1..22619b4e2f 100644
--- a/src/state/notification-mixin.ts
+++ b/src/state/notification-mixin.ts
@@ -10,6 +10,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
         dialogShowEvent: "hass-notification",
         dialogTag: "notification-manager",
         dialogImport: () => import("../managers/notification-manager"),
+        addHistory: false,
       });
     }
   };
diff --git a/src/state/themes-mixin.ts b/src/state/themes-mixin.ts
index 4ed2b560b8..0c9e64e7ce 100644
--- a/src/state/themes-mixin.ts
+++ b/src/state/themes-mixin.ts
@@ -32,6 +32,19 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
         storeState(this.hass!);
       });
       mql.addListener((ev) => this._applyTheme(ev.matches));
+      if (mql.matches) {
+        applyThemesOnElement(
+          document.documentElement,
+          {
+            default_theme: "default",
+            default_dark_theme: null,
+            themes: {},
+            darkMode: false,
+          },
+          "default",
+          { dark: true }
+        );
+      }
     }
 
     protected hassConnected() {
diff --git a/src/state/url-sync-mixin.ts b/src/state/url-sync-mixin.ts
index b7f44f89de..2a9efa8d05 100644
--- a/src/state/url-sync-mixin.ts
+++ b/src/state/url-sync-mixin.ts
@@ -28,13 +28,13 @@ export const urlSyncMixin = <
           if (history.length === 1) {
             history.replaceState({ ...history.state, root: true }, "");
           }
-          window.addEventListener("popstate", this._popstateChangeListener);
+          top.addEventListener("popstate", this._popstateChangeListener);
           this.addEventListener("dialog-closed", this._dialogClosedListener);
         }
 
         public disconnectedCallback(): void {
           super.disconnectedCallback();
-          window.removeEventListener("popstate", this._popstateChangeListener);
+          top.removeEventListener("popstate", this._popstateChangeListener);
           this.removeEventListener("dialog-closed", this._dialogClosedListener);
         }
 
@@ -45,21 +45,21 @@ export const urlSyncMixin = <
             console.log("dialog closed", ev.detail.dialog);
             console.log(
               "open",
-              history.state?.open,
+              top.history.state?.open,
               "dialog",
-              history.state?.dialog
+              top.history.state?.dialog
             );
           }
           // If not closed by navigating back, and not a new dialog is open, remove the open state from history
           if (
-            history.state?.open &&
-            history.state?.dialog === ev.detail.dialog
+            top.history.state?.open &&
+            top.history.state?.dialog === ev.detail.dialog
           ) {
             if (DEBUG) {
               console.log("remove state", ev.detail.dialog);
             }
             this._ignoreNextPopState = true;
-            history.back();
+            top.history.back();
           }
         };
 
@@ -73,7 +73,7 @@ export const urlSyncMixin = <
               if (DEBUG) {
                 console.log("remove old state", ev.state.oldState);
               }
-              history.back();
+              top.history.back();
               return;
             }
             this._ignoreNextPopState = false;
@@ -98,7 +98,7 @@ export const urlSyncMixin = <
                 console.log("dialog could not be closed");
               }
               // dialog could not be closed, push state again
-              history.pushState(
+              top.history.pushState(
                 {
                   dialog: state.dialog,
                   open: true,
diff --git a/src/translations/en.json b/src/translations/en.json
index 143647766d..ccc0c3a785 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -172,7 +172,10 @@
       "light": {
         "brightness": "Brightness",
         "color_temperature": "Color temperature",
-        "white_value": "White value",
+        "white_value": "White brightness",
+        "color_brightness": "Color brightness",
+        "cold_white_value": "Cold white brightness",
+        "warm_white_value": "Warm white brightness",
         "effect": "Effect"
       },
       "lock": {
@@ -374,7 +377,7 @@
         "clear": "Clear",
         "show_areas": "Show areas",
         "area": "Area",
-        "add_new": "Add new area…",
+        "add_new": "Add new area...",
         "no_areas": "You don't have any areas",
         "no_match": "No matching areas found",
         "add_dialog": {
@@ -452,7 +455,8 @@
         "required": "This field is required",
         "target": "Targets",
         "target_description": "What should this service use as targeted areas, devices or entities.",
-        "service_data": "Service data"
+        "service_data": "Service data",
+        "integration_doc": "Integration documentation"
       },
       "related-items": {
         "no_related_found": "No related items found.",
@@ -756,7 +760,22 @@
         "update": "Update"
       },
       "zha_reconfigure_device": {
-        "heading": "Reconfiguring device"
+        "heading": "Reconfiguring device",
+        "configuring_alt": "Configuring",
+        "introduction": "Reconfigure a device on your Zigbee network. Use this feature if your device is not functioning correctly.",
+        "battery_device_warning": "You will need to wake battery powered devices before starting the reconfiguration process. Refer to your device's manual for instructions on how to wake the device.",
+        "run_in_background": "You can close this dialog and the reconfiguration will continue in the background.",
+        "start_reconfiguration": "Start Reconfiguration",
+        "in_progress": "The device is being reconfigured. This may take some time.",
+        "configuration_failed": "The device reconfiguration failed. Additional information may be available in the logs.",
+        "configuration_complete": "Device reconfiguration complete.",
+        "button_show": "Show Details",
+        "button_hide": "Hide Details",
+        "cluster_header": "Cluster",
+        "bind_header": "Binding",
+        "reporting_header": "Reporting",
+        "attribute": "Attribute",
+        "min_max_change": "min/max/change"
       },
       "zha_device_info": {
         "manuf": "by {manufacturer}",
@@ -847,9 +866,11 @@
     },
     "notification_toast": {
       "service_call_failed": "Failed to call service {service}.",
-      "connection_lost": "Connection lost. Reconnecting…",
+      "connection_lost": "Connection lost. Reconnecting...",
       "started": "Home Assistant has started!",
       "starting": "Home Assistant is starting, not everything will be available until it is finished.",
+      "wrapping_up_startup": "Wrapping up startup, not everything will be available until it is finished.",
+      "intergration_starting": "Starting {integration}, not everything will be available until it is finished.",
       "triggered": "Triggered {name}",
       "dismiss": "Dismiss"
     },
@@ -874,11 +895,6 @@
           "hint_enable": "Missing config options? Enable advanced mode on",
           "link_profile_page": "your profile page"
         },
-        "integration_panel_move": {
-          "missing_zha": "Missing the ZHA config panel? It was moved to the ZHA entry on the {integrations_page}.",
-          "missing_zwave": "Missing the Z-Wave config panel? It was moved to the Z-Wave entry on the {integrations_page}.",
-          "link_integration_page": "integrations page"
-        },
         "common": {
           "editor": {
             "confirm_unsaved": "You have unsaved changes. Are you sure you want to leave?"
@@ -889,7 +905,8 @@
           "description": "Group devices and entities into areas",
           "data_table": {
             "area": "Area",
-            "devices": "Devices"
+            "devices": "Devices",
+            "entities": "Entities"
           },
           "picker": {
             "header": "Areas",
@@ -907,7 +924,9 @@
             "name": "Name",
             "name_required": "Name is required",
             "area_id": "Area ID",
-            "unknown_error": "Unknown error"
+            "unknown_error": "Unknown error",
+            "linked_entities_caption": "Entities",
+            "no_linked_entities": "There are no entities linked to this area."
           },
           "delete": {
             "confirmation_title": "Are you sure you want to delete this area?",
@@ -996,34 +1015,6 @@
                 "save_button": "Save",
                 "external_url": "External URL",
                 "internal_url": "Internal URL"
-              },
-              "analytics": {
-                "header": "Analytics",
-                "introduction": "Share your installation information to help make Home Assistant better and help us convince manufacturers to add local control and privacy-focused features.",
-                "needs_base": "You need to enable base analytics for this option to be available",
-                "preference": {
-                  "base": {
-                    "title": "Basic analytics",
-                    "description": "Instance ID, version and installation type."
-                  },
-                  "diagnostics": {
-                    "title": "Diagnostics",
-                    "description": "Share crash reports when unexpected errors occur."
-                  },
-                  "usage": {
-                    "title": "Used Integrations",
-                    "description": "Names and version information."
-                  },
-                  "usage_supervisor": {
-                    "title": "Used integrations and add-ons",
-                    "description": "Names, versions and capabilities."
-                  },
-                  "statistics": {
-                    "title": "Usage statistics",
-                    "description": "Total used entities, users and other elements."
-                  }
-                },
-                "learn_more": "How we process your data"
               }
             }
           }
@@ -1058,7 +1049,7 @@
           "description": "View the Home Assistant logs",
           "details": "Log Details ({level})",
           "load_full_log": "Load Full Home Assistant Log",
-          "loading_log": "Loading error log…",
+          "loading_log": "Loading error log...",
           "no_errors": "No errors have been reported",
           "no_issues": "There are no new issues!",
           "clear": "Clear",
@@ -1070,7 +1061,9 @@
             "warning": "WARNING",
             "info": "INFO",
             "debug": "DEBUG"
-          }
+          },
+          "custom_integration": "custom integration",
+          "error_from_custom_integration": "This error originated from a custom integration."
         },
         "lovelace": {
           "caption": "Lovelace Dashboards",
@@ -1197,7 +1190,7 @@
             },
             "server_management": {
               "heading": "Server management",
-              "introduction": "Control your Home Assistant server… from Home Assistant.",
+              "introduction": "Control your Home Assistant server... from Home Assistant.",
               "restart": "Restart",
               "confirm_restart": "Are you sure you want to restart Home Assistant?",
               "stop": "Stop",
@@ -1782,7 +1775,7 @@
             "integrations_link_all_features": " all available features",
             "connected": "Connected",
             "not_connected": "Not Connected",
-            "fetching_subscription": "Fetching subscription…",
+            "fetching_subscription": "Fetching subscription...",
             "tts": {
               "title": "Text to Speech",
               "info": "Bring personality to your home by having it speak to you by using our Text-to-Speech services. You can use this in automations and scripts by using the {service} service.",
@@ -1847,7 +1840,7 @@
               "no_hooks_yet2": " or by creating a ",
               "no_hooks_yet_link_automation": "webhook automation",
               "link_learn_more": "Learn more about creating webhook-powered automations.",
-              "loading": "Loading ...",
+              "loading": "Loading...",
               "manage": "Manage",
               "disable_hook_error_msg": "Failed to disable webhook:"
             }
@@ -2101,7 +2094,7 @@
         },
         "integrations": {
           "caption": "Integrations",
-          "description": "Manage integrations with services, devices, ...",
+          "description": "Manage integrations with services or devices",
           "integration": "integration",
           "discovered": "Discovered",
           "attention": "Attention required",
@@ -2143,7 +2136,7 @@
             "entities": "{count} {count, plural,\n  one {entity}\n  other {entities}\n}",
             "services": "{count} {count, plural,\n  one {service}\n  other {services}\n}",
             "rename": "Rename",
-            "options": "Options",
+            "configure": "Configure",
             "system_options": "System options",
             "documentation": "Documentation",
             "delete": "Delete",
@@ -2162,8 +2155,8 @@
             "entity_unavailable": "Entity unavailable",
             "area": "In {area}",
             "no_area": "No Area",
-            "not_loaded": "Not loaded, check the {logs_link}",
-            "logs": "logs",
+            "not_loaded": "Not loaded",
+            "check_the_logs": "Check the logs",
             "disable": {
               "disabled": "Disabled",
               "disabled_cause": "Disabled by {cause}",
@@ -2173,6 +2166,16 @@
                 "device": "device"
               },
               "disable_confirm": "Are you sure you want to disable this config entry? Its devices and entities will be disabled."
+            },
+            "provided_by_custom_integration": "Provided by a custom integration",
+            "depends_on_cloud": "Depends on the cloud",
+            "state": {
+              "loaded": "Loaded",
+              "setup_error": "Failed to set up",
+              "migration_error": "Migration error",
+              "setup_retry": "Retrying setup",
+              "not_loaded": "Not loaded",
+              "failed_unload": "Failed to unload"
             }
           },
           "config_flow": {
@@ -2244,11 +2247,7 @@
             "create": "Create"
           }
         },
-        "hassio": {
-          "button": "Configure"
-        },
         "mqtt": {
-          "button": "Configure",
           "title": "MQTT",
           "description_publish": "Publish a packet",
           "topic": "topic",
@@ -2262,7 +2261,6 @@
           "message_received": "Message {id} received on {topic} at {time}:"
         },
         "ozw": {
-          "button": "Configure",
           "common": {
             "zwave": "Z-Wave",
             "node_id": "Node ID",
@@ -2377,12 +2375,20 @@
           }
         },
         "zha": {
-          "button": "Configure",
           "common": {
             "clusters": "Clusters",
             "manufacturer_code_override": "Manufacturer Code Override",
             "value": "Value"
           },
+          "configuration_page": {
+            "shortcuts_title": "Shortcuts",
+            "update_button": "Update Configuration",
+            "zha_options": {
+              "title": "Global Options",
+              "enable_identify_on_join": "Enable identify effect when devices join the network",
+              "default_light_transition": "Default light transition time (seconds)"
+            }
+          },
           "add_device_page": {
             "spinner": "Searching for ZHA Zigbee devices...",
             "pairing_mode": "Make sure your devices are in pairing mode. Check the instructions of your device on how to do this.",
@@ -2465,7 +2471,6 @@
           }
         },
         "zwave": {
-          "button": "Configure",
           "description": "Manage your Z-Wave network",
           "learn_more": "Learn more about Z-Wave",
           "common": {
@@ -2556,9 +2561,9 @@
           }
         },
         "zwave_js": {
-          "button": "Configure",
           "navigation": {
-            "network": "Network"
+            "network": "Network",
+            "logs": "Logs"
           },
           "common": {
             "network": "Network",
@@ -2595,7 +2600,10 @@
             "zwave_js_device_database": "Z-Wave JS Device Database",
             "battery_device_notice": "Battery devices must be awake to update their config. Please refer to your device manual for instructions on how to wake the device.",
             "parameter_is_read_only": "This parameter is read-only.",
-            "error_device_not_found": "Device not found"
+            "error_device_not_found": "Device not found",
+            "set_param_accepted": "The parameter has been updated.",
+            "set_param_queued": "The parameter change has been queued, and will be updated when the device wakes up.",
+            "set_param_error": "An error occurred."
           },
           "node_status": {
             "unknown": "Unknown",
@@ -2632,6 +2640,20 @@
             "follow_device_instructions": "Follow the directions that came with your device to trigger exclusion on the device.",
             "exclusion_failed": "The node could not be removed. Please check the logs for more information.",
             "exclusion_finished": "Node {id} has been removed from your Z-Wave network."
+          },
+          "reinterview_node": {
+            "title": "Re-interview a Z-Wave Device",
+            "introduction": "Re-interview a device on your Z-Wave network. Use this feature if your device has missing or incorrect functionality.",
+            "battery_device_warning": "You will need to wake battery powered devices before starting the re-interview. Refer to your device's manual for instructions on how to wake the device.",
+            "run_in_background": "You can close this dialog and the interview will continue in the background.",
+            "start_reinterview": "Start Re-interview",
+            "in_progress": "The device is being interviewed. This may take some time.",
+            "interview_failed": "The device interview failed. Additional information may be available in the logs.",
+            "interview_complete": "Device interview complete."
+          },
+          "logs": {
+            "title": "Z-Wave JS Logs",
+            "log_level": "Log Level"
           }
         }
       },
@@ -2798,7 +2820,7 @@
             "clear": "Clear",
             "delete": "Delete card",
             "duplicate": "Duplicate card",
-            "move": "Move to View",
+            "move": "Move to view",
             "move_before": "Move card before",
             "move_after": "Move card after",
             "options": "More options",
@@ -2824,7 +2846,6 @@
             "yaml_control": "To take control in YAML mode, create a YAML file with the name you specified in your config for this dashboard, or the default 'ui-lovelace.yaml'.",
             "yaml_config": "To help you start here is the current config of this dashboard:",
             "empty_config": "Start with an empty dashboard",
-            "cancel": "Never mind",
             "close": "Close",
             "save": "Take control"
           },
@@ -3410,7 +3431,7 @@
           "events": {
             "title": "Events",
             "description": "Fire an event on the event bus.",
-            "documentation": "Events Documentation.",
+            "documentation": "Events documentation",
             "type": "Event Type",
             "data": "Event Data (YAML, optional)",
             "fire_event": "Fire Event",
@@ -3423,7 +3444,7 @@
             "start_listening": "Start listening",
             "stop_listening": "Stop listening",
             "alert_event_type": "Event type is a mandatory field",
-            "notification_event_fired": "Event {type} successful fired!"
+            "notification_event_fired": "Event {type} successfully fired!"
           },
           "services": {
             "title": "Services",
@@ -3442,8 +3463,8 @@
           },
           "states": {
             "title": "States",
-            "description1": "Set the representation of a device within Home Assistant.",
-            "description2": "This will not communicate with the actual device.",
+            "description1": "Set the current state representation of an entity within Home Assistant.",
+            "description2": "If the entity belongs to a device, there will be no actual communication with that device.",
             "entity": "Entity",
             "state": "State",
             "attributes": "Attributes",
@@ -3920,4 +3941,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/types.ts b/src/types.ts
index 5b9b6ed980..7c6d699ce1 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -256,3 +256,12 @@ export interface LocalizeMixin {
   hass?: HomeAssistant;
   localize: LocalizeFunc;
 }
+
+// https://www.jpwilliams.dev/how-to-unpack-the-return-type-of-a-promise-in-typescript
+export type AsyncReturnType<T extends (...args: any) => any> = T extends (
+  ...args: any
+) => Promise<infer U>
+  ? U
+  : T extends (...args: any) => infer U
+  ? U
+  : never;
diff --git a/test-mocha/common/entity/extract_views.spec.ts b/test-mocha/common/entity/extract_views.spec.ts
index aa53fd3d78..e3cb85c111 100644
--- a/test-mocha/common/entity/extract_views.spec.ts
+++ b/test-mocha/common/entity/extract_views.spec.ts
@@ -1,7 +1,6 @@
 import * as assert from "assert";
-
+import { DEFAULT_VIEW_ENTITY_ID } from "../../../src/common/const";
 import { extractViews } from "../../../src/common/entity/extract_views";
-
 import { createEntities, createView } from "./test_util";
 
 describe("extractViews", () => {
@@ -14,7 +13,7 @@ describe("extractViews", () => {
     entities[view2.entity_id] = view2;
 
     const view3 = createView({
-      entity_id: "group.default_view",
+      entity_id: DEFAULT_VIEW_ENTITY_ID,
       attributes: { order: 8 },
     });
     entities[view3.entity_id] = view3;
diff --git a/test-mocha/common/string/format_number.ts b/test-mocha/common/string/format_number.ts
index efd1461bc8..903be54cb0 100644
--- a/test-mocha/common/string/format_number.ts
+++ b/test-mocha/common/string/format_number.ts
@@ -15,6 +15,56 @@ describe("formatNumber", () => {
     );
   });
 
+  it("Test format 'none' (keep dot despite language 'de')", () => {
+    assert.strictEqual(
+      formatNumber(1.23, {
+        language: "de",
+        number_format: NumberFormat.none,
+      }),
+      "1.23"
+    );
+  });
+
+  it("Ensure zero is kept for format 'language'", () => {
+    assert.strictEqual(
+      formatNumber(0, {
+        language: "en",
+        number_format: NumberFormat.language,
+      }),
+      "0"
+    );
+  });
+
+  it("Ensure zero is kept for format 'none'", () => {
+    assert.strictEqual(
+      formatNumber(0, {
+        language: "en",
+        number_format: NumberFormat.none,
+      }),
+      "0"
+    );
+  });
+
+  it("Test empty string input for format 'none'", () => {
+    assert.strictEqual(
+      formatNumber("", {
+        language: "en",
+        number_format: NumberFormat.none,
+      }),
+      ""
+    );
+  });
+
+  it("Test empty string input for format 'language'", () => {
+    assert.strictEqual(
+      formatNumber("", {
+        language: "en",
+        number_format: NumberFormat.language,
+      }),
+      "0"
+    );
+  });
+
   it("Formats number with options", () => {
     assert.strictEqual(
       formatNumber(
diff --git a/test-mocha/common/string/sequence_matching.test.ts b/test-mocha/common/string/sequence_matching.test.ts
index 1b079cb4ba..f631a23285 100644
--- a/test-mocha/common/string/sequence_matching.test.ts
+++ b/test-mocha/common/string/sequence_matching.test.ts
@@ -3,10 +3,13 @@ import { assert } from "chai";
 import {
   fuzzyFilterSort,
   fuzzySequentialMatch,
+  ScorableTextItem,
 } from "../../../src/common/string/filter/sequence-matching";
 
 describe("fuzzySequentialMatch", () => {
-  const entity = { entity_id: "automation.ticker", friendly_name: "Stocks" };
+  const item: ScorableTextItem = {
+    strings: ["automation.ticker", "Stocks"],
+  };
 
   const createExpectation: (
     pattern,
@@ -53,25 +56,17 @@ describe("fuzzySequentialMatch", () => {
     "stox",
   ];
 
-  describe(`Entity '${entity.entity_id}'`, () => {
+  describe(`Entity '${item.strings[0]}'`, () => {
     for (const expectation of shouldMatchEntity) {
       it(`matches '${expectation.pattern}' with return of '${expectation.expected}'`, () => {
-        const res = fuzzySequentialMatch(
-          expectation.pattern,
-          entity.entity_id,
-          entity.friendly_name
-        );
+        const res = fuzzySequentialMatch(expectation.pattern, item);
         assert.equal(res, expectation.expected);
       });
     }
 
     for (const badFilter of shouldNotMatchEntity) {
       it(`fails to match with '${badFilter}'`, () => {
-        const res = fuzzySequentialMatch(
-          badFilter,
-          entity.entity_id,
-          entity.friendly_name
-        );
+        const res = fuzzySequentialMatch(badFilter, item);
         assert.equal(res, undefined);
       });
     }
@@ -81,28 +76,23 @@ describe("fuzzySequentialMatch", () => {
 describe("fuzzyFilterSort", () => {
   const filter = "ticker";
   const automationTicker = {
-    filterText: "automation.ticker",
-    altText: "Stocks",
+    strings: ["automation.ticker", "Stocks"],
     score: 0,
   };
   const ticker = {
-    filterText: "ticker",
-    altText: "Just ticker",
+    strings: ["ticker", "Just ticker"],
     score: 0,
   };
   const sensorTicker = {
-    filterText: "sensor.ticker",
-    altText: "Stocks up",
+    strings: ["sensor.ticker", "Stocks up"],
     score: 0,
   };
   const timerCheckRouter = {
-    filterText: "automation.check_router",
-    altText: "Timer Check Router",
+    strings: ["automation.check_router", "Timer Check Router"],
     score: 0,
   };
   const badMatch = {
-    filterText: "light.chandelier",
-    altText: "Chandelier",
+    strings: ["light.chandelier", "Chandelier"],
     score: 0,
   };
   const itemsBeforeFilter = [
diff --git a/translations/frontend/bg.json b/translations/frontend/bg.json
index e1a2fcb6fe..01e57e34d7 100644
--- a/translations/frontend/bg.json
+++ b/translations/frontend/bg.json
@@ -148,16 +148,26 @@
                     "full_access": {
                         "title": "Пълен достъп до хардуера"
                     },
+                    "ingress": {
+                        "description": "Тази добавка използва Проникване (Ingress), за да вгради безопасно своя интерфейс в Home Assistant.",
+                        "title": "Проникване"
+                    },
                     "label": {
+                        "apparmor": "apparmor",
+                        "auth": "авт",
                         "docker": "docker",
                         "hardware": "хардуер",
                         "hass": "hass",
                         "hassio": "hassio",
                         "host": "хост",
-                        "rating": "рейтинг"
+                        "host_pid": "хост pid",
+                        "ingress": "Проникване",
+                        "rating": "рейтинг",
+                        "stage": "Етап"
                     },
                     "role": {
                         "admin": "админ",
+                        "backup": "архивиране",
                         "default": "по подразбиране",
                         "homeassistant": "homeassistant",
                         "manager": "мениджър"
@@ -170,6 +180,7 @@
                 "new_update_available": "{name} {version} е налично",
                 "not_available_arch": "Тази добавка не е съвместима с процесора на вашето устройство или операционната система, която сте инсталирали на вашето устройство.",
                 "not_available_version": "Изпълнявате Home Assistant {core_version_installed}, за да актуализирате до тази версия на добавката ви е необходима поне версия {core_version_needed} на Home Assistant",
+                "open_web_ui": "Отваряне на потребителския WEB интерфейс",
                 "option": {
                     "auto_update": {
                         "description": "Автоматично актуализиране на добавката, когато има налична нова версия",
@@ -184,6 +195,7 @@
                         "title": "Показване в страничната лента"
                     },
                     "protected": {
+                        "description": "Блокира елевиран системен достъп на добавката",
                         "title": "Режим на защита"
                     },
                     "watchdog": {
@@ -203,12 +215,19 @@
                 "uninstall": "деинсталиране",
                 "visit_addon_page": "Посетете страницата {name} за повече подробности"
             },
+            "documentation": {
+                "get_documentation": "Неуспешно получаване на документация за добавката, {error}"
+            },
             "failed_to_reset": "Нулирането на конфигурацията на добавката не бе успешно, {error}",
             "failed_to_save": "Запазването на конфигурацията на добавката не бе успешно, {error}",
+            "logs": {
+                "get_logs": "Неуспешно получаване журнали на добавка, {грешка}"
+            },
             "panel": {
                 "configuration": "Конфигурация",
                 "documentation": "Документация",
-                "info": "Информация"
+                "info": "Информация",
+                "log": "Журнал"
             },
             "state": {
                 "installed": "Добавката е инсталирана",
@@ -292,6 +311,8 @@
                 "password": "Парола",
                 "registry": "Регистър",
                 "remove": "Премахване",
+                "title_add": "Добавяне регистър на контейнер",
+                "title_manage": "Управление на регистрите на контейнери",
                 "username": "Потребителско име"
             },
             "repositories": {
@@ -306,14 +327,15 @@
             "update": {
                 "create_snapshot": "Създаване на снапшот на {name} преди актуализиране",
                 "snapshot": "Снапшот",
-                "snapshotting": "Създава се моментна снимка на {name}",
+                "snapshotting": "Създава се снапшот на {name}",
                 "updating": "Актуализиране на {name} до версия {version}"
             }
         },
         "my": {
             "error": "Възникна неизвестна грешка",
-            "error_addon_not_found": "Добавката не е намерена",
-            "faq_link": "My Home Assistant ЧЗВ"
+            "error_addon_not_found": "Не е намерена добавка",
+            "faq_link": "My Home Assistant ЧЗВ",
+            "not_supported": "Тази препратка не се поддържа от вашата Home Assistant инсталация. Последвайте {link} за поддържани препратки както и версиите при тяхното пускане."
         },
         "panel": {
             "dashboard": "Табло",
@@ -323,9 +345,10 @@
         },
         "snapshot": {
             "addons": "Добавки",
-            "available_snapshots": "Налични Снапшоти",
+            "available_snapshots": "Налични снапшоти",
             "could_not_create": "Не можа да се създаде снапшот",
             "create": "Създаване",
+            "create_blocked_not_running": "Създаването на снапшот в момента не е възможно, тъй като системата е в състояние {state}.",
             "create_snapshot": "Създаване на снапшот",
             "description": "Снапшотите ви позволяват лесно да архивирате и възстановявате всички данни от вашия екземпляр на Home Assistant.",
             "enter_password": "Моля, въведете парола.",
@@ -364,7 +387,9 @@
                 "change_hostname": "Промяна в името на хоста",
                 "confirm_reboot": "Сигурни ли сте, че искате да рестартирате хоста?",
                 "confirm_shutdown": "Сигурни ли сте, че искате да изключите хоста?",
+                "deployment": "Зареждане",
                 "docker_version": "Версия на Docker",
+                "emmc_lifetime_used": "Използван живот на eMMC",
                 "failed_to_get_hardware_list": "Неуспешно получаване на списъка с хардуер",
                 "failed_to_import_from_usb": "Неуспешно импортиране от USB",
                 "failed_to_reboot": "Неуспешно рестартиране на хоста",
@@ -380,13 +405,19 @@
                 "shutdown_host": "Изключване на хоста",
                 "used_space": "Използвано пространство"
             },
+            "log": {
+                "get_logs": "Неуспешно получаване на {provider} журнали, {error}",
+                "log_provider": "Доставчик на журнал"
+            },
             "supervisor": {
                 "beta_backup": "Уверете се, че имате резервни копия на вашите данни, преди да активирате тази функция.",
                 "beta_join_confirm": "Искате ли да се присъедините към бета канала?",
                 "beta_release_items": "Това включва бета версии за:",
+                "beta_warning": "Бета версиите са за тестери и ранни потребители и могат да съдържат нестабилни промени в кода",
                 "channel": "Канал",
                 "cpu_usage": "Използване на CPU от Supervisor",
                 "failed_to_reload": "Неуспешно презареждане на Supervisor",
+                "failed_to_set_option": "Неуспешно задаване на Супервайзър-опция",
                 "failed_to_update": "Неуспешно актуализиране на Supervisor",
                 "join_beta_action": "Присъединяване към бета канала",
                 "join_beta_description": "Получавайте бета актуализации за Home Assistant (RCs), Supervisor и хоста",
@@ -396,24 +427,33 @@
                 "reload_supervisor": "Презареждане на Supervisor",
                 "share_diagnostics": "Споделяне на диагностика",
                 "share_diagnostics_description": "Споделяйте доклади за сривове и диагностична информация.",
+                "share_diagonstics_description": "Искате ли да споделяте автоматично отчети за сривове и диагностична информация, когато Supervisor срещне неочаквани грешки? {line_break} Това ще ни позволи да отстраним проблемите, информацията е достъпна само за екипа на Home Assistant Core и няма да бъде споделяна с други. {line_break} Данните не включват никаква частна/чувствителна информация и можете да деактивирате това в настройките по всяко време, когато пожелаете.",
                 "share_diagonstics_title": "Помогнете за подобряването на Home Assistant",
+                "unhealthy_description": "Управлението на нездрава инсталация ще доведе до проблеми. По-долу са проблемите на вашата инсталация, следвайте връзките за възможни решения.",
                 "unhealthy_reason": {
                     "docker": "Средата на Docker не работи правилно",
                     "privileged": "Supervisor не е привилегирован",
                     "setup": "Настройката на Supervisor не бе успешна",
-                    "supervisor": "Supervisor не успя да се актуализира"
+                    "supervisor": "Supervisor не успя да се актуализира",
+                    "untrusted": "Открито e ненадежден съдържание"
                 },
+                "unhealthy_title": "Вашата инсталация е нездрава",
+                "unsupported_description": "По-долу са откритите проблеми на вашата инсталация, следвайте връзките за възможни решения.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor не е активиран на хоста",
                     "container": "Контейнери, за които е известно, че причиняват проблеми",
+                    "content-trust": "Проверката за надеждно съдържанието е деактивирана.",
                     "dbus": "DBUS",
                     "docker_configuration": "Конфигурация на Docker",
                     "docker_version": "Docker Версия",
+                    "job_conditions": "Игнорирани условия при работа",
                     "lxc": "LXC",
                     "network_manager": "Мрежов мениджър",
                     "os": "Операционна система",
                     "privileged": "Supervisor не е привилегирован",
                     "systemd": "Systemd"
                 },
+                "unsupported_title": "Използвате неподдържана инсталация",
                 "update_supervisor": "Актуализиране на Supervisor",
                 "warning": "ВНИМАНИЕ"
             }
@@ -517,7 +557,8 @@
             },
             "script": {
                 "cancel": "Отказ",
-                "cancel_multiple": "Отмяна на {number}"
+                "cancel_multiple": "Отмяна на {number}",
+                "run": "Изпълни"
             },
             "service": {
                 "run": "Изпълни"
@@ -613,7 +654,13 @@
         },
         "components": {
             "addon-picker": {
-                "addon": "Добавка"
+                "addon": "Добавка",
+                "error": {
+                    "no_supervisor": {
+                        "description": "Не е намерен Supervisor, така че добавките не могат да бъдат заредени.",
+                        "title": "Няма Supervisor"
+                    }
+                }
             },
             "area-picker": {
                 "add_dialog": {
@@ -703,7 +750,8 @@
                     "was_safe": "беше безопасно",
                     "was_unlocked": "беше отключен",
                     "was_unplugged": "беше изключен"
-                }
+                },
+                "show_trace": "Показване на следа"
             },
             "media-browser": {
                 "audio_not_supported": "Браузърът не поддържа този аудио елемент.",
@@ -804,9 +852,9 @@
                 "add_entity_id": "Изберете обект",
                 "expand_area_id": "Разгънете тази област в отделните устройства и обекти, които тя съдържа. След разширяване няма да актуализира устройствата и обектите, когато зоната се промени.",
                 "expand_device_id": "Разширете това устройство в отделни обекти. След разширяване няма да актуализира обектите, когато устройството се промени.",
-                "remove_area_id": "Премахване на област",
-                "remove_device_id": "Премахване на устройство",
-                "remove_entity_id": "Премахване на обект"
+                "remove_area_id": "Премахване на областта",
+                "remove_device_id": "Премахване на устройството",
+                "remove_entity_id": "Премахване на обекта"
             },
             "user-picker": {
                 "add_user": "Добавяне на потребител",
@@ -994,6 +1042,7 @@
                         "automation": "Презареждане на автоматизациите",
                         "command_line": "Презаредете обекти на командния ред",
                         "core": "Презаредете местоположение и персонализации",
+                        "filter": "Филтриране на обектите",
                         "group": "Презаредете групи, групови обекти и услуги за уведомяване",
                         "history_stats": "Презаредете обекти с исторически данни",
                         "homekit": "Презареди HomeKit",
@@ -1012,6 +1061,8 @@
                         "stop": "Спиране"
                     },
                     "types": {
+                        "navigation": "Навигирайте",
+                        "reload": "Презареждане",
                         "server_control": "Сървър"
                     }
                 },
@@ -1028,17 +1079,21 @@
                 "buttons": {
                     "add": "Добавете устройства чрез това устройство",
                     "clusters": "Управление на клъстери",
+                    "device_children": "Преглед на дъщерни ",
+                    "reconfigure": "Преконфигуриране на устройство",
                     "remove": "Премахване на устройство",
                     "zigbee_information": "Подпис на Zigbee устройството"
                 },
                 "confirmations": {
                     "remove": "Сигурни ли сте, че искате да премахнете устройството?"
                 },
+                "device_children": "Zigbee дъщерно устройство",
                 "device_signature": "Подпис на Zigbee устройството",
                 "last_seen": "Последно видян",
                 "manuf": "от {manufacturer}",
                 "no_area": "Без област",
                 "power_source": "Източник на захранване",
+                "quirk": "Хрумване",
                 "services": {
                     "reconfigure": "Преконфигурирайте ZHA устройство (оздравяване на устройство). Използвайте това, ако имате проблеми с устройството. Ако въпросното устройство е захранвано с батерии, моля, уверете се, че е будно и приема команди, когато използвате тази услуга.",
                     "remove": "Премахване на устройство от Zigbee мрежата.",
@@ -1048,6 +1103,9 @@
                 "zha_device_card": {
                     "device_name_placeholder": "Променете името на устройството"
                 }
+            },
+            "zha_reconfigure_device": {
+                "heading": "Преконфигуриране на устройство"
             }
         },
         "duration": {
@@ -1060,9 +1118,19 @@
         "errors": {
             "config": {
                 "edit_in_yaml_supported": "Все още можете да редактирате вашата конфигурация в YAML.",
+                "editor_not_supported": "Визуалния редактор не се поддържа за тази конфигурация",
                 "error_detected": "Открити са грешки в конфигурацията",
                 "key_missing": "Липсва задължителният ключ \"{key}\".",
-                "no_template_editor_support": "Шаблоните не се поддържат във визуалния редактор"
+                "no_template_editor_support": "Шаблоните не се поддържат във визуалния редактор",
+                "no_type_provided": "Не е указан тип."
+            },
+            "supervisor": {
+                "ask": "Помолете за помощ",
+                "observer": "Проверете Надзорника",
+                "reboot": "Опитайте да рестартирате хоста",
+                "system_health": "Проверете здравето на системата",
+                "title": "Не може да се зареди Супервайзър-панела!",
+                "wait": "Ако току-що сте стартирали, дайте достатъчно време за старт на Супервайзъра."
             }
         },
         "login-form": {
@@ -1078,8 +1146,11 @@
         },
         "notification_toast": {
             "connection_lost": "Връзката е прекъсната. Повторно свързване...",
+            "intergration_starting": "Стартиране на {integration}, не всичко ще бъде налично, докато процесът не приключи.",
             "service_call_failed": "Неуспешно повикване на услуга {service}.",
-            "started": "Home Assistant стартира успешно!"
+            "started": "Home Assistant стартира успешно!",
+            "triggered": "Задействане {name}",
+            "wrapping_up_startup": "Финализиране на стартирането, не всичко ще бъде налично, докато процесът не приключи."
         },
         "panel": {
             "config": {
@@ -1162,6 +1233,7 @@
                                     "extra_fields": {
                                         "brightness_pct": "Яркост",
                                         "code": "Код",
+                                        "flash": "Флаш",
                                         "humidity": "Влажност",
                                         "message": "Съобщение",
                                         "mode": "Режим",
@@ -1241,7 +1313,7 @@
                                         "below": "Под",
                                         "for": "Продължителност",
                                         "hvac_mode": "HVAC режим",
-                                        "preset_mode": "Предварително зададен режим"
+                                        "preset_mode": "Зададен режим"
                                     },
                                     "label": "Устройство"
                                 },
@@ -1322,6 +1394,7 @@
                         "move_down": "Премести надолу",
                         "move_up": "Премести нагоре",
                         "save": "Запазване",
+                        "show_trace": "Показване на следа",
                         "triggers": {
                             "add": "Добавяне на тригер",
                             "delete": "Изтриване",
@@ -1428,6 +1501,8 @@
                         "add_automation": "Добавяне на автоматизация",
                         "delete_automation": "Изтрийте автоматизацията",
                         "delete_confirm": "Наистина ли искате да изтриете тази автоматизация?",
+                        "dev_automation": "Автоматизирано отстраняване на грешки.",
+                        "dev_only_editable": "Отстраняване на грешки е възможно само за автоматизации с уникален идентификационен номер.",
                         "duplicate": "Дублиране",
                         "duplicate_automation": "Дублиране на автоматизацията",
                         "edit_automation": "Редактиране на автоматизацията",
@@ -1445,6 +1520,7 @@
                     "thingtalk": {
                         "create": "Създайте автоматизация",
                         "task_selection": {
+                            "error_empty": "Въведете команда или натиснете Пропускане",
                             "for_example": "Например:",
                             "header": "Създайте нова автоматизация",
                             "introduction": "Въведете по-долу какво трябва да направи тази автоматизация и ние ще се опитаме да я преобразуваме в автоматизация на Home Assistant.",
@@ -1484,6 +1560,8 @@
                         },
                         "introduction": "Конфигурацията на план ви позволява да импортирате и управлявате вашите планове.",
                         "learn_more": "Научете повече за използването на планове",
+                        "share_blueprint": "Споделяне на план",
+                        "share_blueprint_no_url": "Планът не може да се сподели. Липсва  URL-източник",
                         "use_blueprint": "Създайте автоматизация"
                     }
                 },
@@ -1494,26 +1572,42 @@
                             "disable": "деактивирайте",
                             "enable": "активиране",
                             "enable_ha_skill": "Активирайте умението Home Assistant за Alexa",
+                            "enable_state_reporting": "Разрешаване на отчитане на състояние",
+                            "info": "С интеграцията на Alexa за облака Home Assistant ще можете да контролирате всичките си Home Assistant устройства от всяко устройство с активирана Alexa.",
+                            "info_state_reporting": "Ако активирате отчитане на състояние, Home Assistant ще изпраща всички промени в състоянието на изложените обекти към Amazon. Това позволява да виждате винаги най-актуалните състояния в приложението Alexa, както и да ги използвате за да създавате рутини.",
+                            "manage_entities": "Управление на обекти",
+                            "sync_entities": "Синхронизиране на обекти с Amazon",
+                            "sync_entities_error": "Неуспешно синхронизирани обекти:",
                             "title": "Alexa"
                         },
                         "connected": "Свързан",
                         "connection_status": "Състояние на връзката с облака",
+                        "fetching_subscription": "Извличане на абонамент...",
                         "google": {
                             "config_documentation": "Документация за конфигурацията",
                             "devices_pin": "ПИН код за Устройства за защита",
                             "enter_pin_hint": "Въведете ПИН за използване на устройства за защита",
+                            "manage_entities": "Управление на обекти",
                             "not_configured_text": "Преди да можете да използвате Google Assistant, трябва да активирате умението Home Assistant Cloud за Google Assistant в приложението Google Home.",
                             "not_configured_title": "Google Assistant не е активиран",
                             "security_devices": "Устройства за защита",
+                            "sync_entities": "Синхронизиране на обекти с Google",
+                            "sync_entities_404_message": "Неуспешно синхронизиране на вашите обекти с Google, помолете Google „Hey Google, sync my devices“, за да синхронизира вашите обекти.",
                             "title": "Google Assistant"
                         },
                         "integrations": "Интеграции",
+                        "integrations_introduction": "Интеграциите за облака Assistant Cloud позволяват свързването облачни услуги, като се избягва публичното излагане на инсталацията Home Assistant в интернет.",
                         "integrations_introduction2": "Проверете уебсайта за",
                         "integrations_link_all_features": "всички налични функции",
                         "manage_account": "Управление на акаунта",
+                        "nabu_casa_account": "Акаунт в Nabu Casa",
                         "not_connected": "Не е свързан",
                         "remote": {
+                            "access_is_being_prepared": "Подготвя се отдалечен достъп. Ще ви уведомим, когато е готов.",
                             "certificate_info": "Информация за сертификата",
+                            "info": "Облакът Home Assistant осигурява защитена отдалечена връзка с вашата инсталация, докато сте далеч от дома. ",
+                            "instance_is_available": "Вашата инсталация е налична на",
+                            "instance_will_be_available": "Вашата инсталация ще е налична на",
                             "link_learn_how_it_works": "Научете как работи",
                             "title": "Дистанционен контрол"
                         },
@@ -1545,6 +1639,7 @@
                         "expose": "Откриване към Alexa",
                         "expose_entity": "Изложи обекта",
                         "exposed": "{selected} изложен",
+                        "exposed_entities": "Изложени обекти",
                         "follow_domain": "Следван домейн",
                         "manage_domains": "Управление на домейни",
                         "not_exposed": "{selected} неизложен",
@@ -1558,7 +1653,7 @@
                         "certificate_expiration_date": "Дата на изтичане на сертификата:",
                         "certificate_information": "Информация за сертификата",
                         "close": "Затвори",
-                        "will_be_auto_renewed": "ще бъде автоматично подновено"
+                        "will_be_auto_renewed": "ще бъде автоматично подновен"
                     },
                     "dialog_cloudhook": {
                         "close": "Затвори",
@@ -1571,6 +1666,7 @@
                         "email_error_msg": "Грешен имейл",
                         "instructions": "Въведете вашия имейл адрес и ние ще ви изпратим линк за нулиране на вашата парола.",
                         "send_reset_email": "Изпратете имейл за нулиране",
+                        "subtitle": "Забравена парола",
                         "title": "Забравена парола"
                     },
                     "google": {
@@ -1579,17 +1675,22 @@
                         "expose": "Откриване към Google Assistant",
                         "expose_entity": "Изложи обекта",
                         "exposed": "{selected} изложен",
+                        "exposed_entities": "Изложени обекти",
                         "follow_domain": "следван домейн",
                         "manage_domains": "Управление на домейни",
                         "not_exposed": "{selected} неизложен",
+                        "not_exposed_entities": "Не изложени обекти",
+                        "sync_to_google": "Синхронизиране на промените с Google.",
                         "title": "Google Assistant"
                     },
                     "login": {
                         "alert_email_confirm_necessary": "Трябва да потвърдите имейла си, преди да влезете.",
                         "alert_password_change_required": "Трябва да промените паролата си, преди да влезете.",
+                        "dismiss": "Отхвърли",
                         "email": "Имейл",
                         "email_error_msg": "Грешен имейл",
                         "forgot_password": "Забравена парола?",
+                        "introduction": "Облакът Home Assistant осигурява защитена отдалечена връзка с вашата инсталация, докато сте далеч от дома. Също така позволява свързването с изцяло облачни услуги: Amazon Alexa и Google Assistant.",
                         "introduction2": "Тази услуга се управлява от нашия партньор",
                         "introduction2a": ", компания основана от основателите на Home Assistant и Hass.io.",
                         "introduction3": "Home Assistant Cloud е абонаментна услуга с безплатен едномесечен пробен период. Не е необходима информация за плащане.",
@@ -1598,6 +1699,7 @@
                         "password_error_msg": "Паролите са най-малко 8 знака",
                         "sign_in": "Впиши се",
                         "start_trial": "Започнете безплатния си едномесечен пробен период",
+                        "title": "Облачно влизане",
                         "trial_info": "Не е необходима информация за плащане"
                     },
                     "register": {
@@ -1607,15 +1709,20 @@
                         "email_error_msg": "Грешен имейл",
                         "feature_amazon_alexa": "Интеграция с Amazon Alexa",
                         "feature_google_home": "Интеграция с Google Assistant",
+                        "feature_remote_control": "Контрол на Home Assistant далеч от дома",
                         "feature_webhook_apps": "Лесна интеграция с базирани на webhook приложения като OwnTracks",
                         "headline": "Започнете безплатния си пробен период",
+                        "information": "Създайте акаунт с безплатен едномесечен пробен период в облака Home Assistant. Не се изисква информация за плащане.",
+                        "information2": "Пробният период ще ви даде достъп до всички предимства на Home Assistant Cloud, включително:",
                         "information3": "Тази услуга се управлява от нашия партньор",
                         "information3a": ", компания основана от основателите на Home Assistant и Hass.io.",
+                        "information4": "С регистрирането на акаунт се съгласявате със следните условия.",
                         "link_privacy_policy": "Политика за поверителност",
                         "link_terms_conditions": "Правила и условия",
                         "password": "Парола",
                         "password_error_msg": "Паролите са най-малко 8 знака",
                         "resend_confirm_email": "Повторно изпращане на имейл за потвърждение",
+                        "start_trial": "Започнете пробен период",
                         "title": "Регистриране на акаунт"
                     }
                 },
@@ -1630,11 +1737,15 @@
                     "section": {
                         "core": {
                             "analytics": {
+                                "documentation": "Преди да активирате това, не забравяйте да посетите страницата с документация за анализа {link} за да разберете какво изпращате и как се съхранява.",
                                 "header": "Анализи",
-                                "learn_more": "Научете повече за това как ще бъдат обработени вашите данни.",
+                                "instance_id": "Идент. № на инсталация: {huuid}",
+                                "introduction": "Споделете информация от вашата инсталация, за да  подобряваме още Home Assistant и да ни помогнете да убедим производителите да добавят функции за локален контрол с фокус върху поверителността.",
+                                "learn_more": "Как обработваме вашите данни",
                                 "needs_base": "Трябва да активирате базовия анализ, за да бъде налична тази опция",
                                 "preference": {
                                     "base": {
+                                        "description": "Идентификационен номер на инсталацията, версия и тип на инсталиране.",
                                         "title": "Базов анализ"
                                     },
                                     "diagnostics": {
@@ -1642,13 +1753,15 @@
                                         "title": "Диагностика"
                                     },
                                     "statistics": {
+                                        "description": "Общо използвани обекти, потребители и други елементи.",
                                         "title": "Статистика за употребата"
                                     },
                                     "usage_supervisor": {
+                                        "description": "Имена, версии и възможности.",
                                         "title": "Използвани интеграции и добавки"
                                     },
                                     "usage": {
-                                        "description": "Това включва имената на вашите интеграции",
+                                        "description": "Информация за име и версия.",
                                         "title": "Използвани интеграции"
                                     }
                                 }
@@ -1694,11 +1807,13 @@
                 "devices": {
                     "automation": {
                         "actions": {
+                            "caption": "Когато нещо се задейства...",
                             "no_actions": "Няма действия",
                             "unknown_action": "Неизвестно действие"
                         },
                         "automations": "Автоматизации",
                         "conditions": {
+                            "caption": "Направи нещо само ако...",
                             "no_conditions": "Няма условия",
                             "unknown_condition": "Неизвестно условие"
                         },
@@ -1706,6 +1821,9 @@
                         "create_disable": "Не може да се създаде автоматизация с деактивирано устройство",
                         "no_automations": "Няма автоматизации",
                         "no_device_automations": "Няма налични автоматизации за това устройство.",
+                        "triggers": {
+                            "caption": "Направи нещо, когато..."
+                        },
                         "unknown_automation": "Неизвестна автоматизация"
                     },
                     "cant_edit": "Можете да редактирате само елементи, които са създадени в потребителския интерфейс.",
@@ -1723,6 +1841,7 @@
                     "delete": "Изтриване",
                     "description": "Управление на конфигурираните устройства",
                     "device_info": "Информация за устройството",
+                    "device_not_found": "Не е намерено устройство.",
                     "disabled": "Деактивирано",
                     "disabled_by": {
                         "config_entry": "Конфигурационен запис",
@@ -1733,9 +1852,10 @@
                     "enabled_label": "Активиране на устройството",
                     "entities": {
                         "add_entities_lovelace": "Добавете към Lovelace",
-                        "disabled_entities": "+{count} {count, plural,\n  one {деактивиран обект}\n  other {деактивирани обекти}\n}",
+                        "disabled_entities": "+{count} {count, plural,\n  one {деактивиран обект}\n  other {деактивирани обекта}\n}",
                         "entities": "Обекти",
-                        "hide_disabled": "Скриване на деактивираните"
+                        "hide_disabled": "Скриване на деактивираните",
+                        "none": "Това устройство няма обекти"
                     },
                     "name": "Име",
                     "no_devices": "Няма устройства",
@@ -1771,9 +1891,13 @@
                     "description": "Управление на известните обекти",
                     "picker": {
                         "disable_selected": {
+                            "button": "Деактивиране на избраните",
+                            "confirm_text": "Деактивираните обекти няма да бъдат добавени в Home Assistant.",
                             "confirm_title": "Искате ли да забраните {number} {number, plural,\n  one {обект}\n  other {обекта}\n}?"
                         },
                         "enable_selected": {
+                            "button": "Активиране на избраните",
+                            "confirm_text": "Това ще ги направи отново достъпни в Home Assistant, ако сега са деактивирани.",
                             "confirm_title": "Искате ли да разрешите {number} {number, plural,\n  one {обект}\n  other {обекта}\n}?"
                         },
                         "filter": {
@@ -1787,6 +1911,7 @@
                         "header": "Обекти",
                         "headers": {
                             "area": "Област",
+                            "entity_id": "ID на обекта",
                             "integration": "Интеграция",
                             "name": "Име",
                             "status": "Състояние"
@@ -1794,13 +1919,17 @@
                         "introduction": "Home Assistant поддържа регистър на всички обекти, които някога е виждал, които могат да бъдат идентифицирани уникално. Всеки от тези обекти ще има  идентификатор на обект, който ще бъде резервиран само за този обект.",
                         "introduction2": "Използвайте регистъра на обектите, за да промените името, идентификатора на обекта или да премахнете записа от Home Assistant. Моля имайте на предвид, че премахването на записа от регистъра на обектите няма да премахне обекта. За да направите това, следвайте препратката по-долу и я премахнете от страницата за интеграции.",
                         "remove_selected": {
+                            "button": "Премахване на избраните",
                             "confirm_partly_title": "Само {number} {number, plural,\n  one {избран обект}\n  other {избрани обекта}\n} могат да бъдат премахнати.",
                             "confirm_title": "Искате ли да премахнете {number} {number, plural,\n  one {обект}\n  other {обекта}\n}?"
                         },
                         "search": "Търсене на обекти",
+                        "selected": "{number} избрани",
                         "status": {
+                            "disabled": "Деактивиран",
                             "ok": "ДА",
                             "readonly": "Само за четене",
+                            "restored": "Възстановен",
                             "unavailable": "Недостъпен"
                         }
                     }
@@ -1821,6 +1950,7 @@
                     },
                     "picker": {
                         "headers": {
+                            "entity_id": "ID на обекта",
                             "name": "Име",
                             "type": "Тип"
                         }
@@ -1836,8 +1966,11 @@
                 "info": {
                     "built_using": "Изграден с използване на",
                     "caption": "Информация",
+                    "copy_github": "За GitHub",
                     "description": "Версия, състояние на системата и връзки към документация",
                     "documentation": "Документация",
+                    "frontend": "Интерфейс",
+                    "frontend_version": "Версия на интерфейса: {version} - {type}",
                     "home_assistant_logo": "Лого на Home Assistant",
                     "icons_by": "Икони от",
                     "integrations": "Интеграции",
@@ -1856,12 +1989,16 @@
                     "caption": "Интеграции",
                     "config_entry": {
                         "area": "В {area}",
+                        "check_the_logs": "Проверете журналите",
+                        "configure": "Конфигуриране",
                         "delete": "Изтриване",
                         "delete_confirm": "Сигурни ли сте, че искате да изтриете интеграцията?",
+                        "depends_on_cloud": "Зависи от облака",
                         "device_unavailable": "Устройството е недостъпно",
                         "devices": "{count} {count, plural,\n  one {устройство}\n  other {устройства}\n}",
                         "disable_restart_confirm": "Рестартирайте Home Assistant за да завършите деактивирането на тази интеграция",
                         "disable": {
+                            "disable_confirm": "Наистина ли искате да забраните този конфигурационен запис? Устройствата и обекти му ще бъдат деактивирани.",
                             "disabled": "Деактивиран",
                             "disabled_by": {
                                 "device": "устройство",
@@ -1872,13 +2009,14 @@
                         },
                         "documentation": "Документация",
                         "enable_restart_confirm": "Рестартирайте Home Assistant за да завършите активирането на тази интеграция",
-                        "entities": "{count} {count, plural,\n  one {обект}\n  other {обекти}\n}",
+                        "entities": "{count} {count, plural,\n  one {обект}\n  other {обекта}\n}",
                         "entity_unavailable": "Обектът е недостъпен",
                         "firmware": "Фърмуер: {version}",
                         "hub": "Свързан чрез",
+                        "logs": "Журнали",
                         "manuf": "от {manufacturer}",
                         "no_area": "Без област",
-                        "not_loaded": "Не е зареден, проверете {logs_link}",
+                        "not_loaded": "Не е заредено, проверете {logs_link}",
                         "options": "Настройки",
                         "reload": "Презареждане",
                         "reload_confirm": "Интеграцията беше презаредена",
@@ -1886,6 +2024,11 @@
                         "rename": "Преименуване",
                         "restart_confirm": "Рестартирайте Home Assistant за да завършите премахването на интеграцията",
                         "services": "{count} {count, plural,\n  one {услуга}\n  other {услуги}\n}",
+                        "state": {
+                            "loaded": "Зареден",
+                            "migration_error": "Грешка при миграцията",
+                            "not_loaded": "Не е зареден"
+                        },
                         "system_options": "Системни настройки",
                         "unnamed_entry": "Запис без име"
                     },
@@ -1917,6 +2060,7 @@
                         "confirm_ignore": "Наистина ли не искате да настроите тази интеграция? Можете да отмените това, като кликнете върху „Показване на игнорирани интеграции“ в менюто горе вдясно."
                     },
                     "integration": "интеграция",
+                    "integration_not_found": "Не е намерена интеграция.",
                     "new": "Настройте нова интеграция",
                     "no_integrations": "Изглежда, че все още нямате конфигурирани интеграции. Кликнете върху бутона по-долу, за да добавите първата си интеграция!",
                     "none": "Нищо не е конфигурирано към момента",
@@ -1931,7 +2075,11 @@
                 },
                 "introduction": "Тук е възможно да конфигурирате Вашите компоненти и Home Assistant. Не всичко е възможно да се конфигурира от Интерфейса, но работим по върпоса.",
                 "logs": {
+                    "caption": "Журнали",
                     "clear": "Изчистване",
+                    "custom_integration": "персонализирана интеграция",
+                    "description": "Преглед на журналите на Home Assistant",
+                    "error_from_custom_integration": "Тази грешка произтича от персонализирана интеграция.",
                     "level": {
                         "critical": "КРИТИЧНО",
                         "debug": "ДЕБЪГ",
@@ -1939,7 +2087,10 @@
                         "info": "ИНФО",
                         "warning": "ВНИМАНИЕ"
                     },
-                    "multiple_messages": "съобщението е възникнало за първи път в {time} и се показва {counter} пъти",
+                    "load_full_log": "Зареждане на пълния журнал на Home Assistant",
+                    "loading_log": "Зарежда се журнала за грешки...",
+                    "multiple_messages": "съобщението е възникнало за първи път на {time} и се показва {counter} пъти",
+                    "no_issues": "Няма нови проблеми!",
                     "refresh": "Опресняване"
                 },
                 "lovelace": {
@@ -1960,7 +2111,9 @@
                             "edit_dashboard": "Редактиране на таблото",
                             "icon": "Икона",
                             "new_dashboard": "Добавяне на ново табло",
+                            "remove_default": "Премахване по подразбиране на това устройство",
                             "require_admin": "Само администратори",
+                            "set_default": "Задаване по подразбиране на това устройство",
                             "show_sidebar": "Показване в страничната лента",
                             "title": "Заглавие",
                             "title_required": "Заглавието е задължително.",
@@ -2014,13 +2167,15 @@
                         "controller": "Контролер",
                         "network": "Мрежа",
                         "query_stage": "Етап на заявка",
+                        "wakeup_instructions": "Инструкции за събуждане",
                         "zwave": "Z-Wave"
                     },
                     "navigation": {
                         "network": "Мрежа",
                         "node": {
                             "dashboard": "Табло"
-                        }
+                        },
+                        "nodes": "Възли"
                     },
                     "network_status": {
                         "details": {
@@ -2028,8 +2183,14 @@
                             "started": "Свързан към MQTT",
                             "starting": "Свързване към MQTT"
                         },
+                        "offline": "Извън линия",
+                        "online": "На линия",
+                        "starting": "Стартиране",
                         "unknown": "Неизвестно"
                     },
+                    "network": {
+                        "node_count": "{count} възли"
+                    },
                     "node_metadata": {
                         "product_manual": "Ръководство за продукта"
                     },
@@ -2038,7 +2199,7 @@
                     },
                     "node": {
                         "button": "Детайли за възела",
-                        "not_found": "Възел не е намерен"
+                        "not_found": "Не е намерен възел"
                     },
                     "nodes_table": {
                         "failed": "Неуспешно",
@@ -2050,13 +2211,17 @@
                     },
                     "refresh_node": {
                         "button": "Обнови възела",
+                        "node_status": "Състояние на възела",
+                        "refreshing_description": "Опресняване на информацията за възела...",
                         "step": "Стъпка"
                     },
                     "select_instance": {
                         "none_found": "Не можахме да намерим OpenZWave инстанция. Ако смятате че не е вярно, проверете Вашите OpenZWare и MQTT и се уверете. че Home Assistant може да комуникира със MQTT брокера."
                     },
                     "services": {
-                        "cancel_command": "Отмени командата"
+                        "add_node": "Добавяне на възел",
+                        "cancel_command": "Отмени командата",
+                        "remove_node": "Премахване на възел"
                     }
                 },
                 "person": {
@@ -2083,7 +2248,8 @@
                     },
                     "learn_more": "Научете повече за хората",
                     "no_persons_created_yet": "Изглежда все още не сте добавили хора.",
-                    "note_about_persons_configured_in_yaml": "Забележка: хората, конфигурирани чрез configuration.yaml, не могат да бъдат редактирани чрез потребителския интерфейс."
+                    "note_about_persons_configured_in_yaml": "Забележка: хората, конфигурирани чрез configuration.yaml, не могат да бъдат редактирани чрез потребителския интерфейс.",
+                    "person_not_found_title": "Не е намерено лице"
                 },
                 "scene": {
                     "activated": "Активирана сцена {name} .",
@@ -2120,6 +2286,7 @@
                             "name": "Име"
                         },
                         "learn_more": "Научете повече за сцените",
+                        "no_scenes": "Не можахме да намерим сцени",
                         "only_editable": "Само сцени дефинирани в scenes.yaml могат да се редактират.",
                         "pick_scene": "Изберете сцена за редактиране",
                         "show_info_scene": "Показване на информация за сцената"
@@ -2135,10 +2302,12 @@
                         "delete_script": "Изтриване на скрипта",
                         "header": "Скрипт: {name}",
                         "icon": "Икона",
+                        "id": "ID на обекта",
                         "id_already_exists": "Това ID вече съществува",
                         "id_already_exists_save_error": "Не можете да запазите този скрипт, защото идентификаторът не е уникален, изберете друг идентификатор или го оставете празен, за да се генерира автоматично.",
                         "introduction": "Използвайте скриптове за изпълнение на последователност от действия.",
                         "link_available_actions": "Научете повече за наличните действия.",
+                        "load_error_not_editable": "Само скриптове в scripts.yaml са редактируеми.",
                         "modes": {
                             "label": "Режим",
                             "parallel": "Паралелно",
@@ -2155,10 +2324,13 @@
                         "duplicate": "Дублиране",
                         "duplicate_script": "Дублиране на скрипта",
                         "edit_script": "Редактиране на скрипта",
+                        "header": "Скрипт-редактор",
                         "headers": {
                             "name": "Име"
                         },
+                        "introduction": "Скрипт-редакторът позволява създаването и редактирането на скриптове. Врузката води към допълнитени инструкции за проверка на коректността при конфигурането на Home Assistant.",
                         "learn_more": "Научете повече за скриптовете",
+                        "no_scripts": "Не намираме скриптове",
                         "run_script": "Изпълнете скрипта",
                         "show_info": "Показване на информация за скрипта"
                     }
@@ -2170,6 +2342,7 @@
                         "reloading": {
                             "automation": "Презареждане на автоматизациите",
                             "core": "Презареждане на местоположението и персонализациите",
+                            "filter": "Филтриране на обектите",
                             "group": "Презареждане на групите, груповите обекти и услугите за уведомяване",
                             "heading": "Презареждане на YAML конфигурацията",
                             "homekit": "Презареждане на HomeKit",
@@ -2280,11 +2453,15 @@
                     "add_device": "Добавяне на устройство",
                     "add_device_page": {
                         "discovered_text": "Устройствата ще се показват тук, след като бъдат открити.",
-                        "no_devices_found": "Не бяха намерени устройства, уверете се, че са в режим на сдвояване и ги дръжте будни, докато откриването работи.",
+                        "no_devices_found": "Не бяха намерени устройства, уверете се, че те са в режим на сдвояване и ги дръжте будни, докато откриването работи.",
+                        "pairing_mode": "Уверете се, че вашите устройства са в режим на сдвояване. Проверете инструкциите на вашето устройство за да разберете как да направите това.",
                         "search_again": "Потърси отново",
                         "spinner": "Търсене на ZHA Zigbee устройства..."
                     },
                     "button": "Конфигуриране",
+                    "cluster_attributes": {
+                        "attributes_of_cluster": "Атрибути на избрания клъстер"
+                    },
                     "clusters": {
                         "header": "Клъстери",
                         "introduction": "Клъстерите са градивните елементи за функционалността на Zigbee. Те разделят функционалността на логически единици. Има типове клиенти и сървъри, състоящи се от атрибути и команди."
@@ -2293,6 +2470,13 @@
                         "clusters": "Клъстери",
                         "value": "Стойност"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Преки пътища",
+                        "update_button": "Актуализиране на конфигурацията",
+                        "zha_options": {
+                            "title": "Глобални опции"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Конфигурирането завърши",
                         "CONFIGURED_status_text": "Инициализация",
@@ -2309,9 +2493,10 @@
                         "create_group": "Zigbee Home Automation - Създаване на група",
                         "create_group_details": "Въведете необходимите данни, за да създадете нова zigbee група",
                         "creating_group": "Създаване на група",
+                        "group_details": "Тук са всички подробности за избраната Zigbee група.",
                         "group_info": "Информация за групата",
                         "group_name_placeholder": "Име на групата",
-                        "group_not_found": "Групата не е намерена!",
+                        "group_not_found": "Не е намерена група!",
                         "groups": "Групи",
                         "members": "Членове",
                         "remove_members": "Премахване на членове",
@@ -2352,25 +2537,52 @@
                     "no_zones_created_yet": "Изглежда, че все още не сте създали никакви зони."
                 },
                 "zwave_js": {
+                    "add_node": {
+                        "inclusion_failed": "Възелът не може да бъде добавен. Моля, проверете журналите за повече информация.",
+                        "title": "Добавяне на Z-Wave възел"
+                    },
                     "button": "Конфигуриране",
                     "common": {
+                        "add_node": "Добавяне на възел",
                         "close": "Затвори",
-                        "network": "Мрежа"
+                        "network": "Мрежа",
+                        "node_id": "ID на възел",
+                        "remove_node": "Премахване на възел"
                     },
                     "dashboard": {
                         "driver_version": "Версия на драйвера",
+                        "dump_dead_nodes_title": "Някои от вашите възли са мъртви",
                         "dump_not_ready_confirm": "Изтегляне",
+                        "introduction": "Управлявайте вашата Z-Wave мрежа и Z-Wave възли",
                         "server_version": "Версия на сървъра"
                     },
+                    "device_info": {
+                        "device_config": "Конфигуриране на устройство",
+                        "node_status": "Състояние на възела"
+                    },
                     "navigation": {
                         "network": "Мрежа"
                     },
                     "network_status": {
                         "connected": "Свързан",
-                        "connecting": "Свързване"
+                        "connecting": "Свързване",
+                        "unknown": "Неизвестен"
                     },
                     "node_config": {
-                        "parameter_is_read_only": "Този параметър е само за четене."
+                        "attribution": "Параметрите и описанията на конфигурацията на устройството се предоставят от {device_database}",
+                        "battery_device_notice": "Устройствата на батерии трябва да са будни, за да актуализират конфигурацията си. Моля, вижте ръководството на устройството за инструкции как да го събудите.",
+                        "error_device_not_found": "Не е намерено устройство",
+                        "header": "Z-Wave конфигурация на устройството",
+                        "introduction": "Управление и настройване на специфични конфигурационни параметри на подбраното устройството (възел, node)",
+                        "parameter_is_read_only": "Този параметър е само за четене.",
+                        "zwave_js_device_database": "Z-Wave JS база данни с устройства"
+                    },
+                    "node_status": {
+                        "unknown": "Неизвестен"
+                    },
+                    "remove_node": {
+                        "exclusion_failed": "Възелът не може да бъде премахнат. Моля, проверете журналите за повече информация.",
+                        "title": "Премахване на Z-Wave възел"
                     }
                 },
                 "zwave": {
@@ -2415,6 +2627,10 @@
                     "node_management": {
                         "add_to_group": "Добавяне към група",
                         "group": "Група",
+                        "node_protection": "Защита на възела",
+                        "nodes": "Възли",
+                        "nodes_in_group": "Други възли в тази група:",
+                        "protection": "Защита",
                         "remove_from_group": "Премахване от групата"
                     },
                     "services": {
@@ -2422,6 +2638,7 @@
                         "add_node_secure": "Добавяне на криптирано устройство",
                         "cancel_command": "Отмени командата",
                         "heal_network": "Оздравяване на мрежата",
+                        "node_info": "Информация за възела",
                         "remove_node": "Премахване на устройство",
                         "save_config": "Запазване на конфигурацията",
                         "soft_reset": "Soft нулиране",
@@ -2446,19 +2663,28 @@
                         "column_description": "Описание",
                         "column_example": "Пример",
                         "column_parameter": "Параметър",
+                        "no_template_ui_support": "Потребителският интерфейс не поддържа шаблони, все още можете да използвате YAML редактора.",
                         "title": "Услуги",
+                        "ui_mode": "Отидете в режим Потребителски интерфейс",
+                        "yaml_mode": "Отидете в YAML режим",
                         "yaml_parameters": "Параметрите са налични само в YAML режим"
                     },
                     "states": {
                         "attributes": "Атрибути",
+                        "copy_id": "Копиране на идентификатора в клипборда",
                         "current_entities": "Настоящи обекти",
                         "description1": "Задайте представянето на устройство или обект в Home Assistant.",
                         "description2": "Промяната е фиктивна, до следваща актуализация на устройството или обекта.",
-                        "filter_attributes": "Филтриране на атрибути",
+                        "entity": "Обект",
+                        "filter_attributes": "Филтриране на атрибутите",
+                        "filter_entities": "Филтриране на обектите",
+                        "filter_states": "Филтриране на състоянията",
                         "last_changed": "Последна промяна",
                         "last_updated": "Последна актуализация",
                         "more_info": "Повече информация",
+                        "no_entities": "Няма обекти",
                         "set_state": "Задаване на състояние",
+                        "state": "Състояние",
                         "state_attributes": "Атрибути на състоянието (YAML, по избор)",
                         "title": "Състояния"
                     },
@@ -2484,8 +2710,11 @@
                 "go_back": "Върнете се",
                 "supervisor": {
                     "ask": "Помолете за помощ",
+                    "observer": "Проверете Надзорника",
                     "reboot": "Опитайте да рестартирате хоста",
-                    "system_health": "Проверете здравето на системата"
+                    "system_health": "Проверете здравето на системата",
+                    "title": "Не може да се зареди Супервайзър-панела!",
+                    "wait": "Ако току-що сте стартирали, дайте достатъчно време за старт на Супервайзъра."
                 }
             },
             "history": {
@@ -2523,7 +2752,11 @@
                         "more_info": "Показване на повече информация: {name}",
                         "navigate_to": "Придвижете се до {location}",
                         "tap": "Натиснете:",
-                        "toggle": "Превключване на {name}"
+                        "toggle": "Превключване на {name}",
+                        "url": "Отваряне на прозорец към {url_path}"
+                    },
+                    "safe-mode": {
+                        "header": "Активиран е безопасен режим"
                     },
                     "shopping-list": {
                         "add_item": "Добави артикул",
@@ -2605,7 +2838,7 @@
                             "name": "Обекти",
                             "secondary_info_values": {
                                 "brightness": "Яркост",
-                                "entity-id": "ID на обект",
+                                "entity-id": "ID на обекта",
                                 "last-changed": "Последна промяна",
                                 "last-triggered": "Последно задействане",
                                 "last-updated": "Последна актуализация",
@@ -2613,6 +2846,7 @@
                                 "position": "Позиция",
                                 "tilt-position": "Наклон"
                             },
+                            "show_header_toggle": "Показване на превключване на заглавка?",
                             "toggle": "Превключване на обекти."
                         },
                         "entity-filter": {
@@ -2625,14 +2859,24 @@
                         },
                         "gauge": {
                             "severity": {
+                                "define": "Определете тежестта?",
                                 "green": "Зелено",
                                 "red": "Червено",
                                 "yellow": "Жълто"
                             }
                         },
                         "generic": {
+                            "aspect_ratio": "Съотношение на пропорциите",
                             "attribute": "Атрибут",
+                            "camera_image": " Камера Обект",
+                            "camera_view": "Камера Изглед",
+                            "entities": "Обекти",
+                            "entity": "Обект",
+                            "hold_action": "Действие Задържане",
+                            "hours_to_show": "Часове за показване",
                             "icon": "Икона",
+                            "icon_height": "Височина на иконата",
+                            "image": "Път до изображението",
                             "maximum": "Максимум",
                             "minimum": "Минимум",
                             "name": "Име",
@@ -2642,9 +2886,12 @@
                             "show_icon": "Показване на иконата?",
                             "show_name": "Показване на името?",
                             "show_state": "Показване на състоянието?",
+                            "state": "Състояние",
                             "state_color": "Да се оцветят ли иконите спрямо състоянието?",
+                            "tap_action": "Действие Докосване",
                             "theme": "Тема",
                             "title": "Заглавие",
+                            "unit": "Единица",
                             "url": "URL"
                         },
                         "glance": {
@@ -2671,9 +2918,14 @@
                         },
                         "map": {
                             "dark_mode": "Тъмен режим?",
+                            "default_zoom": "Мащабиране по подразбиране",
+                            "geo_location_sources": "Източници на геолокация",
                             "name": "Карта",
                             "source": "Източник"
                         },
+                        "markdown": {
+                            "content": "Съдържание"
+                        },
                         "media-control": {
                             "description": "Картата за управление на плейърите се използва за показване на обекти на мултимедийния плейър в интерфейс с лесни за използване контроли.",
                             "name": "Управление на плейърите"
@@ -2686,7 +2938,9 @@
                             "name": "Статус на растение"
                         },
                         "sensor": {
-                            "name": "Сензор"
+                            "graph_type": "Графичен тип",
+                            "name": "Сензор",
+                            "show_more_detail": "Показване на повече подробности"
                         },
                         "shopping-list": {
                             "description": "Картата \"Списък за пазаруване\" ви позволява да добавяте, редактирате, отметвате и изчиствате елементи от вашия списък за пазаруване.",
@@ -2846,6 +3100,9 @@
                 },
                 "unused_entities": {
                     "available_entities": "Това са обектите, които имате на разположение, но все още не са във вашия потребителски интерфейс на Lovelace.",
+                    "domain": "Домейн",
+                    "entity": "Обект",
+                    "entity_id": "ID на обекта",
                     "last_changed": "Последна промяна",
                     "no_data": "Не са намерени неизползвани обекти",
                     "search": "Търсене на обекти",
@@ -3017,6 +3274,10 @@
                 }
             },
             "page-onboarding": {
+                "analytics": {
+                    "finish": "Следващ",
+                    "intro": "Споделяйте анализи от вашия екземпляр. Тези данни ще бъдат публично достъпни на адрес {link}"
+                },
                 "core-config": {
                     "button_detect": "Откриване",
                     "finish": "Напред",
@@ -3026,15 +3287,19 @@
                     "location_name": "Име на Вашата Home Assistant инсталация",
                     "location_name_default": "У дома"
                 },
+                "finish": "Завърши",
                 "integration": {
                     "finish": "Завърши",
                     "intro": "Устройствата и услугите са представени в Home Assistant като Интеграции. Можете да ги настроите сега или да го направите по-късно от конфигурационния екран.",
                     "more_integrations": "Още"
                 },
                 "intro": "Готови ли сте да събудите дома си, да отвоювате независимостта си и да се присъедините към световна общност от хора автоматизиращи домовете си?",
+                "next": "Следващ",
                 "restore": {
-                    "description": "Като алтернатива можете да възстановите от предишна моментна снимка.",
-                    "in_progress": "Възстановяването е в ход"
+                    "description": "Като алтернатива можете да възстановите от предишен снапшот.",
+                    "hide_log": "Скриване на пълния дневник",
+                    "in_progress": "Възстановяването е в ход",
+                    "show_log": "Показване на пълния дневник"
                 },
                 "user": {
                     "create_account": "Създай акаунт",
@@ -3130,9 +3395,10 @@
                     "formats": {
                         "comma_decimal": "1,234,567.89",
                         "decimal_comma": "1.234.567,89",
-                        "language": "Авто (изп. езикова настройка)",
+                        "language": "Авто (езикова настройка)",
                         "none": "Без",
-                        "space_comma": "1 234 567,89"
+                        "space_comma": "1 234 567,89",
+                        "system": "Системна настройка"
                     },
                     "header": "Формат на числата"
                 },
diff --git a/translations/frontend/ca.json b/translations/frontend/ca.json
index 28c77a96bf..a064f67ba2 100644
--- a/translations/frontend/ca.json
+++ b/translations/frontend/ca.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "La teva instal·lació no és bona",
                 "unsupported_description": "A continuació es mostra una llista de problemes relacionats amb la instal·lació, fes clic als enllaços per obtenir informació sobre com resoldre'ls.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor no està habilitat a l'amfitrió",
                     "container": "Els contenidors són coneguts per causar problemes",
                     "content-trust": "Validació de continguts de confiança desactivada",
                     "dbus": "DBUS",
@@ -560,9 +561,12 @@
             },
             "light": {
                 "brightness": "Brillantor",
+                "cold_white_value": "Brillantor de blancs freds",
+                "color_brightness": "Brillantor del color",
                 "color_temperature": "Temperatura de color",
                 "effect": "Efecte",
-                "white_value": "Ajust de blanc"
+                "warm_white_value": "Brillantor de blancs calents",
+                "white_value": "Brillantor de blanc"
             },
             "lock": {
                 "code": "Codi",
@@ -706,7 +710,7 @@
                     "text": "Introdueix el nom de la nova àrea.",
                     "title": "Afegeix àrea nova"
                 },
-                "add_new": "Afegir àrea nova...",
+                "add_new": "Afegeix nova àrea...",
                 "area": "Àrea",
                 "clear": "Esborra",
                 "no_areas": "No tens cap àrea",
@@ -885,6 +889,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Documentació de la integració",
                 "required": "Aquest camp és obligatori",
                 "service_data": "Dades del servei",
                 "target": "Objectius",
@@ -1238,10 +1243,12 @@
         "notification_toast": {
             "connection_lost": "Connexió perduda. Tornant a connectar...",
             "dismiss": "Omet",
+            "intergration_starting": "Iniciant {integration}, no estarà tot disponible fins que acabi.",
             "service_call_failed": "Ha fallat la crida al servei {service}.",
             "started": "Home Assistant s'ha iniciat!",
             "starting": "Home Assistant està iniciant-se, no estarà tot disponible fins que acabi",
-            "triggered": "{name} disparat/ada"
+            "triggered": "{name} disparat/ada",
+            "wrapping_up_startup": "Finalitzant l'arrencada, no estarà tot disponible fins que acabi."
         },
         "panel": {
             "config": {
@@ -1605,7 +1612,7 @@
                         "delete_automation": "Elimina l'automatització",
                         "delete_confirm": "Estàs segur que vols eliminar aquesta automatització?",
                         "dev_automation": "Depurar automatització",
-                        "dev_only_editable": "Només es poden depurar les automatitzacions definides al fitxer automations.yaml.",
+                        "dev_only_editable": "Només es poden depurar les automatitzacions que tinguin un identificador únic.",
                         "duplicate": "Duplica",
                         "duplicate_automation": "Duplica l'automatització",
                         "edit_automation": "Edita automatització",
@@ -1692,7 +1699,7 @@
                         },
                         "connected": "Connectat",
                         "connection_status": "Estat de connexió amb Cloud",
-                        "fetching_subscription": "Obtenint la subscripció...",
+                        "fetching_subscription": "Obtenint subscripció...",
                         "google": {
                             "config_documentation": "Documentació de configuració",
                             "devices_pin": "PIN dels dispositius de seguretat",
@@ -1748,7 +1755,7 @@
                             "disable_hook_error_msg": "No s'ha pogut desactivar el webhook:",
                             "info": "Qualsevol cosa que estigui configurada per disparar-se a través d'un webhook pot disposar d'un URL accessible públicament que permet retornar-li dades a Home Assistant des de qualsevol lloc i sense exposar la teva instància a Internet.",
                             "link_learn_more": "Més informació sobre la creació d'automatizacions basats en webhook.",
-                            "loading": "Carregant ...",
+                            "loading": "Carregant...",
                             "manage": "Gestiona",
                             "no_hooks_yet": "Sembla que encara no tens cap webhook. Comença configurant una ",
                             "no_hooks_yet_link_automation": "automatització de webhook",
@@ -1872,28 +1879,28 @@
                                 "documentation": "Abans d'activar això, revisa't la documentació d'anàlisi a {link}, per entendre el què s'enviarà i com s'emmagatzemarà.",
                                 "header": "Dades analítiques",
                                 "instance_id": "ID de la instància: {huuid}",
-                                "introduction": "Comparteix dades analítiques de la teva instància. Aquestes dades estaran disponibles públicament a {link}",
-                                "learn_more": "Més informació sobre com les teves dades es processaran.",
+                                "introduction": "Comparteix informació de la teva instal·lació per ajudar a millorar Home Assistant i ajudar-nos a convèncer als fabricants perquè afegeixin control local i funcions centrades en la privadesa.",
+                                "learn_more": "Com processem les teves dades",
                                 "needs_base": "Has d'habilitar l'anàlisi bàsica perquè aquesta opció estigui disponible",
                                 "preference": {
                                     "base": {
-                                        "description": "Inclou l'ID de la instància, la versió i el tipus d'instal·lació",
+                                        "description": "ID de la instància, versió i tipus d'instal·lació.",
                                         "title": "Anàlisi bàsica"
                                     },
                                     "diagnostics": {
-                                        "description": "Comparteix informes d'errors i informació de diagnòstic",
+                                        "description": "Comparteix informes d'error quan es produeixin errors inesperats.",
                                         "title": "Diagnòstics"
                                     },
                                     "statistics": {
-                                        "description": "Això inclou un seguit d'elements de la teva instal·lació. Per obtenir-ne una llista completa, consulta la documentació",
+                                        "description": "Nombre total d'entitats utilitzades, usuaris i altres elements.",
                                         "title": "Estadístiques d’ús"
                                     },
                                     "usage_supervisor": {
-                                        "description": "Inclou els noms i funcionalitats de les teves integracions i complements",
+                                        "description": "Noms, versions i funcionalitats.",
                                         "title": "Integracions i complements utilitzats"
                                     },
                                     "usage": {
-                                        "description": "Inclou els noms de les teves integracions",
+                                        "description": "Noms i informació de versió.",
                                         "title": "Integracions utilitzades"
                                     }
                                 }
@@ -2153,8 +2160,11 @@
                     "caption": "Integracions",
                     "config_entry": {
                         "area": "A {area}",
+                        "check_the_logs": "Comprova els registres",
+                        "configure": "Configura",
                         "delete": "Elimina",
                         "delete_confirm": "Estàs segur que vols eliminar aquesta integració?",
+                        "depends_on_cloud": "Depèn del núvol",
                         "device_unavailable": "Dispositiu no disponible",
                         "devices": "{count} {count, plural,\n  one {dispositiu}\n  other {dispositius}\n}",
                         "disable_restart_confirm": "Reinicia Home Assistant per acabar de desactivar aquesta integració",
@@ -2177,14 +2187,23 @@
                         "logs": "registres",
                         "manuf": "de {manufacturer}",
                         "no_area": "Sense àrea",
-                        "not_loaded": "No carregat, comprova {logs_link}",
+                        "not_loaded": "No carregada",
                         "options": "Opcions",
+                        "provided_by_custom_integration": "Proporcionada per una integració personalitzada",
                         "reload": "Torna a carregar",
                         "reload_confirm": "La integració s'ha tornat a carregar",
                         "reload_restart_confirm": "Reinicia Home Assistant per acabar de carregar aquesta integració",
                         "rename": "Canvia el nom",
                         "restart_confirm": "Reinicia Home Assistant per acabar d'eliminar aquesta integració",
                         "services": "{count} {count, plural,\n  one {servei}\n  other {serveis}\n}",
+                        "state": {
+                            "failed_unload": "No s'ha pogut desactivar",
+                            "loaded": "Carregada",
+                            "migration_error": "Error de migració",
+                            "not_loaded": "No carregada",
+                            "setup_error": "No s'ha pogut configurar",
+                            "setup_retry": "S'està tornant a provar de configurar"
+                        },
                         "system_options": "Opcions de sistema",
                         "unnamed_entry": "Entrada sense nom"
                     },
@@ -2213,7 +2232,7 @@
                     "configure": "Configurar",
                     "configured": "Configurades",
                     "confirm_new": "Vols configurar {integration}?",
-                    "description": "Gestiona les integracions amb serveis, dispositius, ...",
+                    "description": "Gestiona les integracions amb serveis o dispositius",
                     "details": "Detalls de la integració",
                     "disable": {
                         "disabled_integrations": "{number} desactivada/es",
@@ -2252,17 +2271,19 @@
                 "logs": {
                     "caption": "Registres",
                     "clear": "Esborra",
+                    "custom_integration": "integració personalitzada",
                     "description": "Consulta els registres de Home Assistant",
                     "details": "Detalls del registre ({level})",
+                    "error_from_custom_integration": "Aquest error té origen en una integració personalitzada.",
                     "level": {
                         "critical": "CRÍTIC",
                         "debug": "DEPURACIÓ",
                         "error": "ERROR",
                         "info": "INFO",
-                        "warning": "ADVERTÈNCIA"
+                        "warning": "ALERTA"
                     },
                     "load_full_log": "Carrega el registre complet de Home Assistant",
-                    "loading_log": "Carregant el registre d'errors...",
+                    "loading_log": "Carregant registre d'errors...",
                     "multiple_messages": "missatge produit per primera vegada a les {time}, apareix {counter} vegades",
                     "no_errors": "No s'ha informat de cap error",
                     "no_issues": "No hi ha registres nous!",
@@ -2643,7 +2664,7 @@
                             "confirm_restart": "Segur que vols reiniciar Home Assistant?",
                             "confirm_stop": "Segur que vols aturar Home Assistant?",
                             "heading": "Gestió del servidor",
-                            "introduction": "Controla el servidor de Home Assistant... des de Home Assistant.",
+                            "introduction": "Controla el teu servidor de Home Assistant... des de Home Assistant.",
                             "restart": "Reinicia",
                             "stop": "Atura"
                         },
@@ -2770,6 +2791,15 @@
                         "manufacturer_code_override": "Substitució del codi de fabricant",
                         "value": "Valor"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Dreceres",
+                        "update_button": "Actualitza la configuració",
+                        "zha_options": {
+                            "default_light_transition": "Temps de transició predeterminat (segons)",
+                            "enable_identify_on_join": "Activa l'efecte d'identificació quan els dispositius s'uneixin a la xarxa",
+                            "title": "Opcions globals"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuració completada",
                         "CONFIGURED_status_text": "Inicialitzant",
@@ -2863,7 +2893,7 @@
                         "start_secure_inclusion": "Inicia la inclusió segura",
                         "title": "Afegeix un node Z-Wave",
                         "use_secure_inclusion": "Utilitza la inclusió segura",
-                        "view_device": "Veure el dispositiu"
+                        "view_device": "Mostra el dispositiu"
                     },
                     "button": "Configura",
                     "common": {
@@ -2909,6 +2939,9 @@
                         "header": "Configuració de dispositiu Z-Wave",
                         "introduction": "Gestiona i ajusta els paràmetres de configuració específics del dispositiu (node) seleccionat",
                         "parameter_is_read_only": "Aquest paràmetre de només lectura.",
+                        "set_param_accepted": "El paràmetre s'ha actualitzat.",
+                        "set_param_error": "S'ha produït un error.",
+                        "set_param_queued": "El canvi de paràmetre s'ha posat en espera i s'actualitzarà quan es desperti el dispositiu.",
                         "zwave_js_device_database": "Base de dades de dispositiu Z-Wave JS"
                     },
                     "node_status": {
@@ -3036,12 +3069,12 @@
                         "count_listeners": " ({count} oient/s)",
                         "data": "Dades de l'esdeveniment (en YAML, opcionals)",
                         "description": "Crida un esdeveniment al bus d'esdeveniments.",
-                        "documentation": "Documentació d'esdeveniments.",
+                        "documentation": "Documentació d'esdeveniments",
                         "event_fired": "Esdeveniment {name} cridat",
                         "fire_event": "Crida esdeveniment",
                         "listen_to_events": "Escolta esdeveniments",
                         "listening_to": "Escoltant a",
-                        "notification_event_fired": "L'esdeveniment {type} s'ha cridat correctament",
+                        "notification_event_fired": "Esdeveniment {type} disparat correctament!",
                         "start_listening": "Comença a escoltar",
                         "stop_listening": "Deixa d'escoltar",
                         "subscribe_to": "Esdeveniment al qual subscriure's",
@@ -3068,8 +3101,8 @@
                         "attributes": "Atributs",
                         "copy_id": "Copia l'identificador al porta-retalls",
                         "current_entities": "Entitats actuals",
-                        "description1": "Defineix la representació d'un dispositiu a Home Assistant.",
-                        "description2": "No hi haurà cap comunicació amb el dispositiu real.",
+                        "description1": "Defineix la visualització de l'estat actual d'una entitat a Home Assistant.",
+                        "description2": "Si l'entitat pertany a un dispositiu, no hi haurà cap comunicació amb el dispositiu.",
                         "entity": "Entitat",
                         "filter_attributes": "Filtra atributs",
                         "filter_entities": "Filtra entitats",
@@ -3874,7 +3907,7 @@
                 },
                 "number_format": {
                     "description": "Trieu el format dels números.",
-                    "dropdown_label": "Format de número",
+                    "dropdown_label": "Format dels números",
                     "formats": {
                         "comma_decimal": "1,234,567.89",
                         "decimal_comma": "1.234.567,89",
@@ -3883,7 +3916,7 @@
                         "space_comma": "1 234 567,89",
                         "system": "Utilitza la configuració regional del sistema"
                     },
-                    "header": "Format de número"
+                    "header": "Format dels números"
                 },
                 "push_notifications": {
                     "add_device_prompt": {
diff --git a/translations/frontend/cs.json b/translations/frontend/cs.json
index fe960aad20..99acb6c2e0 100644
--- a/translations/frontend/cs.json
+++ b/translations/frontend/cs.json
@@ -29,7 +29,7 @@
     "state_attributes": {
         "climate": {
             "fan_mode": {
-                "auto": "Automatika",
+                "auto": "Auto",
                 "off": "Neaktivní",
                 "on": "Aktivní"
             },
@@ -54,7 +54,7 @@
         },
         "humidifier": {
             "mode": {
-                "auto": "Automatika",
+                "auto": "Auto",
                 "away": "Pryč",
                 "baby": "Dítě",
                 "boost": "Boost",
@@ -307,7 +307,7 @@
             },
             "update": {
                 "text": "Opravdu chcete aktualizovat {name} na verzi {version}?",
-                "title": "Aktualizovat {název}"
+                "title": "Aktualizovat {name}"
             }
         },
         "dashboard": {
@@ -383,7 +383,7 @@
             "create": "Vytvořit",
             "create_blocked_not_running": "Vytvoření zálohy není momentálně možné, protože systém je ve \"{state}\".",
             "create_snapshot": "Vytvořit zálohu",
-            "description": "Snímky umožňují snadno zálohovat a obnovovat všechna data instance Home Assistant.",
+            "description": "Zálohy umožňují snadno zálohovat a obnovovat všechna data vaší instance Home Assistant.",
             "enter_password": "Prosím zadejte heslo.",
             "folder": {
                 "addons/local": "Místní doplňky",
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Instalace není v pořádku",
                 "unsupported_description": "Níže je uveden seznam problémů nalezených ve vaší instalaci. Kliknutím na odkazy se dozvíte, jak tyto problémy vyřešit.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor není na hostiteli povolen",
                     "container": "Kontejnery, o nichž je známo, že způsobují problémy",
                     "content-trust": "Ověřování důvěryhodnosti obsahu je zakázáno.",
                     "dbus": "DBUS",
@@ -791,7 +792,7 @@
                     "was_unplugged": "bylo odpojeno",
                     "was_unsafe": "bylo v nebezpečí"
                 },
-                "show_trace": "Zobrazit stopu"
+                "show_trace": "Zobrazit trasu"
             },
             "media-browser": {
                 "audio_not_supported": "Váš prohlížeč nepodporuje element \"audio\".",
@@ -1213,6 +1214,14 @@
                 "key_wrong_type": "Zadávanou hodnotu \"{key}\" nepodporuje vizuální editor. Podporuje ({type_correct}), ale obdržel ({type_wrong}).",
                 "no_template_editor_support": "Šablony nejsou podporovány v uživatelském rozhraní",
                 "no_type_provided": "Není k dispozici žádný typ."
+            },
+            "supervisor": {
+                "ask": "Požádat o pomoc",
+                "observer": "Zkontrolovat Observer",
+                "reboot": "Zkuste restartovat hostitele",
+                "system_health": "Kontrola stavu systému",
+                "title": "Nelze načíst panel Supervisora!",
+                "wait": "Pokud jste právě začali, ujistěte se, že jste poskytli dostatek času na start Supervisora."
             }
         },
         "login-form": {
@@ -1230,10 +1239,12 @@
         "notification_toast": {
             "connection_lost": "Připojení bylo ztraceno. Připojuji se znovu...",
             "dismiss": "Zavřít",
+            "intergration_starting": "Integrace {integration} se spouští - dokud nebude spuštění dokončeno, nemusí být vše k dispozici.",
             "service_call_failed": "Službu {service} se nepodařilo zavolat.",
             "started": "Home Assistant je spuštěn!",
             "starting": "Home Assistant se spouští, ne všechno bude k dispozici, dokud nebude spuštění dokončeno.",
-            "triggered": "Spuštěno {name}"
+            "triggered": "Spuštěno {name}",
+            "wrapping_up_startup": "Home Assistant se spouští, vše ještě nemusí být dostupné"
         },
         "panel": {
             "config": {
@@ -1487,7 +1498,7 @@
                         "move_down": "Posunout dolů",
                         "move_up": "Posunout nahoru",
                         "save": "Uložit",
-                        "show_trace": "Zobrazit trasování",
+                        "show_trace": "Zobrazit trasu",
                         "triggers": {
                             "add": "Přidat spouštěč",
                             "delete": "Smazat",
@@ -1597,7 +1608,7 @@
                         "delete_automation": "Odstranit automatizaci",
                         "delete_confirm": "Opravdu chcete odstranit tuto automatizaci?",
                         "dev_automation": "Debugování automatizace",
-                        "dev_only_editable": "Pouze automatizace definované v automations.yaml jsou debugovatelné",
+                        "dev_only_editable": "Pouze automatizace s unikátní ID jsou debugovatelné.",
                         "duplicate": "Duplikát",
                         "duplicate_automation": "Duplikovat automatizaci",
                         "edit_automation": "Upravit automatizaci",
@@ -1864,28 +1875,28 @@
                                 "documentation": "Před povolením této možnosti se ujistěte, že jste navštívili stránku dokumentace analytiky {link}, abyste pochopili, co odesíláte za data a jak budou uložena.",
                                 "header": "Analytika",
                                 "instance_id": "ID instance: {huuid}",
-                                "introduction": "Sdílejte analytiku ze své instance. Tato data budou veřejně dostupná na {link}",
-                                "learn_more": "Zjistěte více, jak budou vaše údaje zpracovány.",
+                                "introduction": "Sdílejte informace o instalaci, abyste pomohli vylepšit Home Assistant a pomohli nám přesvědčit výrobce, aby přidali funkce místního ovládání a ochrany soukromí.",
+                                "learn_more": "Jak budou vaše údaje zpracovány",
                                 "needs_base": "Aby byla tato možnost k dispozici, musíte povolit základní analytiku",
                                 "preference": {
                                     "base": {
-                                        "description": "To zahrnuje ID instance, verzi a typ instalace",
+                                        "description": "ID instance, verze a typ instalace.",
                                         "title": "Základní analytika"
                                     },
                                     "diagnostics": {
-                                        "description": "Sdílet zprávy o selhání a diagnostické informace",
+                                        "description": "Sdílejte zprávy o selhání, když dojde k neočekávané chybě.",
                                         "title": "Diagnostika"
                                     },
                                     "statistics": {
-                                        "description": "To zahrnuje počet prvků v instalaci, úplný seznam najdete v dokumentaci",
+                                        "description": "Celkový počet entit, uživatelů a dalších prvků.",
                                         "title": "Statistiky používání"
                                     },
                                     "usage_supervisor": {
-                                        "description": "To zahrnuje názvy a možnosti vašich integrací a doplňků",
+                                        "description": "Názvy, verze a funkce.",
                                         "title": "Použité integrace a doplňky"
                                     },
                                     "usage": {
-                                        "description": "To zahrnuje názvy vašich integrací",
+                                        "description": "Informace o názvech a verzích.",
                                         "title": "Použité integrace"
                                     }
                                 }
@@ -2033,7 +2044,7 @@
                         },
                         "enable_selected": {
                             "button": "Povolit vybrané",
-                            "confirm_text": "Pokud budou nyní deaktivovány, budou opět k dispozici v Home Assistant.",
+                            "confirm_text": "Tím se znovu zpřístupní v Home Assistant, pokud jsou nyní deaktivované.",
                             "confirm_title": "Chcete povolit {number} {number, plural,\n  one {entitu}\n  few {entity}\n  other {entit}\n}?"
                         },
                         "filter": {
@@ -2145,8 +2156,11 @@
                     "caption": "Integrace",
                     "config_entry": {
                         "area": "V {area}",
+                        "check_the_logs": "Zkontrolujte logy",
+                        "configure": "Nastavit",
                         "delete": "Smazat",
                         "delete_confirm": "Opravdu chcete odstranit tuto integraci?",
+                        "depends_on_cloud": "Závisí na cloudu",
                         "device_unavailable": "Zařízení není dostupné",
                         "devices": "{count} {count, plural,\n  one {zařízení}\n  other {zařízení}\n}",
                         "disable_restart_confirm": "Restartujte Home Assistant pro dokončení odstranění této integrace",
@@ -2169,14 +2183,23 @@
                         "logs": "logy",
                         "manuf": "od {manufacturer}",
                         "no_area": "Žádná oblast",
-                        "not_loaded": "Není načtena, zkontrolujte {logs_link}",
+                        "not_loaded": "Nenačteno",
                         "options": "Možnosti",
+                        "provided_by_custom_integration": "Poskytováno vlastní integrací",
                         "reload": "Nově načíst",
                         "reload_confirm": "Integrace byla nově načtena",
                         "reload_restart_confirm": "Restartujte Home Assistant pro nové načtení této integrace",
                         "rename": "Přejmenovat",
                         "restart_confirm": "Restartujte Home Assistant pro odstranění této integrace",
                         "services": "{count} {count, plural,\n  one {služba}\n  few {služby}\n  other {služeb}\n}",
+                        "state": {
+                            "failed_unload": "Zrušení načtení se nezdařilo",
+                            "loaded": "Načteno",
+                            "migration_error": "Chyba migrace",
+                            "not_loaded": "Nenačteno",
+                            "setup_error": "Nastavení se nezdařilo",
+                            "setup_retry": "Opakovaný pokus o nastavení"
+                        },
                         "system_options": "Více možností",
                         "unnamed_entry": "Nepojmenovaný záznam"
                     },
@@ -2205,7 +2228,7 @@
                     "configure": "Nastavit",
                     "configured": "Nastaveno",
                     "confirm_new": "Chcete nastavit {integration}?",
-                    "description": "Správa integrací a jejich služeb, zařízení, ...",
+                    "description": "Správa integrací a jejich služeb či zařízení",
                     "details": "Podrobnosti o integraci",
                     "disable": {
                         "disabled_integrations": "{number} zakázáno",
@@ -2244,8 +2267,10 @@
                 "logs": {
                     "caption": "Logy",
                     "clear": "Zrušit",
+                    "custom_integration": "vlastní integrace",
                     "description": "Zobrazení logů Home Assistant",
                     "details": "Detaily protokolu ({level})",
+                    "error_from_custom_integration": "Tato chyba pochází z vlastní integrace.",
                     "level": {
                         "critical": "KRITICKÉ",
                         "debug": "LADĚNÍ",
diff --git a/translations/frontend/da.json b/translations/frontend/da.json
index c1b82a7061..2237a6af24 100644
--- a/translations/frontend/da.json
+++ b/translations/frontend/da.json
@@ -3461,7 +3461,7 @@
                         "unsaved_changes": "Ikke-gemte ændringer"
                     },
                     "save_config": {
-                        "cancel": "Glem det",
+                        "cancel": "Fortryd",
                         "close": "Luk",
                         "empty_config": "Start med et tomt betjeningspanel",
                         "header": "Tag kontrol over din 'Lovelace'-brugerflade",
diff --git a/translations/frontend/de.json b/translations/frontend/de.json
index 15e999f66d..a36dc90fed 100644
--- a/translations/frontend/de.json
+++ b/translations/frontend/de.json
@@ -144,7 +144,7 @@
                         "title": "AppArmor"
                     },
                     "auth_api": {
-                        "description": "Ein Add-on kann Benutzer gegen Home Assistant authentifizieren, sodass Add-ons Benutzern die Möglichkeit bieten, sich mit ihrem Home Assistant-Benutzernamen/-Kennwort bei Anwendungen anzumelden, die in Add-ons ausgeführt werden. Dieses Abzeichen zeigt an, ob der Add-on-Autor diese Berechtigung anfordert.",
+                        "description": "Ein Add-on kann Benutzer gegen Home Assistant authentifizieren, so dass Add-ons Benutzern die Möglichkeit bieten, sich mit ihrem Home Assistant-Benutzernamen/-Kennwort bei Anwendungen anzumelden, die in Add-ons ausgeführt werden. Dieses Abzeichen zeigt an, ob der Add-on-Autor diese Berechtigung anfordert.",
                         "title": "Home Assistant-Authentifizierung"
                     },
                     "docker_api": {
@@ -156,7 +156,7 @@
                         "title": "Voller Hardware-Zugriff"
                     },
                     "hassio_api": {
-                        "description": "Dem Add-on wurde Zugriff auf die Supervisor-API gewährt, wie es der Add-on-Autors angefordert hat. Standardmäßig kann das Add-on auf allgemeine Versionsinformationen von deinem System zugreifen. Wenn das Add-on Zugriff auf die API mit \"Manager\"- oder \"Admin\"-Rechten anfordert, erhält es Zugriff auf mehrere Teile deines Home Assistant-Systems. Diese Berechtigung wird durch dieses Badge angezeigt und wirkt sich negativ auf die Sicherheitsbewertung des Add-ons aus.",
+                        "description": "Dem Add-on wurde Zugriff auf die Supervisor-API gewährt, wie es der Add-on-Autors angefordert hat. Standardmäßig kann das Add-on auf allgemeine Versionsinformationen von deinem System zugreifen. Wenn das Add-on Zugriff auf die API mit \"Manager\"- oder \"Admin\"-Rechten anfordert, erhält es Zugriff auf mehrere Teile deines Home Assistant-Systems. Diese Berechtigung wird durch dieses Abzeichen angezeigt und wirkt sich negativ auf die Sicherheitsbewertung des Add-ons aus.",
                         "title": "Supervisor-API-Zugriff"
                     },
                     "homeassistant_api": {
@@ -200,7 +200,7 @@
                         "manager": "Manager"
                     },
                     "stage": {
-                        "description": "Add-ons können sich in einer von drei Phasen befinden:\n\n{icon_stable} **Stable**: Dies sind Add-ons, die bereits vollstandig sind und Updates erhalten.\n\n{icon_experimental} **Experimentell**: Diese können Fehler enthalten und unvollendet sein.\n\n{icon_deprecated} **Veraltet**: Diese Add-ons erhalten keine Updates mehr.",
+                        "description": "Add-ons können sich in einer von drei Phasen befinden:\n\n{icon_stable} **Stable**: Dies sind Add-ons, die bereits vollständig sind und Updates erhalten.\n\n{icon_experimental} **Experimentell**: Diese können Fehler enthalten und unvollendet sein.\n\n{icon_deprecated} **Veraltet**: Diese Add-ons erhalten keine Updates mehr.",
                         "title": "Add-on Phase"
                     }
                 },
@@ -412,7 +412,7 @@
         },
         "system": {
             "core": {
-                "cpu_usage": "Core-CPU Auslastung",
+                "cpu_usage": "Core CPU Nutzung",
                 "ram_usage": "Core Arbeitsspeicherbedarf"
             },
             "host": {
@@ -467,12 +467,15 @@
                     "docker": "Die Docker Umgebung arbeitet nicht fehlerfrei",
                     "privileged": "Der Supervisor ist nicht berechtigt",
                     "setup": "Die Einrichtung des Supervisors ist fehlgeschlagen",
-                    "supervisor": "Supervisor konnte nicht aktualisiert werden"
+                    "supervisor": "Supervisor konnte nicht aktualisiert werden",
+                    "untrusted": "Nicht vertrauenswürdiger Inhalt erkannt"
                 },
                 "unhealthy_title": "Deine Installation ist fehlerhaft",
                 "unsupported_description": "Unten ist eine Liste der Probleme, die bei deiner Installation aufgetreten sind. Klicke auf die Links, um zu erfahren, wie du die Probleme beheben kannst.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor ist auf dem Host nicht aktiviert",
                     "container": "Container, von denen bekannt ist, dass sie Probleme verursachen",
+                    "content-trust": "Content-Trust-Validierung ist deaktiviert",
                     "dbus": "DBUS",
                     "docker_configuration": "Docker Konfiguration",
                     "docker_version": "Docker Version",
@@ -721,7 +724,7 @@
                 "today": "Heute"
             },
             "data-table": {
-                "clear": "Leeren",
+                "clear": "Löschen",
                 "filtering_by": "Filtern nach",
                 "hidden": "{number} ausgeblendet",
                 "no-data": "Keine Daten",
@@ -1215,10 +1218,10 @@
             "supervisor": {
                 "ask": "Um Hilfe bitten",
                 "observer": "Überprüfe den Observer",
-                "reboot": "Versuche den Host neuzustarten",
+                "reboot": "Versuche den Host neu zu starten",
                 "system_health": "Überprüfe Systemzustand",
                 "title": "Supervisor-Bedienfeld konnte nicht geladen werden!",
-                "wait": "Wenn du gerade erst hochgefahren hast, dann stelle sicher dass du den Supervisor genug Zeit zum Starten gegeben hast."
+                "wait": "Wenn du gerade erst hochgefahren hast, dann stelle sicher dass du dem Supervisor genug Zeit zum Starten gegeben hast."
             }
         },
         "login-form": {
@@ -1236,10 +1239,12 @@
         "notification_toast": {
             "connection_lost": "Verbindung getrennt. Verbinde erneut...",
             "dismiss": "Ausblenden",
+            "intergration_starting": "Starte {integration}. Währenddessen ist noch nicht alles verfügbar.",
             "service_call_failed": "Fehler beim Aufrufen des Diensts {service}.",
             "started": "Home Assistant wurde vollständig gestartet!",
-            "starting": "Home Assistant startet. Währenddessen kann es sein, dass nicht alles verfügbar ist.",
-            "triggered": "{name} ausgelöst"
+            "starting": "Home Assistant startet. Währenddessen ist noch nicht alles verfügbar.",
+            "triggered": "{name} ausgelöst",
+            "wrapping_up_startup": "Startvorgang fast fertig. Währenddessen ist noch nicht alles verfügbar."
         },
         "panel": {
             "config": {
@@ -1594,7 +1599,7 @@
                                     "zone": "Zone"
                                 }
                             },
-                            "unsupported_platform": "Nicht unterstützte Plattform: {platform}"
+                            "unsupported_platform": "Visueller Editor nicht unterstützt für Plattform: {platform}"
                         },
                         "unsaved_confirm": "Sie haben ungespeicherte Änderungen. Sind Sie sicher, dass Sie den Editor verlassen möchten?"
                     },
@@ -1603,7 +1608,7 @@
                         "delete_automation": "Automatisierung löschen",
                         "delete_confirm": "Bist du sicher, dass du diese Automatisierung löschen möchtest?",
                         "dev_automation": "Automatisierung debuggen",
-                        "dev_only_editable": "Nur Automatisierungen in automations.yaml können debuggt werden.",
+                        "dev_only_editable": "Nur Automatisierungen, die eine eindeutige ID haben, können debuggt werden.",
                         "duplicate": "Duplizieren",
                         "duplicate_automation": "Automatisierung duplizieren",
                         "edit_automation": "Automatisierung bearbeiten",
@@ -1613,7 +1618,7 @@
                         },
                         "introduction": "Mit dem Automations-Editor können Automatisierungen erstellt und bearbeitet werden. Bitte folgen Sie dem nachfolgenden Link, um die Anleitung zu lesen und um sicherzustellen, dass Sie Home Assistant richtig konfiguriert haben.",
                         "learn_more": "Erfahre mehr über Automatisierungen",
-                        "no_automations": "Wir konnten keine editierbaren Automatisierungen finden",
+                        "no_automations": "Wir konnten keine Automatisierungen finden",
                         "only_editable": "Nur Automatisierungen in automations.yaml sind editierbar.",
                         "pick_automation": "Wähle eine Automatisierung zum Bearbeiten",
                         "show_info_automation": "Informationen über die Automatisierung anzeigen"
@@ -1867,31 +1872,31 @@
                     "section": {
                         "core": {
                             "analytics": {
-                                "documentation": "Bevor du dies aktivierst, stelle sicher, dass du die Statistikdokumentationsseite {link} besuchst, um zu verstehen, was gesendet und gespeichert wird.",
+                                "documentation": "Bevor du dies aktivierst, stelle sicher, dass du die Statistik Dokumentationsseite {link} besuchst, um zu verstehen, was gesendet und gespeichert wird.",
                                 "header": "Statistiken",
                                 "instance_id": "Instanz-ID: {huuid}",
-                                "introduction": "Teile Statistiken aus deiner Instanz. Diese Daten werden öffentlich verfügbar sein unter {link}",
-                                "learn_more": "Erfahre mehr darüber, wie deine Daten verarbeitet werden.",
+                                "introduction": "Teile deine Installationsinformationen, um Home Assistant zu verbessern und Hersteller davon zu überzeugen, lokale Steuerungs- und Datenschutzfunktionen hinzuzufügen.",
+                                "learn_more": "Wie werden deine Daten verarbeitet",
                                 "needs_base": "Du musst die Basisstatistiken aktivieren, damit diese Option verfügbar ist",
                                 "preference": {
                                     "base": {
-                                        "description": "Dies umfasst die Instanz-ID, die Version und den Installationstyp",
+                                        "description": "Instanz-ID, Version und Installationstyp.",
                                         "title": "Grundlegende Statistiken"
                                     },
                                     "diagnostics": {
-                                        "description": "Teile Absturzberichte und Diagnoseinformationen",
+                                        "description": "Teile Absturzberichte, wenn unerwartete Fehler auftreten.",
                                         "title": "Diagnoseinformationen"
                                     },
                                     "statistics": {
-                                        "description": "Dies umfasst die Anzahl von Elementen in deiner Installation. Eine vollständige Liste findest du in der Dokumentation",
+                                        "description": "Anzahl verwendeter Entitäten, Benutzer und anderer Elemente.",
                                         "title": "Nutzungsstatistiken"
                                     },
                                     "usage_supervisor": {
-                                        "description": "Dies umfasst die Namen und Funktionen deiner Integrationen und Add-ons",
+                                        "description": "Namen, Versionen und Funktionen.",
                                         "title": "Verwendete Integrationen und Add-ons"
                                     },
                                     "usage": {
-                                        "description": "Dies umfasst die Namen deiner Integrationen",
+                                        "description": "Namen und Versionsinformationen.",
                                         "title": "Verwendete Integrationen"
                                     }
                                 }
@@ -1940,7 +1945,7 @@
                     }
                 },
                 "devices": {
-                    "add_prompt": "Mit diesem Gerät wurden noch keine {name} hinzugefügt. Du kannst eins hinzufügen, indem du auf den + Knopf drückst.",
+                    "add_prompt": "Es existiert noch kein(e) {name} mit diesem Gerät. Füge ein(e) hinzu, indem du auf den + Knopf drückst.",
                     "automation": {
                         "actions": {
                             "caption": "Wenn etwas ausgelöst wird ...",
@@ -2079,7 +2084,7 @@
                     }
                 },
                 "filtering": {
-                    "clear": "Leeren",
+                    "clear": "Löschen",
                     "filtering_by": "Filtern nach",
                     "show": "Anzeigen"
                 },
@@ -2175,7 +2180,7 @@
                         "logs": "Logs",
                         "manuf": "von {manufacturer}",
                         "no_area": "Kein Bereich",
-                        "not_loaded": "Nicht geladen, prüfe den {logs_link}",
+                        "not_loaded": "Nicht geladen, prüfe die {logs_link}",
                         "options": "Optionen",
                         "reload": "Neu laden",
                         "reload_confirm": "Die Integration wurde neu geladen",
@@ -2211,7 +2216,7 @@
                     "configure": "Konfigurieren",
                     "configured": "Konfiguriert",
                     "confirm_new": "Möchtest du {integration} einrichten?",
-                    "description": "Integrationen zu Diensten, Geräten, usw. verwalten",
+                    "description": "Verwalte verbundene Geräte und Dienste",
                     "details": "Details zur Integration",
                     "disable": {
                         "disabled_integrations": "{number} deaktiviert",
@@ -2244,14 +2249,16 @@
                     "reconfigure": "Neu konfigurieren",
                     "rename_dialog": "Bearbeite den Namen dieses Konfigurationseintrags",
                     "rename_input_label": "Eintragsname",
-                    "search": "Such-Integrationen"
+                    "search": "Integrationen suchen"
                 },
                 "introduction": "Hier ist es möglich, deine Komponenten und Home Assistant zu konfigurieren. Noch ist nicht alles über die GUI einstellbar, aber wir arbeiten daran.",
                 "logs": {
                     "caption": "Logs",
-                    "clear": "Leeren",
+                    "clear": "Löschen",
+                    "custom_integration": "benutzerdefiniert integration",
                     "description": "Home Assistant Logs einsehen",
                     "details": "Protokolldetails ({level})",
+                    "error_from_custom_integration": "benutzerdefinierte",
                     "level": {
                         "critical": "KRITISCH",
                         "debug": "DEBUG",
@@ -2262,7 +2269,7 @@
                     "load_full_log": "Vollständiges Home Assistant-Protokoll laden",
                     "loading_log": "Fehlerprotokoll wird geladen...",
                     "multiple_messages": "Die Nachricht ist zum ersten Mal um {time} aufgetreten und erscheint {counter} mal",
-                    "no_errors": "Es wurden keine Fehler gemeldet.",
+                    "no_errors": "Es wurden keine Fehler gemeldet",
                     "no_issues": "Es gibt keine neuen Probleme!",
                     "refresh": "Aktualisieren"
                 },
@@ -2543,7 +2550,7 @@
                         },
                         "introduction": "Mit dem Szeneneditor können Szenen erstellt und bearbeitet werden. Bitte folge dem untenstehenden Link, um die Anleitung zu finden. Dies stellt sicher, dass Home Assistant korrekt konfiguriert ist.",
                         "learn_more": "Erfahre mehr über Szenen.",
-                        "no_scenes": "Wir konnten keine editierbaren Szenen finden",
+                        "no_scenes": "Wir konnten keine Szenen finden",
                         "only_editable": "Nur Szenen in der scenes.yaml sind editierbar.",
                         "pick_scene": "Wähle eine Szene zum Bearbeiten aus.",
                         "show_info_scene": "Informationen über die Szene anzeigen"
@@ -2593,7 +2600,7 @@
                         },
                         "introduction": "Mit dem Skript-Editor können Skripte erstellt und bearbeitet werden. Bitte folge dem untenstehenden Link, um die Anleitung zu finden. Das stellt sicher, dass Home Assistant richtig konfiguriert ist.",
                         "learn_more": "Weitere Informationen zu Skripten",
-                        "no_scripts": "Wir konnten keine bearbeitbaren Skripte finden",
+                        "no_scripts": "Wir konnten keine Skripte finden",
                         "run_script": "Skript ausführen",
                         "show_info": "Informationen zum Skript anzeigen"
                     }
@@ -2870,7 +2877,7 @@
                         "home_id": "Heim-ID",
                         "network": "Netzwerk",
                         "node_id": "Knoten-ID",
-                        "remove_node": "Node entfernen"
+                        "remove_node": "Knoten entfernen"
                     },
                     "dashboard": {
                         "driver_version": "Treiberversion",
@@ -3104,7 +3111,7 @@
                 "supervisor": {
                     "ask": "Um Hilfe bitten",
                     "observer": "Überprüfe den Observer",
-                    "reboot": "Versuche den Host neuzustarten",
+                    "reboot": "Versuche den Host neu zu starten",
                     "system_health": "Überprüfe Systemzustand",
                     "title": "Supervisor-Bedienfeld konnte nicht geladen werden!",
                     "wait": "Wenn du gerade erst hochgefahren hast, dann stelle sicher dass du den Supervisor genug Zeit zum Starten gegeben hast."
@@ -3429,7 +3436,7 @@
                         "none": "Keine"
                     },
                     "edit_badges": {
-                        "panel_mode": "Diese Badges werden nicht angezeigt, da sich diese Ansicht im \"Panel-Modus\" befindet."
+                        "panel_mode": "Diese Abzeichen werden nicht angezeigt, da sich diese Ansicht im \"Panel-Modus\" befindet."
                     },
                     "edit_card": {
                         "add": "Karte hinzufügen",
@@ -3757,7 +3764,7 @@
             "page-onboarding": {
                 "analytics": {
                     "finish": "Weiter",
-                    "intro": "Teile Statistiken aus deiner Instanz. Diese Daten werden unter {link}"
+                    "intro": "Teile Statistiken aus deiner Instanz. Diese Daten werden unter {link} verfügbar sein."
                 },
                 "core-config": {
                     "button_detect": "Erkennen",
@@ -3874,8 +3881,12 @@
                     "description": "Wähle aus, wie Zahlen formatiert werden sollen.",
                     "dropdown_label": "Zahlenformat",
                     "formats": {
+                        "comma_decimal": "1,234,567.89",
+                        "decimal_comma": "1.234.567,89",
                         "language": "Auto (Spracheinstellung verwenden)",
-                        "none": "Keine"
+                        "none": "Keine",
+                        "space_comma": "1 234 567,89",
+                        "system": "Systemeinstellungen verwenden"
                     },
                     "header": "Zahlenformat"
                 },
diff --git a/translations/frontend/el.json b/translations/frontend/el.json
index 98824653d7..615f0b8308 100644
--- a/translations/frontend/el.json
+++ b/translations/frontend/el.json
@@ -1199,6 +1199,10 @@
                 "key_wrong_type": "Η παρεχόμενη τιμή για το \"{key}\" δεν υποστηρίζεται από το οπτικό πρόγραμμα επεξεργασίας. Υποστηρίζουμε ({type_correct}) αλλά λάβαμε ({type_wrong}).",
                 "no_template_editor_support": "Τα πρότυπα δεν υποστηρίζονται στο οπτικό πρόγραμμα επεξεργασίας",
                 "no_type_provided": "Δεν παρέχεται τύπος."
+            },
+            "supervisor": {
+                "reboot": "Δοκιμάστε μια επανεκκίνηση του διακομιστή",
+                "title": "Δεν ήταν δυνατή η φόρτωση του πίνακα Supervisor!"
             }
         },
         "login-form": {
@@ -1219,7 +1223,8 @@
             "service_call_failed": "Απέτυχε η κλήση στην υπηρεσία {service}.",
             "started": "Το Home Assistant έχει ξεκινήσει!",
             "starting": "Το Home Assistant ξεκινά, ενδέχεται να μην είναι ακόμη διαθέσιμα όλα.",
-            "triggered": "Ενεργοποιήθηκε το {name}"
+            "triggered": "Ενεργοποιήθηκε το {name}",
+            "wrapping_up_startup": "Ολοκληρώνοντας την εκκίνηση, δεν θα είναι όλα διαθέσιμα μέχρι να ολοκληρωθεί."
         },
         "panel": {
             "config": {
diff --git a/translations/frontend/en.json b/translations/frontend/en.json
index 0ef42cb95c..ea48a46930 100644
--- a/translations/frontend/en.json
+++ b/translations/frontend/en.json
@@ -561,9 +561,12 @@
             },
             "light": {
                 "brightness": "Brightness",
+                "cold_white_value": "Cold white brightness",
+                "color_brightness": "Color brightness",
                 "color_temperature": "Color temperature",
                 "effect": "Effect",
-                "white_value": "White value"
+                "warm_white_value": "Warm white brightness",
+                "white_value": "White brightness"
             },
             "lock": {
                 "code": "Code",
@@ -707,7 +710,7 @@
                     "text": "Enter the name of the new area.",
                     "title": "Add new area"
                 },
-                "add_new": "Add new area…",
+                "add_new": "Add new area...",
                 "area": "Area",
                 "clear": "Clear",
                 "no_areas": "You don't have any areas",
@@ -886,6 +889,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Integration documentation",
                 "required": "This field is required",
                 "service_data": "Service data",
                 "target": "Targets",
@@ -1237,12 +1241,14 @@
             "title": "Notifications"
         },
         "notification_toast": {
-            "connection_lost": "Connection lost. Reconnecting…",
+            "connection_lost": "Connection lost. Reconnecting...",
             "dismiss": "Dismiss",
+            "intergration_starting": "Starting {integration}, not everything will be available until it is finished.",
             "service_call_failed": "Failed to call service {service}.",
             "started": "Home Assistant has started!",
             "starting": "Home Assistant is starting, not everything will be available until it is finished.",
-            "triggered": "Triggered {name}"
+            "triggered": "Triggered {name}",
+            "wrapping_up_startup": "Wrapping up startup, not everything will be available until it is finished."
         },
         "panel": {
             "config": {
@@ -1606,7 +1612,7 @@
                         "delete_automation": "Delete automation",
                         "delete_confirm": "Are you sure you want to delete this automation?",
                         "dev_automation": "Debug automation",
-                        "dev_only_editable": "Only automations defined in automations.yaml are debuggable.",
+                        "dev_only_editable": "Only automations that have a unique ID assigned are debuggable.",
                         "duplicate": "Duplicate",
                         "duplicate_automation": "Duplicate automation",
                         "edit_automation": "Edit automation",
@@ -1693,7 +1699,7 @@
                         },
                         "connected": "Connected",
                         "connection_status": "Cloud connection status",
-                        "fetching_subscription": "Fetching subscription…",
+                        "fetching_subscription": "Fetching subscription...",
                         "google": {
                             "config_documentation": "Configuration documentation",
                             "devices_pin": "Security Devices PIN",
@@ -1749,7 +1755,7 @@
                             "disable_hook_error_msg": "Failed to disable webhook:",
                             "info": "Anything that is configured to be triggered by a webhook can be given a publicly accessible URL to allow you to send data back to Home Assistant from anywhere, without exposing your instance to the internet.",
                             "link_learn_more": "Learn more about creating webhook-powered automations.",
-                            "loading": "Loading ...",
+                            "loading": "Loading...",
                             "manage": "Manage",
                             "no_hooks_yet": "Looks like you have no webhooks yet. Get started by configuring a ",
                             "no_hooks_yet_link_automation": "webhook automation",
@@ -1873,29 +1879,29 @@
                                 "documentation": "Before you enable this make sure you visit the analytics documentation page {link} to understand what you are sending and how it's stored.",
                                 "header": "Analytics",
                                 "instance_id": "Instance ID: {huuid}",
-                                "introduction": "Share analytics from your instance. This data will be publicly available at {link}",
-                                "learn_more": "Learn more about how your data will be processed.",
+                                "introduction": "Share your installation information to help make Home Assistant better and help us convince manufacturers to add local control and privacy-focused features.",
+                                "learn_more": "How we process your data",
                                 "needs_base": "You need to enable base analytics for this option to be available",
                                 "preference": {
                                     "base": {
-                                        "description": "This includes the instance ID, the version and the installation type",
+                                        "description": "Instance ID, version and installation type.",
                                         "title": "Basic analytics"
                                     },
                                     "diagnostics": {
-                                        "description": "Share crash reports and diagnostic information",
+                                        "description": "Share crash reports when unexpected errors occur.",
                                         "title": "Diagnostics"
                                     },
                                     "statistics": {
-                                        "description": "This includes a count of elements in your installation, for a full list look at the documentation",
+                                        "description": "Total used entities, users and other elements.",
                                         "title": "Usage statistics"
                                     },
                                     "usage_supervisor": {
-                                        "description": "This includes the names and capabilities of your integrations and add-ons",
+                                        "description": "Names, versions and capabilities.",
                                         "title": "Used integrations and add-ons"
                                     },
                                     "usage": {
-                                        "description": "This includes the names of your integrations",
-                                        "title": "Used integrations"
+                                        "description": "Names and version information.",
+                                        "title": "Used Integrations"
                                     }
                                 }
                             },
@@ -2154,8 +2160,11 @@
                     "caption": "Integrations",
                     "config_entry": {
                         "area": "In {area}",
+                        "check_the_logs": "Check the logs",
+                        "configure": "Configure",
                         "delete": "Delete",
                         "delete_confirm": "Are you sure you want to delete this integration?",
+                        "depends_on_cloud": "Depends on the cloud",
                         "device_unavailable": "Device unavailable",
                         "devices": "{count} {count, plural,\n  one {device}\n  other {devices}\n}",
                         "disable_restart_confirm": "Restart Home Assistant to finish disabling this integration",
@@ -2178,14 +2187,23 @@
                         "logs": "logs",
                         "manuf": "by {manufacturer}",
                         "no_area": "No Area",
-                        "not_loaded": "Not loaded, check the {logs_link}",
+                        "not_loaded": "Not loaded",
                         "options": "Options",
+                        "provided_by_custom_integration": "Provided by a custom integration",
                         "reload": "Reload",
                         "reload_confirm": "The integration was reloaded",
                         "reload_restart_confirm": "Restart Home Assistant to finish reloading this integration",
                         "rename": "Rename",
                         "restart_confirm": "Restart Home Assistant to finish removing this integration",
                         "services": "{count} {count, plural,\n  one {service}\n  other {services}\n}",
+                        "state": {
+                            "failed_unload": "Failed to unload",
+                            "loaded": "Loaded",
+                            "migration_error": "Migration error",
+                            "not_loaded": "Not loaded",
+                            "setup_error": "Failed to set up",
+                            "setup_retry": "Retrying setup"
+                        },
                         "system_options": "System options",
                         "unnamed_entry": "Unnamed entry"
                     },
@@ -2214,7 +2232,7 @@
                     "configure": "Configure",
                     "configured": "Configured",
                     "confirm_new": "Do you want to set up {integration}?",
-                    "description": "Manage integrations with services, devices, ...",
+                    "description": "Manage integrations with services or devices",
                     "details": "Integration details",
                     "disable": {
                         "disabled_integrations": "{number} disabled",
@@ -2253,8 +2271,10 @@
                 "logs": {
                     "caption": "Logs",
                     "clear": "Clear",
+                    "custom_integration": "custom integration",
                     "description": "View the Home Assistant logs",
                     "details": "Log Details ({level})",
+                    "error_from_custom_integration": "This error originated from a custom integration.",
                     "level": {
                         "critical": "CRITICAL",
                         "debug": "DEBUG",
@@ -2263,7 +2283,7 @@
                         "warning": "WARNING"
                     },
                     "load_full_log": "Load Full Home Assistant Log",
-                    "loading_log": "Loading error log…",
+                    "loading_log": "Loading error log...",
                     "multiple_messages": "message first occurred at {time} and shows up {counter} times",
                     "no_errors": "No errors have been reported",
                     "no_issues": "There are no new issues!",
@@ -2644,7 +2664,7 @@
                             "confirm_restart": "Are you sure you want to restart Home Assistant?",
                             "confirm_stop": "Are you sure you want to stop Home Assistant?",
                             "heading": "Server management",
-                            "introduction": "Control your Home Assistant server… from Home Assistant.",
+                            "introduction": "Control your Home Assistant server... from Home Assistant.",
                             "restart": "Restart",
                             "stop": "Stop"
                         },
@@ -2771,6 +2791,15 @@
                         "manufacturer_code_override": "Manufacturer Code Override",
                         "value": "Value"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Shortcuts",
+                        "update_button": "Update Configuration",
+                        "zha_options": {
+                            "default_light_transition": "Default light transition time (seconds)",
+                            "enable_identify_on_join": "Enable identify effect when devices join the network",
+                            "title": "Global Options"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuration Complete",
                         "CONFIGURED_status_text": "Initializing",
@@ -2910,6 +2939,9 @@
                         "header": "Z-Wave Device Configuration",
                         "introduction": "Manage and adjust device (node) specific configuration parameters for the selected device",
                         "parameter_is_read_only": "This parameter is read-only.",
+                        "set_param_accepted": "The parameter has been updated.",
+                        "set_param_error": "An error occurred.",
+                        "set_param_queued": "The parameter change has been queued, and will be updated when the device wakes up.",
                         "zwave_js_device_database": "Z-Wave JS Device Database"
                     },
                     "node_status": {
@@ -2919,6 +2951,16 @@
                         "dead": "Dead",
                         "unknown": "Unknown"
                     },
+                    "reinterview_node": {
+                        "battery_device_warning": "You will need to wake battery powered devices before starting the re-interview. Refer to your device's manual for instructions on how to wake the device.",
+                        "in_progress": "The device is being interviewed. This may take some time.",
+                        "interview_complete": "Device interview complete.",
+                        "interview_failed": "The device interview failed. Additional information may be available in the logs.",
+                        "introduction": "Re-interview a device on your Z-Wave network. Use this feature if your device has missing or incorrect functionality.",
+                        "run_in_background": "You can close this dialog and the interview will continue in the background.",
+                        "start_reinterview": "Start Re-interview",
+                        "title": "Re-interview a Z-Wave Device"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "Cancel Exclusion",
                         "controller_in_exclusion_mode": "Your Z-Wave controller is now in exclusion mode.",
@@ -3037,12 +3079,12 @@
                         "count_listeners": " ({count}  listeners)",
                         "data": "Event Data (YAML, optional)",
                         "description": "Fire an event on the event bus.",
-                        "documentation": "Events Documentation.",
+                        "documentation": "Events documentation",
                         "event_fired": "Event {name} fired",
                         "fire_event": "Fire Event",
                         "listen_to_events": "Listen to events",
                         "listening_to": "Listening to",
-                        "notification_event_fired": "Event {type} successful fired!",
+                        "notification_event_fired": "Event {type} successfully fired!",
                         "start_listening": "Start listening",
                         "stop_listening": "Stop listening",
                         "subscribe_to": "Event to subscribe to",
@@ -3069,8 +3111,8 @@
                         "attributes": "Attributes",
                         "copy_id": "Copy ID to clipboard",
                         "current_entities": "Current entities",
-                        "description1": "Set the representation of a device within Home Assistant.",
-                        "description2": "This will not communicate with the actual device.",
+                        "description1": "Set the current state representation of an entity within Home Assistant.",
+                        "description2": "If the entity belongs to a device, there will be no actual communication with that device.",
                         "entity": "Entity",
                         "filter_attributes": "Filter attributes",
                         "filter_entities": "Filter entities",
@@ -3442,7 +3484,7 @@
                         "duplicate": "Duplicate card",
                         "edit": "Edit",
                         "header": "Card Configuration",
-                        "move": "Move to View",
+                        "move": "Move to view",
                         "move_after": "Move card after",
                         "move_before": "Move card before",
                         "options": "More options",
diff --git a/translations/frontend/es-419.json b/translations/frontend/es-419.json
index 3270baae10..7425cff854 100644
--- a/translations/frontend/es-419.json
+++ b/translations/frontend/es-419.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "La instalación tiene problemas",
                 "unsupported_description": "A continuación se muestra una lista de problemas encontrados con su instalación, haga clic en los enlaces para saber cómo puede resolverlos.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor no está activado en el host",
                     "container": "Contenedores conocidos por causar problemas",
                     "content-trust": "La validación de contenido de confianza está desactivada",
                     "dbus": "DBUS",
@@ -840,6 +841,14 @@
                 "label": "Imagen",
                 "unsupported_format": "Formato no admitido, elija una imagen JPEG, PNG o GIF."
             },
+            "related-filter-menu": {
+                "filter_by_area": "Filtrar por área",
+                "filter_by_device": "Filtrar por dispositivo",
+                "filter_by_entity": "Filtrar por entidad",
+                "filtered_by_area": "área: {area_name}",
+                "filtered_by_device": "dispositivo: {device_name}",
+                "filtered_by_entity": "entidad: {entity_name}"
+            },
             "related-items": {
                 "area": "Área",
                 "automation": "Parte de las siguientes automatizaciones",
@@ -1182,6 +1191,9 @@
                 "zha_device_card": {
                     "device_name_placeholder": "Cambiar el nombre del dispositivo"
                 }
+            },
+            "zha_reconfigure_device": {
+                "heading": "Reconfigurando dispositivo"
             }
         },
         "duration": {
@@ -1202,6 +1214,14 @@
                 "key_wrong_type": "El valor provisto para \" {key} \" no es compatible con el editor visual. Aceptamos ( {type_correct} ) pero recibimos ( {type_wrong} ).",
                 "no_template_editor_support": "Plantillas no soportadas en el editor visual",
                 "no_type_provided": "No se ha provisto ningún tipo."
+            },
+            "supervisor": {
+                "ask": "Solicitar ayuda",
+                "observer": "Verificar Observer",
+                "reboot": "Intentar reiniciar el host",
+                "system_health": "Verificar estado del sistema",
+                "title": "No se pudo cargar el panel de Supervisor!",
+                "wait": "Si recién inicia, asegúrese de darle tiempo suficiente a Supervisor para que se inicie."
             }
         },
         "login-form": {
@@ -1219,10 +1239,12 @@
         "notification_toast": {
             "connection_lost": "Conexión perdida. Reconectando...",
             "dismiss": "Descartar",
+            "intergration_starting": "Iniciando {integration}, no todo estará totalmente disponible hasta que finalice.",
             "service_call_failed": "Error al llamar al servicio {service} .",
             "started": "¡Home Assistant ha iniciado!",
             "starting": "Home Assistant está iniciando, no todo estará disponible hasta que termine.",
-            "triggered": "{name} activado"
+            "triggered": "{name} activado",
+            "wrapping_up_startup": "Finalizando puesta en marcha, no todo estará totalmente disponible hasta que finalice."
         },
         "panel": {
             "config": {
@@ -1586,7 +1608,7 @@
                         "delete_automation": "Eliminar automatización",
                         "delete_confirm": "¿Está seguro de que desea eliminar esta automatización?",
                         "dev_automation": "Depurar automatización",
-                        "dev_only_editable": "Solo las automatizaciones definidas en automations.yaml son depurables.",
+                        "dev_only_editable": "Solo las automatizaciones que tienen un ID único asignado son depurables.",
                         "duplicate": "Duplicar",
                         "duplicate_automation": "Duplicar automatización",
                         "edit_automation": "Editar automatización",
@@ -1685,6 +1707,8 @@
                             "info": "Con la integración de Google Assistant para Home Assistant Cloud, podrá controlar todos sus dispositivos Home Assistant a través de cualquier dispositivo habilitado para Google Assistant.",
                             "info_state_reporting": "Si habilita los informes estatales, Home Assistant enviará todos los cambios de estado de las entidades expuestas a Google. Esto le permite ver siempre los últimos estados en la aplicación Google.",
                             "manage_entities": "Administrar entidades",
+                            "not_configured_text": "Antes de poder usar el Asistente de Google, debe activar la función de Home Assistant Cloud para el Asistente de Google en la aplicación Google Home.",
+                            "not_configured_title": "El Asistente de Google no está activado",
                             "security_devices": "Dispositivos de seguridad",
                             "sync_entities": "Sincronizar entidades con Google",
                             "sync_entities_404_message": "No se pudo sincronizar las entidades con Google, pida a Google 'Hey Google, sincronizar mis dispositivos' para sincronizar sus entidades.",
@@ -1847,6 +1871,36 @@
                     "description": "Sistema de unidades, ubicación, zona horaria y otros parámetros generales",
                     "section": {
                         "core": {
+                            "analytics": {
+                                "documentation": "Antes de habilitar esto, asegúrese de visitar la página de documentación de análisis {link} para comprender qué está enviando y cómo se almacena.",
+                                "header": "Datos analíticos",
+                                "instance_id": "ID de instancia: {huuid}",
+                                "introduction": "Comparta su información de instalación para ayudar a mejorar Home Assistant y ayúdenos a convencer a los fabricantes para que agreguen funciones de control local y centradas en la privacidad.",
+                                "learn_more": "Cómo procesamos sus datos",
+                                "needs_base": "Debe habilitar Datos analíticos básicos para que esta opción esté disponible",
+                                "preference": {
+                                    "base": {
+                                        "description": "ID de instancia, versión y tipo de instalación.",
+                                        "title": "Datos analíticos básicos"
+                                    },
+                                    "diagnostics": {
+                                        "description": "Compartir informes de fallos cuando se produzcan errores inesperados.",
+                                        "title": "Diagnósticos"
+                                    },
+                                    "statistics": {
+                                        "description": "Total de entidades, usuarios y otros elementos utilizados.",
+                                        "title": "Estadísticas de uso"
+                                    },
+                                    "usage_supervisor": {
+                                        "description": "Nombres, versiones y capacidades.",
+                                        "title": "Integraciones y complementos usados"
+                                    },
+                                    "usage": {
+                                        "description": "Nombres e información de versión.",
+                                        "title": "Integraciones utilizadas"
+                                    }
+                                }
+                            },
                             "core_config": {
                                 "edit_requires_storage": "Editor desactivado porque config está almacenado en configuration.yaml.",
                                 "elevation": "Elevación",
@@ -2034,6 +2088,9 @@
                     "filtering_by": "Filtrar por",
                     "show": "Mostrar"
                 },
+                "hassio": {
+                    "button": "Configurar"
+                },
                 "header": "Configurar Home Assistant",
                 "helpers": {
                     "caption": "Auxiliares",
@@ -2099,8 +2156,11 @@
                     "caption": "Integraciones",
                     "config_entry": {
                         "area": "En {area}",
+                        "check_the_logs": "Compruebe los registros",
+                        "configure": "Configurar",
                         "delete": "Eliminar",
                         "delete_confirm": "¿Estás seguro de que quieres eliminar esta integración?",
+                        "depends_on_cloud": "Depende de la nube",
                         "device_unavailable": "Dispositivo no disponible",
                         "devices": "{count} {count, plural,\n  one {dispositivo}\n  other {dispositivos}\n}",
                         "disable_restart_confirm": "Reinicie Home Assistant para terminar de deshabilitar esta integración",
@@ -2120,15 +2180,26 @@
                         "entity_unavailable": "Entidad no disponible",
                         "firmware": "Firmware: {version}",
                         "hub": "Conectado a través de",
+                        "logs": "Registros",
                         "manuf": "por {manufacturer}",
                         "no_area": "Ninguna área",
+                        "not_loaded": "No cargado",
                         "options": "Opciones",
+                        "provided_by_custom_integration": "Proporcionado por una integración personalizada",
                         "reload": "Recargar",
                         "reload_confirm": "La integración se recargó",
                         "reload_restart_confirm": "Reinicie Home Assistant para terminar de recargar esta integración",
                         "rename": "Renombrar",
                         "restart_confirm": "Reinicie Home Assistant para terminar de eliminar esta integración.",
                         "services": "{count} {count, plural,\n  one {service}\n  other {services}\n}",
+                        "state": {
+                            "failed_unload": "No se pudo descargar",
+                            "loaded": "Cargado",
+                            "migration_error": "Error de migración",
+                            "not_loaded": "No cargado",
+                            "setup_error": "No se pudo configurar",
+                            "setup_retry": "Reintentando configurar"
+                        },
                         "system_options": "Opciones de Sistema",
                         "unnamed_entry": "Entrada sin nombre"
                     },
@@ -2147,6 +2218,7 @@
                         "finish": "Finalizar",
                         "loading_first_time": "Espere mientras se instala la integración",
                         "not_all_required_fields": "No todos los campos requeridos estén llenos.",
+                        "not_loaded": "No se pudo cargar la integración, intente reiniciar Home Assistant.",
                         "pick_flow_step": {
                             "new_flow": "No, configure otra instancia de {integration}",
                             "title": "Hemos descubierto estos, ¿quieres configurarlos?"
@@ -2195,8 +2267,17 @@
                 "logs": {
                     "caption": "Registros",
                     "clear": "Limpiar",
+                    "custom_integration": "integración personalizada",
                     "description": "Ver los registros de Home Assistant",
                     "details": "Detalles del registro ({level})",
+                    "error_from_custom_integration": "Este error se originó en una integración personalizada.",
+                    "level": {
+                        "critical": "CRÍTICO",
+                        "debug": "DEPURAR",
+                        "error": "ERROR",
+                        "info": "INFO",
+                        "warning": "ADVERTENCIA"
+                    },
                     "load_full_log": "Cargar registro completo de Home Assistant",
                     "loading_log": "Cargando registro de errores ...",
                     "multiple_messages": "el mensaje se produjo por primera vez a las {time} y aparece {counter} veces",
@@ -2559,7 +2640,7 @@
                             "input_text": "Recargar controles de texto",
                             "introduction": "Algunas partes de Home Assistant pueden recargarse sin requerir un reinicio. Al presionar recargar se descargará su configuración YAML actual y se cargará la nueva.",
                             "min_max": "Recargar entidades de mín/máx",
-                            "mqtt": "Recargar entidades MQTT manualmente configuradas",
+                            "mqtt": "Entidades MQTT manualmente configuradas",
                             "person": "Recargar personas",
                             "ping": "Recargar entidades de sensor binario PING",
                             "reload": "Recargar {domain}",
@@ -2569,7 +2650,7 @@
                             "script": "Recargar scripts",
                             "smtp": "Recargar servicios de notificación SMTP",
                             "statistics": "Recargar entidades de estadísticas",
-                            "telegram": "Recargar servicios de notificación de telegram",
+                            "telegram": "Recargar servicios de notificación de Telegram",
                             "template": "Recargar las entidades de plantilla",
                             "trend": "Recargar entidades de tendencia",
                             "universal": "Recargar entidades de reproductor multimedia universal",
@@ -3693,6 +3774,10 @@
                 }
             },
             "page-onboarding": {
+                "analytics": {
+                    "finish": "Siguiente",
+                    "intro": "Comparta datos analíticos de su instancia. Estos datos estarán disponibles públicamente en {link}"
+                },
                 "core-config": {
                     "button_detect": "Detectar",
                     "finish": "Siguiente",
@@ -3702,12 +3787,14 @@
                     "location_name": "Nombre de su instalación de Home Assistant",
                     "location_name_default": "Casa"
                 },
+                "finish": "Finalizar",
                 "integration": {
                     "finish": "Terminar",
                     "intro": "Los dispositivos y servicios están representados en Home Assistant como integraciones. Puede configurarlos ahora, o hacerlo más tarde desde la pantalla de configuración.",
                     "more_integrations": "Más"
                 },
                 "intro": "¿Estás listo para despertar tu hogar, reclamar tu privacidad y unirte a una comunidad mundial de experimentadores?",
+                "next": "Siguiente",
                 "restore": {
                     "description": "También se puede restaurar desde una instantánea anterior.",
                     "hide_log": "Ocultar registro completo",
diff --git a/translations/frontend/es.json b/translations/frontend/es.json
index cecc759715..ddf26827ce 100644
--- a/translations/frontend/es.json
+++ b/translations/frontend/es.json
@@ -277,7 +277,7 @@
             },
             "failed_to_restart_name": "No se pudo reiniciar {name}",
             "failed_to_update_name": "No se pudo actualizar {name}",
-            "learn_more": "Aprende más",
+            "learn_more": "Saber más",
             "new_version_available": "Nueva versión disponible",
             "newest_version": "Versión más reciente",
             "no": "No",
@@ -287,7 +287,7 @@
             "reset_defaults": "Restablecer los valores predeterminados",
             "reset_options": "Restablecer opciones",
             "restart": "Reiniciar",
-            "restart_name": "Reiniciar {name}",
+            "restart_name": "Reiniciar el {name}",
             "running_version": "Actualmente estás ejecutando la versión {version}",
             "save": "Guardar",
             "show_more": "Mostrar más información sobre esto",
@@ -303,7 +303,7 @@
             },
             "restart": {
                 "text": "¿Estás seguro de que deseas reiniciar {name}?",
-                "title": "Reiniciar {name}"
+                "title": "Reiniciar el {name}"
             },
             "update": {
                 "text": "¿Estás seguro de que deseas actualizar {name} a la versión {version}?",
@@ -412,8 +412,8 @@
         },
         "system": {
             "core": {
-                "cpu_usage": "Uso de CPU principal",
-                "ram_usage": "Uso de RAM principal"
+                "cpu_usage": "Uso de CPU del core",
+                "ram_usage": "Uso de RAM del core"
             },
             "host": {
                 "change": "Cambiar",
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Tu instalación está en mal estado",
                 "unsupported_description": "A continuación se muestra una lista de problemas encontrados con tu instalación, haz clic en los enlaces para saber cómo puedes resolver los problemas.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor no está habilitado en el host",
                     "container": "Contenedores conocidos por causar problemas",
                     "content-trust": "La validación de contenido de confianza está deshabilitada",
                     "dbus": "DBUS",
@@ -560,9 +561,12 @@
             },
             "light": {
                 "brightness": "Brillo",
+                "cold_white_value": "Brillo del blanco frío",
+                "color_brightness": "Brillo del color",
                 "color_temperature": "Temperatura del color",
                 "effect": "Efecto",
-                "white_value": "Valor de blanco"
+                "warm_white_value": "Brillo del blanco cálido",
+                "white_value": "Brillo del blanco"
             },
             "lock": {
                 "code": "Código",
@@ -730,7 +734,7 @@
                 "search": "Buscar"
             },
             "date-range-picker": {
-                "end_date": "Fecha de finalización",
+                "end_date": "Fecha de fin",
                 "select": "Seleccionar",
                 "start_date": "Fecha de inicio"
             },
@@ -767,7 +771,7 @@
                 "messages": {
                     "became_unavailable": "dejó de estar disponible",
                     "changed_to_state": "cambiado a {state}",
-                    "cleared_device_class": "borrado (no se detecta {device_class})",
+                    "cleared_device_class": "despejado (no se detecta {device_class})",
                     "detected_device_class": "detectado {device_class}",
                     "is_closing": "se está cerrando",
                     "is_opening": "se está abriendo",
@@ -819,7 +823,7 @@
                     "video": "Vídeo"
                 },
                 "documentation": "documentación",
-                "learn_adding_local_media": "Aprende más sobre cómo añadir contenido multimedia en la {documentation}.",
+                "learn_adding_local_media": "Saber más sobre cómo añadir contenido multimedia en la {documentation}.",
                 "local_media_files": "Coloca tus archivos de vídeo, audio e imagen en el directorio multimedia para poder navegar y reproducirlos en el navegador o en los reproductores compatibles.",
                 "media_browsing_error": "Error de navegación de medios",
                 "media_not_supported": "El Reproductor multimedia del navegador no es compatible con este tipo de medio",
@@ -885,6 +889,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Documentación sobre la integración",
                 "required": "Este campo es obligatorio",
                 "service_data": "Datos del servicio",
                 "target": "Objetivos",
@@ -1129,6 +1134,7 @@
                         "reload": "{domain}",
                         "rest": "Entidades rest y notificar servicios",
                         "rpi_gpio": "Entidades GPIO de Raspberry Pi",
+                        "scene": "Escenas",
                         "script": "Scripts",
                         "smtp": "Servicios de notificación SMTP",
                         "statistics": "Entidades de estadísticas",
@@ -1237,10 +1243,12 @@
         "notification_toast": {
             "connection_lost": "Conexión perdida. Reconectando...",
             "dismiss": "Descartar",
+            "intergration_starting": "Iniciando {integration}, no estará todo disponible hasta que finalice.",
             "service_call_failed": "Error al llamar al servicio {service}.",
             "started": "¡Home Assistant se ha iniciado!",
             "starting": "Home Assistant se está iniciando, no estará todo disponible hasta que finalice.",
-            "triggered": "Activado {name}"
+            "triggered": "Activado {name}",
+            "wrapping_up_startup": "Completando el inicio, no estará todo disponible hasta que finalice."
         },
         "panel": {
             "config": {
@@ -1303,7 +1311,7 @@
                             "duplicate": "Duplicar",
                             "header": "Acciones",
                             "introduction": "Las acciones son lo que hará Home Assistant cuando se desencadene la automatización.",
-                            "learn_more": "Aprende más sobre las acciones.",
+                            "learn_more": "Saber más sobre las acciones.",
                             "name": "Acción",
                             "type_select": "Tipo de acción",
                             "type": {
@@ -1395,7 +1403,7 @@
                             "duplicate": "Duplicar",
                             "header": "Condiciones",
                             "introduction": "Las condiciones son opcionales y evitarán que la automatización funcione a menos que se cumplan todas las condiciones.",
-                            "learn_more": "Aprende más sobre las condiciones",
+                            "learn_more": "Saber más sobre las condiciones",
                             "name": "Condición",
                             "type_select": "Tipo de condición",
                             "type": {
@@ -1502,7 +1510,7 @@
                             "duplicate": "Duplicar",
                             "header": "Desencadenantes",
                             "introduction": "Los desencadenantes son los que inician el funcionamiento de una regla de automatización. Es posible especificar varios desencadenantes para la misma regla. Una vez que se inicia un desencadenante, Home Assistant comprobará las condiciones, si las hubiere, y ejecutará la acción.",
-                            "learn_more": "Aprende más sobre los desencadenantes",
+                            "learn_more": "Saber más sobre los desencadenantes",
                             "name": "Desencadenante",
                             "type_select": "Tipo de desencadenante",
                             "type": {
@@ -1604,7 +1612,7 @@
                         "delete_automation": "Eliminar la automatización",
                         "delete_confirm": "¿Estás seguro de que quieres eliminar esta automatización?",
                         "dev_automation": "Depurar automatización",
-                        "dev_only_editable": "Solo las automatizaciones definidas en automations.yaml se pueden depurar",
+                        "dev_only_editable": "Solo las automatizaciones que tienen un ID único asignado se pueden depurar.",
                         "duplicate": "Duplicar",
                         "duplicate_automation": "Duplicar la automatización",
                         "edit_automation": "Editar automatización",
@@ -1613,7 +1621,7 @@
                             "name": "Nombre"
                         },
                         "introduction": "El editor de automatización te permite crear y editar automatizaciones. En el enlace siguiente puedes leer las instrucciones para asegurarte de que has configurado correctamente Home Assistant.",
-                        "learn_more": "Aprende más sobre las automatizaciones",
+                        "learn_more": "Saber más sobre las automatizaciones",
                         "no_automations": "No pudimos encontrar ninguna automatización",
                         "only_editable": "Solo las automatizaciones definidas en automations.yaml son editables.",
                         "pick_automation": "Elije la automatización para editar",
@@ -1667,7 +1675,7 @@
                             "name": "Nombre"
                         },
                         "introduction": "La configuración de planos te permite importar y administrar tus planos.",
-                        "learn_more": "Aprende más sobre el uso de planos",
+                        "learn_more": "Saber más sobre el uso de planos",
                         "share_blueprint": "Compartir plano",
                         "share_blueprint_no_url": "No se puede compartir el plano: no hay URL de origen",
                         "use_blueprint": "Crear automatización"
@@ -1691,7 +1699,7 @@
                         },
                         "connected": "Conectado",
                         "connection_status": "Estado de conexión a la nube",
-                        "fetching_subscription": "Obteniendo suscripción ...",
+                        "fetching_subscription": "Obteniendo suscripción...",
                         "google": {
                             "config_documentation": "Documentación de configuración",
                             "devices_pin": "PIN de dispositivos de seguridad",
@@ -1746,8 +1754,8 @@
                         "webhooks": {
                             "disable_hook_error_msg": "No se pudo deshabilitar el webhook:",
                             "info": "Cualquier cosa que esté configurada para ser activada por un webhook puede recibir una URL de acceso público para permitirte enviar datos a Home Assistant desde cualquier lugar, sin exponer tu instancia a Internet.",
-                            "link_learn_more": "Aprende más sobre la creación de automatizaciones basadas en webhook.",
-                            "loading": "Cargando ...",
+                            "link_learn_more": "Saber más sobre la creación de automatizaciones basadas en webhook.",
+                            "loading": "Cargando...",
                             "manage": "Administrar",
                             "no_hooks_yet": "Parece que aún no tienes webhooks. Comienza configurando un",
                             "no_hooks_yet_link_automation": "automatización de webhook",
@@ -1825,7 +1833,7 @@
                         "introduction2": "Este servicio está a cargo de nuestro socio.",
                         "introduction2a": ", una compañía fundada por los fundadores de Home Assistant y Hass.io.",
                         "introduction3": "Home Assistant Cloud es un servicio de suscripción con una prueba gratuita de un mes. No se necesita información de pago.",
-                        "learn_more_link": "Aprende más sobre Home Assistant Cloud",
+                        "learn_more_link": "Saber más sobre Home Assistant Cloud",
                         "password": "Contraseña",
                         "password_error_msg": "Las contraseñas tienen al menos 8 caracteres.",
                         "sign_in": "Inicia sesión",
@@ -1871,28 +1879,28 @@
                                 "documentation": "Antes de habilitar esto, asegúrate de visitar la página de documentación de análisis {link} para comprender qué estás enviando y cómo se almacena.",
                                 "header": "Analítica",
                                 "instance_id": "ID de instancia: {huuid}",
-                                "introduction": "Comparte análisis de tu instancia. Estos datos estarán disponibles públicamente en {link}",
-                                "learn_more": "Aprende más sobre cómo se procesarán tus datos.",
+                                "introduction": "Comparte la información de tu instalación para ayudar a mejorar Home Assistant y ayudarnos a convencer a los fabricantes de que agreguen funciones de control local y centradas en la privacidad.",
+                                "learn_more": "Cómo tratamos tus datos",
                                 "needs_base": "Debes habilitar el análisis base para que esta opción esté disponible",
                                 "preference": {
                                     "base": {
-                                        "description": "Esto incluye el ID de la instancia, la versión y el tipo de instalación.",
+                                        "description": "ID de instancia, versión y tipo de instalación.",
                                         "title": "Analítica básica"
                                     },
                                     "diagnostics": {
-                                        "description": "Comparte informes de fallos e información de diagnóstico",
+                                        "description": "Comparte informes de fallos cuando se produzcan errores inesperados.",
                                         "title": "Diagnósticos"
                                     },
                                     "statistics": {
-                                        "description": "Esto incluye un recuento de elementos en tu instalación, para obtener una lista completa, consulta la documentación",
+                                        "description": "Total de entidades, usuarios y otros elementos utilizados.",
                                         "title": "Estadísticas de uso"
                                     },
                                     "usage_supervisor": {
-                                        "description": "Esto incluye los nombres y las capacidades de tus integraciones y complementos.",
+                                        "description": "Nombres, versiones y capacidades.",
                                         "title": "Integraciones y complementos utilizados"
                                     },
                                     "usage": {
-                                        "description": "Esto incluye los nombres de tus integraciones.",
+                                        "description": "Nombres e información de versión.",
                                         "title": "Integraciones utilizadas"
                                     }
                                 }
@@ -2152,8 +2160,11 @@
                     "caption": "Integraciones",
                     "config_entry": {
                         "area": "En {area}",
+                        "check_the_logs": "Revisa los registros",
+                        "configure": "Configurar",
                         "delete": "Eliminar",
                         "delete_confirm": "¿Estás seguro de que quieres eliminar esta integración?",
+                        "depends_on_cloud": "Depende de la nube",
                         "device_unavailable": "Dispositivo no disponible",
                         "devices": "{count} {count, plural,\n  one {dispositivo}\n  other {dispositivos}\n}",
                         "disable_restart_confirm": "Reinicia Home Assistant para terminar de deshabilitar esta integración",
@@ -2176,14 +2187,23 @@
                         "logs": "registros",
                         "manuf": "por {manufacturer}",
                         "no_area": "Ningún área",
-                        "not_loaded": "No se ha cargado, comprueba el {logs_link}",
+                        "not_loaded": "No se ha cargado",
                         "options": "Opciones",
+                        "provided_by_custom_integration": "Proporcionada por una integración personalizada",
                         "reload": "Recargar",
                         "reload_confirm": "La integración se ha recargado",
                         "reload_restart_confirm": "Reinicia Home Assistant para terminar de recargar esta integración",
                         "rename": "Renombrar",
                         "restart_confirm": "Reinicia Home Assistant para terminar de eliminar esta integración.",
                         "services": "{count} {count, plural,\n  one {servicio}\n  other {servicios}\n}",
+                        "state": {
+                            "failed_unload": "No se pudo descargar",
+                            "loaded": "Cargada",
+                            "migration_error": "Error de migración",
+                            "not_loaded": "No se ha cargado",
+                            "setup_error": "No se pudo configurar",
+                            "setup_retry": "Reintentando la configuración"
+                        },
                         "system_options": "Opciones del sistema",
                         "unnamed_entry": "Entrada sin nombre"
                     },
@@ -2212,7 +2232,7 @@
                     "configure": "Configurar",
                     "configured": "Configurado",
                     "confirm_new": "¿Quieres configurar {integration}?",
-                    "description": "Gestiona integraciones con servicios, dispositivos, ...",
+                    "description": "Gestiona integraciones con servicios o dispositivos.",
                     "details": "Detalles de la integración",
                     "disable": {
                         "disabled_integrations": "{number} deshabilitadas",
@@ -2251,8 +2271,10 @@
                 "logs": {
                     "caption": "Registros",
                     "clear": "Limpiar",
+                    "custom_integration": "integración personalizada",
                     "description": "Ve los registros de Home Assistant",
                     "details": "Detalles de registro ({level})",
+                    "error_from_custom_integration": "Este error se originó a partir de una integración personalizada.",
                     "level": {
                         "critical": "CRÍTICO",
                         "debug": "DEPURACIÓN",
@@ -2499,7 +2521,7 @@
                         "update": "Actualizar"
                     },
                     "introduction": "Aquí puedes definir a cada persona de interés en Home Assistant.",
-                    "learn_more": "Aprende más sobre las personas",
+                    "learn_more": "Saber más sobre las personas",
                     "no_persons_created_yet": "Parece que aún no has creado ninguna persona.",
                     "note_about_persons_configured_in_yaml": "Nota: las personas configuradas a través de configuration.yaml no se pueden editar a través de la IU.",
                     "person_not_found": "No pudimos encontrar a la persona que intentabas editar.",
@@ -2543,7 +2565,7 @@
                             "name": "Nombre"
                         },
                         "introduction": "El editor de escenas te permite crear y editar escenas. Por favor, sigue el siguiente enlace para leer las instrucciones para asegurarte de que has configurado Home Assistant correctamente.",
-                        "learn_more": "Aprende más sobre las escenas",
+                        "learn_more": "Saber más sobre las escenas",
                         "no_scenes": "No pudimos encontrar ninguna escena",
                         "only_editable": "Solo las escenas definidas en scenes.yaml son editables.",
                         "pick_scene": "Elige una escena para editar",
@@ -2564,7 +2586,7 @@
                         "id_already_exists": "Este ID ya existe",
                         "id_already_exists_save_error": "No puedes guardar este script porque el ID no es único, elije otro ID o déjalo en blanco para generar uno automáticamente.",
                         "introduction": "Utiliza scripts para ejecutar una secuencia de acciones.",
-                        "link_available_actions": "Aprende más sobre las acciones disponibles.",
+                        "link_available_actions": "Saber más sobre las acciones disponibles.",
                         "load_error_not_editable": "Solo los scripts dentro de scripts.yaml son editables.",
                         "max": {
                             "parallel": "Número máximo de ejecuciones paralelas",
@@ -2593,7 +2615,7 @@
                             "name": "Nombre"
                         },
                         "introduction": "El editor de scripts te permite crear y editar scripts. Por favor, sigue el siguiente enlace para leer las instrucciones para asegurarte de que has configurado Home Assistant correctamente.",
-                        "learn_more": "Aprende más sobre los scripts",
+                        "learn_more": "Saber más sobre los scripts",
                         "no_scripts": "No pudimos encontrar ningún script",
                         "run_script": "Ejecutar script",
                         "show_info": "Mostrar información sobre el script"
@@ -2612,7 +2634,7 @@
                             "generic": "Entidades de cámara IP genéricas",
                             "generic_thermostat": "Entidades de termostato genéricas",
                             "group": "Grupos, entidades de grupo, y notificar servicios",
-                            "heading": "Recargando la configuración YAML",
+                            "heading": "Recarga de la configuración YAML",
                             "history_stats": "Entidades de estadísticas del historial",
                             "homekit": "HomeKit",
                             "input_boolean": "Campos booleanos",
@@ -2628,6 +2650,7 @@
                             "reload": "{domain}",
                             "rest": "Entidades rest y notificar servicios",
                             "rpi_gpio": "Entidades GPIO de Raspberry Pi",
+                            "scene": "Escenas",
                             "script": "Scripts",
                             "smtp": "Servicios de notificación SMTP",
                             "statistics": "Entidades de estadísticas",
@@ -2680,7 +2703,7 @@
                         "last_scanned": "Última vez escaneada",
                         "name": "Nombre"
                     },
-                    "learn_more": "Aprende más sobre las etiquetas",
+                    "learn_more": "Saber más sobre las etiquetas",
                     "never_scanned": "Nunca escaneado",
                     "no_tags": "Sin etiquetas",
                     "write": "Escribir"
@@ -2768,6 +2791,15 @@
                         "manufacturer_code_override": "Anulación del código del fabricante",
                         "value": "Valor"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Atajos",
+                        "update_button": "Actualizar la configuración",
+                        "zha_options": {
+                            "default_light_transition": "Tiempo de transición de la luz por defecto (segundos)",
+                            "enable_identify_on_join": "Habilita el efecto de identificación cuando los dispositivos se unen a la red",
+                            "title": "Opciones globales"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuración completada",
                         "CONFIGURED_status_text": "Inicializando",
@@ -2907,6 +2939,9 @@
                         "header": "Configuración del dispositivo Z-Wave",
                         "introduction": "Administra y ajusta los parámetros de configuración específicos del dispositivo (nodo) para el dispositivo seleccionado",
                         "parameter_is_read_only": "Este parámetro es de solo lectura.",
+                        "set_param_accepted": "El parámetro se ha actualizado.",
+                        "set_param_error": "Se ha producido un error.",
+                        "set_param_queued": "El cambio de parámetro se ha puesto en cola y se actualizará cuando el dispositivo se active.",
                         "zwave_js_device_database": "Base de datos de dispositivos Z-Wave JS"
                     },
                     "node_status": {
@@ -2916,6 +2951,16 @@
                         "dead": "No responde",
                         "unknown": "Desconocido"
                     },
+                    "reinterview_node": {
+                        "battery_device_warning": "Deberás reactivar los dispositivos que funcionan con baterías antes de comenzar la reentrevista. Consulta el manual de tu dispositivo para obtener instrucciones sobre cómo reactivar el dispositivo.",
+                        "in_progress": "El dispositivo está siendo entrevistado. Esto puede llevar algún tiempo.",
+                        "interview_complete": "Entrevista con el dispositivo completa.",
+                        "interview_failed": "La entrevista del dispositivo falló. Es posible que haya información adicional disponible en los registros.",
+                        "introduction": "Vuelve a entrevistar un dispositivo en tu red Z-Wave. Utiliza esta función si tu dispositivo tiene una funcionalidad incorrecta o ausente.",
+                        "run_in_background": "Puedes cerrar este cuadro de diálogo y la entrevista continuará en segundo plano.",
+                        "start_reinterview": "Iniciar la reentrevista",
+                        "title": "Volver a entrevistar un dispositivo Z-Wave"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "Cancelar exclusión",
                         "controller_in_exclusion_mode": "Tu controlador Z-Wave ahora está en modo de exclusión.",
@@ -2937,7 +2982,7 @@
                         "wakeup_interval": "Intervalo de activación"
                     },
                     "description": "Administra tu red Z-Wave",
-                    "learn_more": "Aprende más sobre Z-Wave",
+                    "learn_more": "Saber más sobre Z-Wave",
                     "migration": {
                         "ozw": {
                             "header": "Migrar a OpenZWave",
@@ -3034,12 +3079,12 @@
                         "count_listeners": " ({count} oyentes)",
                         "data": "Datos del evento (YAML, opcional)",
                         "description": "Disparar un evento en el bus de eventos.",
-                        "documentation": "Documentación de eventos.",
+                        "documentation": "Documentación de eventos",
                         "event_fired": "Evento {name} disparado",
                         "fire_event": "Lanzar evento",
                         "listen_to_events": "Escuchar eventos",
                         "listening_to": "Escuchando",
-                        "notification_event_fired": "¡Evento {tipe} disparado con éxito!",
+                        "notification_event_fired": "¡Evento {type} disparado con éxito!",
                         "start_listening": "Empezar a escuchar",
                         "stop_listening": "Dejar de escuchar",
                         "subscribe_to": "Evento al que suscribirse",
@@ -3066,8 +3111,8 @@
                         "attributes": "Atributos",
                         "copy_id": "Copiar ID al portapapeles",
                         "current_entities": "Entidades actuales",
-                        "description1": "Establecer la representación de un dispositivo dentro de Home Assistant.",
-                        "description2": "Esto no se comunicará con el dispositivo actual.",
+                        "description1": "Establece la representación del estado actual de una entidad dentro de Home Assistant.",
+                        "description2": "Si la entidad pertenece a un dispositivo, no habrá comunicación real con ese dispositivo.",
                         "entity": "Entidad",
                         "filter_attributes": "Filtrar atributos",
                         "filter_entities": "Filtrar entidades",
@@ -3715,7 +3760,7 @@
                     "demo": {
                         "demo_by": "por {name}",
                         "introduction": "¡Bienvenido a casa! Has llegado a la demostración de Home Assistant donde mostramos las mejores interfaces de usuario creadas por nuestra comunidad.",
-                        "learn_more": "Aprende más sobre Home Assistant",
+                        "learn_more": "Saber más sobre Home Assistant",
                         "next_demo": "Siguiente demostración"
                     }
                 },
@@ -3801,7 +3846,7 @@
             "profile": {
                 "advanced_mode": {
                     "description": "Desbloquea las funciones avanzadas.",
-                    "link_promo": "Aprende más",
+                    "link_promo": "Saber más",
                     "title": "Modo avanzado"
                 },
                 "change_password": {
@@ -3892,7 +3937,7 @@
                     "error_load_platform": "Configurar notify.html5.",
                     "error_use_https": "Requiere SSL activado para frontend.",
                     "header": "Notificaciones push",
-                    "link_promo": "Aprende más",
+                    "link_promo": "Saber más",
                     "push_notifications": "Notificaciones push"
                 },
                 "refresh_tokens": {
diff --git a/translations/frontend/et.json b/translations/frontend/et.json
index 03812e2747..65f4658937 100644
--- a/translations/frontend/et.json
+++ b/translations/frontend/et.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Paigaldus on vigane",
                 "unsupported_description": "Allpool on loend paigaldusel leitud probleemidest. Klõpsa linkidel, et saada teada, kuidas saad probleeme lahendada.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor pole hostis lubatud",
                     "container": "Konteinerid mis teadaolevalt põhjustavad probleeme",
                     "content-trust": "Sisu usaldatavuse kontroll on keelatud",
                     "dbus": "DBUS",
@@ -560,9 +561,12 @@
             },
             "light": {
                 "brightness": "Heledus",
+                "cold_white_value": "Külma valguse heledus",
+                "color_brightness": "Värvilise valguse heledus",
                 "color_temperature": "Värvustemperatuur",
                 "effect": "Efekt",
-                "white_value": "Valge väärtus"
+                "warm_white_value": "Sooja valguse heledus",
+                "white_value": "Valge valguse heledus"
             },
             "lock": {
                 "code": "Kood",
@@ -885,6 +889,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Sidumise teave",
                 "required": "See väli on nõutav",
                 "service_data": "Teenuse andmed",
                 "target": "Eesmärgid",
@@ -922,7 +927,7 @@
             },
             "entity_registry": {
                 "control": "Juhtimine",
-                "customize_link": "olemite kohandused",
+                "customize_link": "olemite kohandamised",
                 "dismiss": "Loobu",
                 "editor": {
                     "advanced": "Täpsemad sätted",
@@ -1238,10 +1243,12 @@
         "notification_toast": {
             "connection_lost": "Ühendus kadunud. Taasühendamine...",
             "dismiss": "Loobu",
+            "intergration_starting": "Sidumine {integration} käivitub, kõik elemendid pole veel saadaval.",
             "service_call_failed": "Teenuse {service} väljakutsumine ebaõnnestus.",
             "started": "Home Assistant on käivitunud!",
             "starting": "Home Assistant  käivitub, kõik elemendid ei pruugi veel saadaval olla",
-            "triggered": "Käivitati {name}"
+            "triggered": "Käivitati {name}",
+            "wrapping_up_startup": "Lõpetan käivitumist, kõik elemendid pole veel saadaval."
         },
         "panel": {
             "config": {
@@ -1605,7 +1612,7 @@
                         "delete_automation": "Kustuta automatiseering",
                         "delete_confirm": "Oled kindel, et soovid selle automatiseeringu kustutada?",
                         "dev_automation": "Automatiseeringu silumine",
-                        "dev_only_editable": "Siluda saab ainult kirjes automations.yaml olevaid automatiseeringuid.",
+                        "dev_only_editable": "Siluda saab ainult kordumatu ID-ga automatiseeringuid.",
                         "duplicate": "Paljunda",
                         "duplicate_automation": "Paljunda automatiseering",
                         "edit_automation": "Muuda automatiseeringut",
@@ -1872,28 +1879,28 @@
                                 "documentation": "Enne selle lubamist külasta kindlasti olekuteabe dokumentatsiooni lehte {link} et aru saada, mida saadetakse ja kuidas see talletatakse.",
                                 "header": "Olekuteave",
                                 "instance_id": "Eksemplari ID: {huuid}",
-                                "introduction": "Jaga oma Home Assistanti oleku teavet. Need andmed on avalikult saadaval aadressil {link}",
-                                "learn_more": "Uuri lisateavet andmete töötlemise kohta.",
+                                "introduction": "Jaga oma paigalduse teavet, et muuta Home Assistant paremaks ja aidata meil veenda tootjaid lisama kohalikku juhtimist ja privaatsusele keskendunud funktsioone.",
+                                "learn_more": "Uuri lisateavet andmete töötlemise kohta",
                                 "needs_base": "Selle suvandi kasutamiseks pead lubama põhilise olekuteabe",
                                 "preference": {
                                     "base": {
-                                        "description": "See hõlmab eksemplari ID-d, versiooni ja paigalduse tüüpi",
+                                        "description": "Eksemplari ID, versioon ja paigalduse tüüp.",
                                         "title": "Põhiline olekuteave"
                                     },
                                     "diagnostics": {
-                                        "description": "Jaga krahhiaruandeid ja diagnostikateavet",
+                                        "description": "Ootamatute vigade ilmnemisel jaga krahhiaruandeid.",
                                         "title": "Diagnostika"
                                     },
                                     "statistics": {
-                                        "description": "See hõlmab paigalduse elementide arvu, täieliku loendi saamiseks vaata dokumentatsiooni",
+                                        "description": "Kasutatud olemid, kasutajad ja muud elemendid kokku.",
                                         "title": "Kasutusstatistika"
                                     },
                                     "usage_supervisor": {
-                                        "description": "See hõlmab sidumiste ja lisandmoodulite nimesid ja võimalusi",
+                                        "description": "Nimed, versioonid ja võimalused.",
                                         "title": "Kasutusel olevad sidumised ja lisandmoodulid"
                                     },
                                     "usage": {
-                                        "description": "See hõlmab kasutusel olevate sidumiste nimesid",
+                                        "description": "Nimed ja teave versiooni kohta.",
                                         "title": "Kasutusel olevad sidumised"
                                     }
                                 }
@@ -1933,7 +1940,7 @@
                     "picker": {
                         "documentation": "Kohandamiste dokumentatsioon",
                         "header": "Kohandamine",
-                        "introduction": "Kohanda olemi atribuute. Lisatud või muudetud kohandused rakenduvad kohe. Eemaldatud kohandused rakenduvad olemi värskendamisel."
+                        "introduction": "Kohanda olemi atribuute. Lisatud või muudetud kohandamised rakenduvad kohe. Eemaldatud kohandamised rakenduvad olemi värskendamisel."
                     },
                     "warning": {
                         "include_link": "kaasa customize.yaml",
@@ -2153,8 +2160,11 @@
                     "caption": "Sidumised",
                     "config_entry": {
                         "area": "alas {area}",
+                        "check_the_logs": "Kontrolli logisid",
+                        "configure": "Seadista",
                         "delete": "Kustuta",
                         "delete_confirm": "Oled kindel, et soovid selle sidumise kustutada?",
+                        "depends_on_cloud": "Sõltub pilveteenusest",
                         "device_unavailable": "Seade pole saadaval",
                         "devices": "{count} {count, plural,\n  one {seade}\n  other {seadet}\n}",
                         "disable_restart_confirm": "Taaskäivita Home Assistant, et lõpetada selle sidumise keelamine",
@@ -2177,14 +2187,23 @@
                         "logs": "Logid",
                         "manuf": "{manufacturer}",
                         "no_area": "Ala puudub",
-                        "not_loaded": "Laadimine nurjus, lisateavet vaata siit {logs_link}",
+                        "not_loaded": "Pole laaditud",
                         "options": "Valikud",
+                        "provided_by_custom_integration": "Saadaval välise sidumise kaudu",
                         "reload": "Taaslae",
                         "reload_confirm": "Sidumine on taaslaetud",
                         "reload_restart_confirm": "Taaskäivita Home Assistant, et lõpetada selle sidumise taaslaadimine",
                         "rename": "Nimeta ümber",
                         "restart_confirm": "Selle sidumise lõplikuks eemaldamiseks taaskäivita Home Assistant",
                         "services": "{count} {count, plural,\n one {teenus}\n other {teenust}\n}",
+                        "state": {
+                            "failed_unload": "Eemaldamine nurjus",
+                            "loaded": "Laetud",
+                            "migration_error": "Tõrge teisaldamisel",
+                            "not_loaded": "Pole laaditud",
+                            "setup_error": "Häälestamine nurjus",
+                            "setup_retry": "Proovin uuesti seadistada"
+                        },
                         "system_options": "Süsteemisuvandid",
                         "unnamed_entry": "Nimetu kanne"
                     },
@@ -2213,7 +2232,7 @@
                     "configure": "Seadista",
                     "configured": "Seadistatud",
                     "confirm_new": "Kas soovid seadistada sidumist {integration}?",
-                    "description": "Halda teenuste, seadmete jne. sidumisi",
+                    "description": "Halda teenuste või  seadmete sidumisi",
                     "details": "Sidumise üksikasjad",
                     "disable": {
                         "disabled_integrations": "{number} keelatut",
@@ -2252,8 +2271,10 @@
                 "logs": {
                     "caption": "Logid",
                     "clear": "Puhasta",
+                    "custom_integration": "kohandatud sidumine",
                     "description": "Home Assistanti logid",
                     "details": "Logi üksikasjad ({level})",
+                    "error_from_custom_integration": "Selle tõrke põhjustas kohandatud sidumine.",
                     "level": {
                         "critical": "OLULINE",
                         "debug": "SILUMINE",
@@ -2770,6 +2791,15 @@
                         "manufacturer_code_override": "Tootja koodi alistamine",
                         "value": "Väärtus"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Otseteed",
+                        "update_button": "Seadete värskendamine",
+                        "zha_options": {
+                            "default_light_transition": "Valguse vaikeülemineku aeg (sekundites)",
+                            "enable_identify_on_join": "Luba tuvastamise efekt kui seadmed liituvad võrguga",
+                            "title": "Üldised valikud"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Seadistamine on lõpetatud",
                         "CONFIGURED_status_text": "Lähtestan",
@@ -2909,6 +2939,9 @@
                         "header": "Z-Wave seadme häälestamine",
                         "introduction": "Valitud seadme (sõlme) spetsiifiliste seadistuste haldamine ja muutmine",
                         "parameter_is_read_only": "See parameeter on kirjutuskaitstud.",
+                        "set_param_accepted": "Parameeter on uuendatud.",
+                        "set_param_error": "Ilmnes tõrge.",
+                        "set_param_queued": "Parameetri uuendamine on ootel ja seda värskendatakse seadme ärkamisel.",
                         "zwave_js_device_database": "Z-Wave JS seadmete andmebaas"
                     },
                     "node_status": {
@@ -3068,8 +3101,8 @@
                         "attributes": "Atribuudid",
                         "copy_id": "Kopeeri ID lõikepuhvrisse",
                         "current_entities": "Praegused olemid",
-                        "description1": "Seadke seadme esitus Home Assistendis.",
-                        "description2": "See ei suhtle tegeliku seadmega.",
+                        "description1": "Sea seadme oleku esitus Home Assistendis.",
+                        "description2": "Kui olem kuulub seadmele siis selle seadmega tegelikku suhtlust ei toimu.",
                         "entity": "Olem",
                         "filter_attributes": "Filtreeri atribuute",
                         "filter_entities": "Filtreeri olemeid",
diff --git a/translations/frontend/fr.json b/translations/frontend/fr.json
index 6002e035da..1fcbf8d6ab 100644
--- a/translations/frontend/fr.json
+++ b/translations/frontend/fr.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Votre installation est défectueuse",
                 "unsupported_description": "Vous trouverez ci-dessous une liste des problèmes rencontrés avec votre installation, cliquez sur les liens pour savoir comment vous pouvez résoudre les problèmes.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor n'est pas activé sur l'hôte",
                     "container": "Conteneurs connus pour causer des problèmes",
                     "content-trust": "La validation de la confiance du contenu est désactivée",
                     "dbus": "DBUS",
@@ -1213,6 +1214,14 @@
                 "key_wrong_type": "La valeur fournie pour \"{key}\" n'est pas prise en charge par l'éditeur visuel. Nous supportons ({type_correct}) mais avons reçu ({type_wrong}).",
                 "no_template_editor_support": "Modèles non pris en charge dans l'éditeur visuel",
                 "no_type_provided": "Aucun type fourni."
+            },
+            "supervisor": {
+                "ask": "Demandez de l’aide",
+                "observer": "Vérifiez l'observateur",
+                "reboot": "Essayez un redémarrage de l’hôte",
+                "system_health": "Vérifier la santé du système",
+                "title": "Impossible de charger le panneau du Supervisor!",
+                "wait": "Si vous venez de commencer, assurez-vous d’avoir donné au Superviseur suffisamment de temps pour démarrer."
             }
         },
         "login-form": {
@@ -1230,10 +1239,12 @@
         "notification_toast": {
             "connection_lost": "Connexion perdue. Reconnexion en cours ...",
             "dismiss": "Ignorer",
+            "intergration_starting": "Démarrage de {integration}, tout ne sera pas disponible tant qu'il n'aura pas terminé",
             "service_call_failed": "Échec d'appel du service \"{service}\".",
             "started": "Home Assistant a démarré !",
             "starting": "Home Assistant est en cours de démarrage, tout ne sera pas disponible tant qu’il n’aura pas terminé.",
-            "triggered": "{name} déclenché"
+            "triggered": "{name} déclenché",
+            "wrapping_up_startup": "En terminant le démarrage, tout ne sera pas disponible tant qu'il ne sera pas terminé."
         },
         "panel": {
             "config": {
@@ -1862,17 +1873,30 @@
                         "core": {
                             "analytics": {
                                 "documentation": "Avant d'activer cette fonction, prenez soin de visiter la page de documentation {link} afin de comprendre ce que vous envoyez et comment cela est conservé.",
+                                "header": "Analytique",
                                 "instance_id": "ID de l'instance: {huuid}",
-                                "learn_more": "En appendre plus sur le traitement de vos données",
+                                "introduction": "Partagez vos informations d'installation pour améliorer Home Assistant et nous aider à convaincre les fabricants d'ajouter des fonctionnalités de contrôle local et de confidentialité.",
+                                "learn_more": "En apprendre plus sur le traitement de vos données",
+                                "needs_base": "Vous devez activer l'analyse de base pour que cette option soit disponible",
                                 "preference": {
+                                    "base": {
+                                        "description": "ID de l'instance, version et type d'installation.",
+                                        "title": "Analyse de base"
+                                    },
                                     "diagnostics": {
                                         "description": "Partager les rapports d'accident et les informations de diagnostic",
                                         "title": "Diagnostiques"
                                     },
                                     "statistics": {
+                                        "description": "Nombre total d’entités, d’utilisateurs et d’autres éléments utilisés.",
                                         "title": "Statistiques d'utilisation"
                                     },
+                                    "usage_supervisor": {
+                                        "description": "Noms, versions et fonctionnalités.",
+                                        "title": "Intégrations et add-ons utilisés"
+                                    },
                                     "usage": {
+                                        "description": "Noms et versions",
                                         "title": "Intégrations utilisées"
                                     }
                                 }
@@ -2156,6 +2180,7 @@
                         "logs": "journaux",
                         "manuf": "par {manufacturer}",
                         "no_area": "Pas de zone",
+                        "not_loaded": "Non chargé, vérifiez le {logs_link}",
                         "options": "Options",
                         "reload": "Recharger",
                         "reload_confirm": "L'intégration a été rechargée",
@@ -2234,6 +2259,7 @@
                     "details": "Détails du journal ( {level} )",
                     "level": {
                         "critical": "CRITIQUE",
+                        "debug": "DEBUG",
                         "error": "ERREUR",
                         "info": "INFO",
                         "warning": "ATTENTION"
@@ -3034,6 +3060,7 @@
                         "column_parameter": "Paramètre",
                         "description": "L'outil de développement 'services' vous permet d'appeler n'importe quel service disponible dans Home Assistant.",
                         "fill_example_data": "Remplir des exemples de données",
+                        "no_template_ui_support": "L'interface utilisateur ne prend pas en charge les modèles, vous pouvez toujours utiliser l'éditeur YAML.",
                         "title": "Services",
                         "ui_mode": "Passer en mode UI",
                         "yaml_mode": "Passez en mode YAML",
@@ -3501,7 +3528,7 @@
                         "unsaved_changes": "Modifications non enregistrées"
                     },
                     "save_config": {
-                        "cancel": "Oublie ce que j'ai dit, c'est pas grave.",
+                        "cancel": "Annuler",
                         "close": "Fermer",
                         "empty_config": "Commencer par un tableau de bord vide",
                         "header": "Prenez le contrôle de votre Interface Lovelace",
@@ -3734,7 +3761,8 @@
             },
             "page-onboarding": {
                 "analytics": {
-                    "finish": "Suivant"
+                    "finish": "Suivant",
+                    "intro": "Partagez les analyses de votre instance. Ces données seront accessibles au public à l' {link}"
                 },
                 "core-config": {
                     "button_detect": "Détecter",
@@ -3849,9 +3877,16 @@
                 },
                 "number_format": {
                     "description": "Définir le formatage des nombres",
+                    "dropdown_label": "Format de nombre",
                     "formats": {
-                        "none": "Aucun"
-                    }
+                        "comma_decimal": "1,234,567.89",
+                        "decimal_comma": "1.234.567,89",
+                        "language": "Auto (utiliser le paramètre de langue)",
+                        "none": "Aucun",
+                        "space_comma": "1 234 567,89",
+                        "system": "Utiliser les paramètres régionaux du système"
+                    },
+                    "header": "Format de nombre"
                 },
                 "push_notifications": {
                     "add_device_prompt": {
diff --git a/translations/frontend/he.json b/translations/frontend/he.json
index 11c7f7517d..a90af9161c 100644
--- a/translations/frontend/he.json
+++ b/translations/frontend/he.json
@@ -21,6 +21,7 @@
         "logbook": "יומן אירועים",
         "mailbox": "תיבת דואר",
         "map": "מפה",
+        "media_browser": "סייר המדיה",
         "profile": "פרופיל",
         "shopping_list": "רשימת קניות",
         "states": "ראשי"
@@ -104,14 +105,37 @@
     "supervisor": {
         "addon": {
             "dashboard": {
+                "action_error": {
+                    "get_changelog": "קבלת יומן שינויים של התוסף נכשלה",
+                    "validate_config": "אימות תצורת התוסף נכשל"
+                },
                 "not_available_version": "אתה מפעיל את Home Assistant {core_version_installed} , כדי לעדכן לגרסה זו של התוסף אתה זקוק לפחות לגרסה {core_version_needed} של Home Assistant",
                 "visit_addon_page": "בקר בדף {name} לפרטים נוספים"
+            },
+            "documentation": {
+                "get_documentation": "קבלת תיעוד התוסף נכשלה, {error}"
+            },
+            "logs": {
+                "get_logs": "קבלת יומני התוסף נכשלה, {error}"
             }
         },
         "common": {
             "cancel": "בטל",
             "close": "סגור",
-            "save": "שמור"
+            "description": "תיאור",
+            "error": {
+                "unknown": "בעיה לא ידועה"
+            },
+            "failed_to_restart_name": "אתחול {name} נכשל.",
+            "failed_to_update_name": "עדכון {name} נכשל.",
+            "learn_more": "למד עוד",
+            "new_version_available": "גרסה חדשה זמינה",
+            "no": "לא",
+            "refresh": "רענן",
+            "reload": "טען מחדש",
+            "reset_defaults": "אפס לברירות מחדל",
+            "save": "שמור",
+            "yes": "כן"
         },
         "confirm": {
             "update": {
@@ -119,8 +143,34 @@
             }
         },
         "dialog": {
+            "network": {
+                "connected_to": "מחובר אל {ssid}",
+                "dhcp": "DHCP",
+                "disabled": "מושבת",
+                "dns_servers": "שרתי DNS",
+                "failed_to_change": "שינוי הגדרות הרשת נכשל",
+                "gateway": "כתובת Gateway",
+                "ip_netmask": "כתובת IP/Netmask",
+                "open": "פתוח",
+                "scan_ap": "חפש נקודות גישה",
+                "static": "סטטי",
+                "title": "הגדרות רשת",
+                "unsaved": "יש לך שינויים שלא נשמרו ויאבדו אם תעבור כרטיסיות, האם אתה רוצה להמשיך?",
+                "warning": "אם אתה משנה את כתובות ה- Wi-Fi, ה- IP או ה Gateway, אתה עלול לאבד את החיבור!",
+                "wep": "WEP",
+                "wpa": "wpa-psk"
+            },
             "registries": {
+                "add_new_registry": "הוסף מאגר חדש",
+                "add_registry": "הוסף מאגר",
+                "failed_to_add": "הוספת המאגר נכשלה",
+                "failed_to_remove": "הסרת המאגר נכשלה",
+                "no_registries": "לא הוגדרו מאגרים",
                 "password": "סיסמה",
+                "registry": "מאגר",
+                "remove": "הסר",
+                "title_add": "הוסף מאגר Container",
+                "title_manage": "ניהול מאגרי Container",
                 "username": "שם משתמש"
             },
             "repositories": {
@@ -141,6 +191,97 @@
         },
         "my": {
             "error_addon_not_found": "התוסף לא נמצא"
+        },
+        "snapshot": {
+            "addons": "תוספים",
+            "available_snapshots": "גיבויים זמינים",
+            "could_not_create": "לא ניתן ליצור גיבוי",
+            "create": "צור",
+            "create_blocked_not_running": "יצירת גיבוי אינה אפשרית כרגע מכיוון שהמערכת במצב {state} .",
+            "create_snapshot": "צור גיבוי",
+            "enter_password": "נא הזן סיסמה.",
+            "folder": {
+                "addons/local": "תוספות מקומיות",
+                "homeassistant": "תצורת Home Assistant",
+                "media": "תוכן",
+                "share": "שיתוף",
+                "ssl": "SSL"
+            },
+            "folders": "תיקיות",
+            "full_snapshot": "גיבוי מלא",
+            "name": "שם",
+            "no_snapshots": "אין לך גיבויים כרגע.",
+            "partial_snapshot": "גיבוי חלקי",
+            "password": "סיסמה",
+            "password_protected": "מוגן באמצעות סיסמה",
+            "password_protection": "הגנה באמצעות סיסמה",
+            "security": "אבטחה",
+            "type": "סוּג",
+            "upload_snapshot": "טען גיבוי"
+        },
+        "system": {
+            "host": {
+                "change_hostname": "שנה שם מכונה",
+                "confirm_reboot": "האם אתה בטוח שאתה מעוניין לאתחל שרת מארח?",
+                "confirm_shutdown": "האם אתה בטוח שאתה מעוניין לכבות שרת מארח?",
+                "docker_version": "גרסת Docker",
+                "failed_to_get_hardware_list": "קבלת רשימת החומרה נכשלה",
+                "failed_to_import_from_usb": "ייבוא מ- USB נכשל",
+                "failed_to_reboot": "אתחול המכונה נכשל",
+                "failed_to_set_hostname": "הגדרת שם המכונה נכשלה",
+                "failed_to_shutdown": "כיבוי המכונה נכשל",
+                "hardware": "חומרה",
+                "hostname": "שם מכונה",
+                "import_from_usb": "יבא מרכיב USB",
+                "ip_address": "כתובת IP",
+                "new_hostname": "אנא הזן שם מכונה חדש:",
+                "operating_system": "מערכת הפעלה",
+                "reboot_host": "אתחל שרת",
+                "shutdown_host": "כבה שרת מארח",
+                "used_space": "שטח בשימוש"
+            },
+            "supervisor": {
+                "beta_backup": "ודא שיש לך גיבויים של הנתונים לפני הפעלת תכונה זו.",
+                "beta_join_confirm": "האם אתה רוצה להצטרף לערוץ הבטא?",
+                "beta_release_items": "זה כולל גרסאות בטא עבור:",
+                "beta_warning": "גרסאות בטא מיועדות לבודקים ומאמצים מוקדמים ויכולות להכיל שינויי קוד לא יציבים",
+                "channel": "עָרוּץ",
+                "join_beta_action": "הצטרף לערוץ בטא",
+                "join_beta_description": "קבל עדכוני בטא עבור Home Assistant, Supervisor ומערכת ההפעלה",
+                "leave_beta_action": "עזוב את ערוץ הבטא",
+                "leave_beta_description": "קבל עדכונים יציבים עבור Home Assistant, Supervisor ומערכת ההפעלה",
+                "reload_supervisor": "טען מחדש את ה Supervisor",
+                "share_diagnostics": "שתף מידע אבחוני",
+                "share_diagnostics_description": "שתף דוחות קריסה ומידע אבחוני.",
+                "share_diagonstics_description": "האם ברצונך לשתף באופן אוטומטי דוחות קריסה ומידע אבחון כאשר ה Supervisor נתקל בשגיאות בלתי צפויות? {line_break} זה יאפשר לנו לתקן את הבעיות, המידע נגיש רק לצוות הליבה של Home Assistant ולא ישותף עם אחרים. {line_break} הנתונים אינם כוללים מידע פרטי/רגיש ובאפשרותך להפוך מידע זה ללא זמין בהגדרות בכל עת שתרצה.",
+                "share_diagonstics_title": "עזור לשפר את Home Assistant",
+                "unhealthy_description": "הפעלת התקנה לא בריאה תגרום לבעיות. להלן רשימת הבעיות שנמצאו בהתקנה שלך, לחץ על הקישורים כדי ללמוד כיצד תוכל לפתור את הבעיות.",
+                "unhealthy_reason": {
+                    "docker": "סביבת ה- Docker אינה פועלת כראוי",
+                    "privileged": "ל Supervisor אין הרשאות",
+                    "setup": "הגדרת ה Supervisor נכשלה",
+                    "supervisor": "עדכון ה Supervisor לא הצליח",
+                    "untrusted": "זוהה תוכן לא מהימן"
+                },
+                "unhealthy_title": "ההתקנה שלך אינה תקינה",
+                "unsupported_description": "למטה רשימת נושאים שנימצאו במהלך ההתקנה, לחץ על קישור על מנת ללמוד איך לפתור את הנושא",
+                "unsupported_reason": {
+                    "apparmor": "AppArmor אינו זמין במחשב המארח",
+                    "container": "ה Container ידוע כבעייתי",
+                    "content-trust": "אימות אמון תוכן מושבת",
+                    "dbus": "DBUS",
+                    "docker_configuration": "תצורת Docker",
+                    "docker_version": "גרסת Docker",
+                    "job_conditions": "התעלם מתנאי ה Job",
+                    "lxc": "LXC",
+                    "network_manager": "מנהל רשת",
+                    "os": "מערכת הפעלה",
+                    "privileged": "ל Supervisor אין הרשאות",
+                    "systemd": "Systemd"
+                },
+                "update_supervisor": "עדכן את ה Supervisor",
+                "warning": "אזהרה"
+            }
         }
     },
     "ui": {
@@ -342,6 +483,9 @@
                 "today": "היום"
             },
             "data-table": {
+                "clear": "נקה",
+                "filtering_by": "סינון לפי",
+                "hidden": "{number} חבוי",
                 "no-data": "אין נתונים",
                 "search": "חיפוש"
             },
@@ -398,7 +542,8 @@
                     "was_unlocked": "לא היה נעול",
                     "was_unplugged": "היה מנותק",
                     "was_unsafe": "היה לא בטוח"
-                }
+                },
+                "show_trace": "הצג מעקב"
             },
             "media-browser": {
                 "class": {
@@ -415,8 +560,10 @@
             "related-filter-menu": {
                 "filter_by_area": "סנן לפי אזור",
                 "filter_by_device": "סנן לפי מכשיר",
+                "filter_by_entity": "סנן לפי ישות",
                 "filtered_by_area": "אזור: {area_name}",
-                "filtered_by_device": "מכשיר: {device_name}"
+                "filtered_by_device": "מכשיר: {device_name}",
+                "filtered_by_entity": "ישות: {entity_name}"
             },
             "related-items": {
                 "area": "אֵזוֹר",
@@ -446,11 +593,11 @@
                 },
                 "never": "אף פעם לא",
                 "past_duration": {
-                    "day": "לפני {count} {count, plural,\n  one {day}\n  other {days}\n}",
+                    "day": "לפני {count} {count, plural,\n  one {יום}\n  other {ימים}\n}",
                     "hour": "לפני {count} {count, plural,\n  one {שעה}\n  other {שעות}\n}",
-                    "minute": "לפני {count} {count, plural,\n  one {minute}\n  other {minutes}\n}",
-                    "second": "לפני {count} {count, plural,\n  one {second}\n  other {seconds}\n}",
-                    "week": "לפני {count} {count, plural,\n  one {week}\n  other {weeks}\n}"
+                    "minute": "לפני {count} {count, plural,\n  one {דקה}\n  other {דקות}\n}",
+                    "second": "לפני {count} {count, plural,\n  one {שניה}\n  other {שניות}\n}",
+                    "week": "לפני {count} {count, plural,\n  one {שבוע}\n  other {שבועות}\n}"
                 }
             },
             "service-control": {
@@ -626,6 +773,11 @@
                         "perform_action": "{action} שרת",
                         "restart": "הפעל מחדש",
                         "stop": "עצור"
+                    },
+                    "types": {
+                        "navigation": "ניווט",
+                        "reload": "טען מחדש",
+                        "server_control": "שרת"
                     }
                 },
                 "filter_placeholder": "מסנן ישויות"
@@ -642,6 +794,7 @@
                 "buttons": {
                     "add": "הוסף מכשירים",
                     "clusters": "ניהול אשכולות",
+                    "device_children": "צפה בילדים",
                     "reconfigure": "הגדר מחדש את המכשיר",
                     "remove": "הסר מכשיר",
                     "zigbee_information": "מידע על Zigbee"
@@ -649,6 +802,7 @@
                 "confirmations": {
                     "remove": "האם אתה בטוח שברצונך למחוק מכשיר זה?"
                 },
+                "device_children": "ילדי מכשיר זיגבי",
                 "device_signature": "חתימת התקן Zigbee",
                 "last_seen": "נראה לאחרונה",
                 "manuf": "לפי {manufacturer}",
@@ -665,6 +819,9 @@
                 "zha_device_card": {
                     "device_name_placeholder": "שנה שם התקן"
                 }
+            },
+            "zha_reconfigure_device": {
+                "heading": "מגדיר תצורה מחדש של המכשיר"
             }
         },
         "duration": {
@@ -676,7 +833,16 @@
         },
         "errors": {
             "config": {
-                "key_wrong_type": "הערך שסופק עבור \"{key}\" אינו נתמך על-ידי העורך החזותי. אנו תומכים ({type_correct}) אך קיבלנו ({type_wrong})."
+                "key_wrong_type": "הערך שסופק עבור \"{key}\" אינו נתמך על-ידי העורך החזותי. אנו תומכים ({type_correct}) אך קיבלנו ({type_wrong}).",
+                "no_template_editor_support": "תבניות אינן נתמכות בעורך החזותי"
+            },
+            "supervisor": {
+                "ask": "בקש עזרה",
+                "observer": "בדוק את המשקיף",
+                "reboot": "נסה אתחול מחדש של המחשב המארח",
+                "system_health": "בדוק את בריאות המערכת",
+                "title": "לא היתה אפשרות לטעון את לוח ה Supervisor!",
+                "wait": "אם רק התחלת, ודא שנתת ל Supervisor מספיק זמן להתחיל."
             }
         },
         "login-form": {
@@ -693,10 +859,12 @@
         "notification_toast": {
             "connection_lost": "החיבור אבד. מתחבר מחדש...",
             "dismiss": "בטל",
+            "intergration_starting": "מפעיל את {integration} , לא הכל יהיה זמין עד לסיום.",
             "service_call_failed": "נכשלה הקריאה לשירות {service} .",
             "started": "Home Assistant עלה!",
             "starting": "Home Assistant בעלייה, ייתכן שלא הכל יהיה זמין עד שהעליה תסתיים",
-            "triggered": "הופעל {שם}"
+            "triggered": "הופעל {שם}",
+            "wrapping_up_startup": "סיום העליה, לא הכל יהיה זמין עד לסיום."
         },
         "panel": {
             "config": {
@@ -768,7 +936,12 @@
                                 "device_id": {
                                     "action": "פעולה",
                                     "extra_fields": {
-                                        "code": "קוד"
+                                        "brightness_pct": "בהירות",
+                                        "code": "קוד",
+                                        "flash": "הבהוב",
+                                        "humidity": "לחות",
+                                        "mode": "מצב",
+                                        "value": "ערך"
                                     },
                                     "label": "מכשיר"
                                 },
@@ -829,7 +1002,9 @@
                                     "extra_fields": {
                                         "above": "מעל",
                                         "below": "מתחת",
-                                        "for": "משך הזמן"
+                                        "for": "משך הזמן",
+                                        "hvac_mode": "מצב HVAC",
+                                        "preset_mode": "מצב מוגדר מראש"
                                     },
                                     "label": "מכשיר"
                                 },
@@ -912,6 +1087,7 @@
                         "move_down": "הזז למטה",
                         "move_up": "הזז למעלה",
                         "save": "שמור",
+                        "show_trace": "הצג מעקב",
                         "triggers": {
                             "add": "הוספת טריגר",
                             "delete": "מחק",
@@ -1014,6 +1190,8 @@
                         "add_automation": "הוסף אוטומציה",
                         "delete_automation": "מחק אוטומציה",
                         "delete_confirm": "האם אתה בטוח שברצונך למחוק אוטומציה זו?",
+                        "dev_automation": "דבג אוטומציה",
+                        "dev_only_editable": "רק אוטומציות שהוקצה להן מזהה ייחודי ניתנות לדיבוג.",
                         "edit_automation": "ערוך אוטומציה",
                         "header": "עורך אוטומציה",
                         "headers": {
@@ -1052,6 +1230,8 @@
                         "unsupported_blueprint": "שרטוט זה לא נתמך",
                         "url": "כתובת URL של השרטוט"
                     },
+                    "caption": "שרטוטים",
+                    "description": "ניהול שרטוטים",
                     "overview": {
                         "add_blueprint": "יבוא שרטוט",
                         "confirm_delete_text": "האם אתה בטוח שברצונך למחוק שרטוט זה?",
@@ -1062,6 +1242,8 @@
                             "file_name": "שם קובץ"
                         },
                         "learn_more": "למד עוד אודות שימוש בשרטוטים",
+                        "share_blueprint": "שתף שרטוט",
+                        "share_blueprint_no_url": "אין אפשרות לשתף שרטוט: אין כתובת URL",
                         "use_blueprint": "צור אוטומציה"
                     }
                 },
@@ -1244,7 +1426,34 @@
                     "section": {
                         "core": {
                             "analytics": {
-                                "learn_more": "למד עוד על אופן עיבוד הנתונים שלך."
+                                "documentation": "לפני שתאפשר זאת וודא שאתה מבקר בדף תיעוד המידע {link} כדי להבין מה אתה שולח ואיך זה נשמר.",
+                                "header": "ניתוח",
+                                "instance_id": "מזהה מופע: {huuid}",
+                                "introduction": "שתף את פרטי ההתקנה שלך כדי לעזור לשפר את Home Assistant ולעזור לנו לשכנע יצרנים להוסיף שליטה מקומית ותכונות ממוקדות לפרטיות.",
+                                "learn_more": "למד עוד על אופן עיבוד הנתונים שלך.",
+                                "needs_base": "עליך לאפשר ניתוח בסיס כדי שאפשרות זו תהיה זמינה",
+                                "preference": {
+                                    "base": {
+                                        "description": "מזהה מופע, גרסה וסוג התקנה.",
+                                        "title": "ניתוח בסיסי"
+                                    },
+                                    "diagnostics": {
+                                        "description": "שתף דוחות קריסה כאשר מתרחשות שגיאות בלתי צפויות.",
+                                        "title": "אבחון"
+                                    },
+                                    "statistics": {
+                                        "description": "סה\"כ ישויות בשימוש, משתמשים ואלמנטים אחרים.",
+                                        "title": "סטטיסטיקות שימוש"
+                                    },
+                                    "usage_supervisor": {
+                                        "description": "שמות, גרסאות ויכולות.",
+                                        "title": "שילובים ותוספות שבשימוש"
+                                    },
+                                    "usage": {
+                                        "description": "מידע אודות שמות וגרסאות",
+                                        "title": "אינטגרציות שבשימוש"
+                                    }
+                                }
                             },
                             "core_config": {
                                 "edit_requires_storage": "העורך מושבת משום שהתצורה מאוחסנת ב- configuration.yaml.",
@@ -1482,10 +1691,20 @@
                     "caption": "אינטגרציות",
                     "config_entry": {
                         "area": "ב-{area}",
+                        "check_the_logs": "בדוק את היומנים",
+                        "configure": "הגדר",
                         "delete": "מחק",
                         "delete_confirm": "האם אתה בטוח שברצונך למחוק אינטגרציה זו?",
+                        "depends_on_cloud": "תלוי בענן",
                         "device_unavailable": "מכשיר אינו זמין",
                         "devices": "{count} {count, plural,\n  one {device}\n  other {devices}\n}",
+                        "disable": {
+                            "disabled_by": {
+                                "device": "מכשיר",
+                                "integration": "אינטגרציה",
+                                "user": "משתמש"
+                            }
+                        },
                         "documentation": "תיעוד",
                         "entities": "{count} {count, plural,\n  one {entity}\n  other {entities}\n}",
                         "entity_unavailable": "ישות לא זמינה",
@@ -1496,8 +1715,17 @@
                         "no_area": "ללא אזור",
                         "not_loaded": "לא נטען, בדוק את {logs_link}",
                         "options": "אפשרויות",
+                        "provided_by_custom_integration": "מסופק על ידי אינטגרציה מותאמת אישית",
                         "rename": "שנה שם",
                         "restart_confirm": "הפעל מחדש את Home Assistant כדי להשלים את הסרת האינטגרציה",
+                        "state": {
+                            "failed_unload": "ביטול הטעינה נכשל",
+                            "loaded": "טעון",
+                            "migration_error": "שגיאת המרה",
+                            "not_loaded": "לא טעון",
+                            "setup_error": "ההגדרה נכשלה",
+                            "setup_retry": "מנסה להגדיר מחדש"
+                        },
                         "system_options": "אפשרויות מערכת",
                         "unnamed_entry": "ערך ללא שם"
                     },
@@ -1521,6 +1749,9 @@
                     "configured": "הוגדר",
                     "description": "ניהול והגדרת אינטגרציות",
                     "details": "פרטי האינטגרציה",
+                    "disable": {
+                        "show": "הצג"
+                    },
                     "discovered": "זוהו",
                     "home_assistant_website": "אתר Home Assistant",
                     "ignore": {
@@ -1551,8 +1782,10 @@
                 "logs": {
                     "caption": "יומנים",
                     "clear": "נקה",
+                    "custom_integration": "אינטגרציה מותאמת אישית",
                     "description": "צפה ביומני Home Assistant",
                     "details": "פרטי יומן האירועים ({level})",
+                    "error_from_custom_integration": "מקור השגיאה הזו הוא אינטגרציה מותאמת אישית.",
                     "level": {
                         "critical": "CRITICAL",
                         "debug": "DEBUG",
@@ -2019,6 +2252,7 @@
                         "caption": "רשת"
                     },
                     "visualization": {
+                        "auto_zoom": "זום אוטומטי",
                         "caption": "ויזואליזציה",
                         "header": "הדמית רשת",
                         "highlight_label": "הדגש התקנים",
@@ -2063,6 +2297,18 @@
                         "dump_not_ready_text": "אם אתה יוצר ייצוא בזמן שלא כל הצמתים מוכנים, אתה עלול לפספס את הנתונים הדרושים. תן לרשת שלך זמן לשאילת כל הצמתים. האם אתה רוצה להמשיך?",
                         "dump_not_ready_title": "עדיין לא כל הצמתים מוכנים",
                         "nodes_ready": "צמתים מוכנים"
+                    },
+                    "device_info": {
+                        "device_config": "הגדר את המכשיר"
+                    },
+                    "node_config": {
+                        "attribution": "פרמטרים ותיאורי תצורת המכשיר מסופקים על ידי {device_database}",
+                        "battery_device_notice": "התקני סוללה חייבים להיות ערים כדי לעדכן את תצורתם. נא עיין במדריך למשתמש לקבלת הוראות כיצד להעיר את ההתקן.",
+                        "error_device_not_found": "ההתקן לא נמצא",
+                        "header": "תצורת מכשיר Z-Wave",
+                        "introduction": "נהל והתאם פרמטרי תצורה ספציפיים למכשיר (צומת) עבור ההתקן שנבחר",
+                        "parameter_is_read_only": "פרמטר זה מוגדר לקריאה בלבד.",
+                        "zwave_js_device_database": "מאגר התקני Z-Wave JS"
                     }
                 },
                 "zwave": {
@@ -2185,6 +2431,7 @@
                         "column_parameter": "פרמטר",
                         "description": "כלי הפיתוח של השירותים מאפשר לך לקרוא לכל שירות ב Home Assistant.",
                         "fill_example_data": "מלא נתונים לדוגמה",
+                        "no_template_ui_support": "ממשק המשתמש אינו תומך בתבניות, עדיין תוכל להשתמש בעורך ה YAML.",
                         "title": "שירותים"
                     },
                     "states": {
@@ -2214,6 +2461,17 @@
                     }
                 }
             },
+            "error": {
+                "go_back": "חזור",
+                "supervisor": {
+                    "ask": "בקש עזרה",
+                    "observer": "בדוק את הצופה",
+                    "reboot": "נסה אתחול מחדש של המחשב המארח",
+                    "system_health": "בדוק את בריאות המערכת",
+                    "title": "לא היתה אפשרות לטעון את לוח ה Supervisor!",
+                    "wait": "אם רק התחלת, ודא שנתת ל Supervisor מספיק זמן להתחיל."
+                }
+            },
             "history": {
                 "ranges": {
                     "last_week": "שבוע שעבר",
@@ -2536,7 +2794,7 @@
                         "delete": "מחק תצוגה",
                         "edit": "ערוך תצוגה",
                         "header": "הצג הגדרות",
-                        "header_name": "{name} הצג את תצורת",
+                        "header_name": "הצג את תצורת {name}",
                         "move_left": "הזז את התצוגה שמאלה",
                         "move_right": "הזז את התצוגה ימינה",
                         "tab_badges": "תגים",
@@ -2898,6 +3156,19 @@
                     "enable": "הפעל",
                     "header": "מודלי אימות מרובה גורמים"
                 },
+                "number_format": {
+                    "description": "בחר כיצד מוצגים מספרים.",
+                    "dropdown_label": "פורמט מספר",
+                    "formats": {
+                        "comma_decimal": "1,234,567.89",
+                        "decimal_comma": "1.234.567,89",
+                        "language": "אוטומטי (השתמש בהגדרות השפה)",
+                        "none": "לא נבחר",
+                        "space_comma": "1 234 567,89",
+                        "system": "השתמש ב System Locale"
+                    },
+                    "header": "פורמט מספר"
+                },
                 "push_notifications": {
                     "add_device_prompt": {
                         "input_label": "שם התקן",
diff --git a/translations/frontend/hi.json b/translations/frontend/hi.json
index e73077b21e..5e66dd1958 100644
--- a/translations/frontend/hi.json
+++ b/translations/frontend/hi.json
@@ -14,24 +14,48 @@
             "fan_mode": {
                 "off": "बंद",
                 "on": "चालू"
+            },
+            "hvac_action": {
+                "cooling": "थन्दा",
+                "drying": "सुखाना",
+                "fan": "पंखा",
+                "heating": "गरमाना",
+                "idle": "खाली",
+                "off": "बंद"
+            },
+            "preset_mode": {
+                "away": "बाहर",
+                "comfort": "पर्याप्त",
+                "eco": "किफ़ायत",
+                "home": "घर",
+                "none": "कुच भि नहि",
+                "sleep": "निद्रा"
+            }
+        },
+        "humidifier": {
+            "mode": {
+                "normal": "सामान्य"
             }
         }
     },
     "state_badge": {
         "alarm_control_panel": {
+            "armed_custom_bypass": "सशस्त्र",
             "pending": "अपूर्ण"
         },
         "default": {
             "entity_not_found": "Entità non trovata",
-            "error": "Errore",
+            "error": "ग़लती",
             "unavailable": "अनुपलब्ध",
             "unknown": "अज्ञात"
         },
         "device_tracker": {
-            "home": "घर"
+            "home": "घर",
+            "not_home": "बाहर"
         },
         "person": {
-            "home": "घर"
+            "home": "घर",
+            "not_home": "बाहर"
         }
     },
     "state": {
@@ -57,6 +81,11 @@
             "previous": "पिछला",
             "undo": "पूर्ववत करें"
         },
+        "components": {
+            "history_charts": {
+                "no_history_found": "स्थिति के कोइ भि पहले रिकार्ड नहि मिले"
+            }
+        },
         "dialogs": {
             "mqtt_device_debug_info": {
                 "entities": "संस्थाएं",
@@ -75,6 +104,14 @@
             "day": "{count} {count, plural,\n  one {दिन}\n  other {दिन}\n}",
             "week": "{count} {count, plural,\n  one {हफ़्ता}\n  other {हफ़्ते}\n}"
         },
+        "errors": {
+            "supervisor": {
+                "ask": "मदद के लिए पूछें",
+                "observer": "प्रेक्षक (Observer) की जाँच करें",
+                "reboot": "मशीन पुनः आरंभ करने का प्रयास करें",
+                "system_health": "उप्करन के स्वस्थ्य कि जाँच करे"
+            }
+        },
         "notification_drawer": {
             "empty": "सूचनाएँ नहीं हैं",
             "title": "सूचनाएँ"
@@ -133,12 +170,15 @@
                     "picker": {
                         "headers": {
                             "name": "नाम"
-                        }
+                        },
+                        "no_automations": "हमें कोई AUTOMATION नहीं मिला"
                     }
                 },
                 "cloud": {
                     "account": {
                         "google": {
+                            "enable_ha_skill": "Home Assistant Cloud कौशल सक्रिय करे Google Assistant के लिय",
+                            "not_configured_title": "Google Assistant सक्रिय नहीं है",
                             "title": "Google Assistant"
                         },
                         "thank_you_note": "होम असिस्टेंट क्लाउड का हिस्सा बनने के लिए धन्यवाद। यह आप जैसे लोगों की वजह से है कि हम हर किसी के लिए एक शानदार होम ऑटोमेशन अनुभव बनाने में सक्षम हैं। धन्यवाद!"
@@ -163,6 +203,27 @@
                         "password": "पासवर्ड"
                     }
                 },
+                "core": {
+                    "section": {
+                        "core": {
+                            "analytics": {
+                                "learn_more": "हम आपके जानकारी को कैसे संसाधित करते हैं",
+                                "preference": {
+                                    "diagnostics": {
+                                        "description": "अप्रत्याशित त्रुटि होने पर क्रैश रिपोर्ट साझा करें"
+                                    },
+                                    "usage_supervisor": {
+                                        "description": "नाम, संस्करण और क्षमताएं"
+                                    },
+                                    "usage": {
+                                        "description": "नाम और संस्करण जानकारी",
+                                        "title": "उप्योग किये एकीकरण"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
                 "filtering": {
                     "clear": "विशद",
                     "filtering_by": "द्वारा छान रहे हैं"
@@ -170,8 +231,19 @@
                 "integrations": {
                     "add_integration": "एकीकरण जोड़ें",
                     "config_entry": {
+                        "check_the_logs": "अभिलेख जाँच करें",
                         "delete": "हटाएं",
+                        "not_loaded": "तैयार नहीं हैं",
+                        "provided_by_custom_integration": "विशेष एकीकरण से उप्लब्ध",
                         "rename": "नाम बदलें",
+                        "state": {
+                            "failed_unload": "खाली करने मे असफल",
+                            "loaded": "तैयार",
+                            "migration_error": "प्रवसन दोष",
+                            "not_loaded": "तैयार नहीं हैं",
+                            "setup_error": "एकीकरण करने में विफल",
+                            "setup_retry": "एकीकरण के लिय पुन: प्रयास जारी है"
+                        },
                         "system_options": "सिस्टम विकल्प"
                     },
                     "integration": "एकीकरण",
@@ -180,6 +252,18 @@
                     "rename_input_label": "प्रवेश का नाम"
                 },
                 "introduction": "In questa schermata è possibile configurare Home Assistant e i suoi componenti. Non è ancora possibile configurare tutto tramite l'interfaccia, ma ci stiamo lavorando.",
+                "logs": {
+                    "custom_integration": "िशेष एकीकरण",
+                    "error_from_custom_integration": "ये दोश िशेष एकीकरण की वजह से है",
+                    "level": {
+                        "critical": "अभिलेख स्तर CRITICAL",
+                        "debug": "अभिलेख स्तर DEBUG",
+                        "error": "अभिलेख स्तर ERROR",
+                        "info": "अभिलेख स्तर INFO",
+                        "warning": "अभिलेख स्तर WARNING"
+                    },
+                    "no_errors": "कोई त्रुटी नहीं बताई गई है"
+                },
                 "mqtt": {
                     "title": "MQTT"
                 },
@@ -188,11 +272,17 @@
                         "unknown": "अनजान"
                     }
                 },
+                "scene": {
+                    "picker": {
+                        "no_scenes": "हमें कोई SCENE नहीं मिला"
+                    }
+                },
                 "script": {
                     "picker": {
                         "headers": {
                             "name": "नाम"
-                        }
+                        },
+                        "no_scripts": "हमें कोई SCRIPT नहीं मिला"
                     }
                 },
                 "users": {
@@ -229,6 +319,11 @@
                     "services": {
                         "title": "सेवाएं"
                     },
+                    "states": {
+                        "filter_states": "स्थिति छन्नी",
+                        "set_state": "स्थिति निर्धारित करे",
+                        "state": "स्थिति"
+                    },
                     "templates": {
                         "title": "टेम्पलेट्स"
                     }
@@ -236,6 +331,9 @@
             },
             "lovelace": {
                 "cards": {
+                    "empty_state": {
+                        "title": "स्वागत है घर मै"
+                    },
                     "starting": {
                         "description": "होम असिस्टेंट शुरू हो रहा है, कृपया प्रतीक्षा करें ..."
                     }
@@ -245,11 +343,21 @@
                 },
                 "editor": {
                     "card": {
+                        "alarm-panel": {
+                            "available_states": "उप्लब्दह स्थिति"
+                        },
+                        "conditional": {
+                            "current_state": "वरतमान",
+                            "state_equal": "स्थिति इस के बराबर है",
+                            "state_not_equal": "स्थिति इस के बराबर नहि है"
+                        },
                         "entity": {
-                            "description": "एंटिटी कार्ड आपको अपनी इकाई की स्थिति का त्वरित अवलोकन देता है।"
+                            "description": "स्थिति कार्ड आपको अपनी इकाई की स्थिति का संक्षेप देता है।"
                         },
                         "generic": {
-                            "double_tap_action": "डबल टैप एक्शन"
+                            "double_tap_action": "डबल टैप एक्शन",
+                            "show_state": "स्थिति दिखाएं?",
+                            "state": "स्थिति"
                         },
                         "map": {
                             "hours_to_show": "hours to show"
diff --git a/translations/frontend/id.json b/translations/frontend/id.json
index 55e4d150c1..fafa0de0fa 100644
--- a/translations/frontend/id.json
+++ b/translations/frontend/id.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Instalasi Anda tidak sehat",
                 "unsupported_description": "Di bawah ini adalah daftar masalah yang ditemukan pada instalasi Anda, klik pada tautan untuk mempelajari cara menyelesaikan masalah tersebut.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor tidak diaktifkan di host",
                     "container": "Kontainer diketahui menyebabkan masalah",
                     "content-trust": "Validasi kepercayaan konten dinonaktifkan",
                     "dbus": "DBUS",
@@ -723,6 +724,9 @@
                 "today": "Hari ini"
             },
             "data-table": {
+                "clear": "Hapus",
+                "filtering_by": "Filter menurut",
+                "hidden": "{number} disembunyikan",
                 "no-data": "Tidak ada data",
                 "search": "Cari"
             },
@@ -837,6 +841,14 @@
                 "label": "Gambar",
                 "unsupported_format": "Format tidak didukung, pilih gambar JPEG, PNG, atau GIF."
             },
+            "related-filter-menu": {
+                "filter_by_area": "Filter menurut area",
+                "filter_by_device": "Filter menurut perangkat",
+                "filter_by_entity": "Filter menurut entitas",
+                "filtered_by_area": "area: {area_name}",
+                "filtered_by_device": "perangkat: {device_name}",
+                "filtered_by_entity": "entitas: {entity_name}"
+            },
             "related-items": {
                 "area": "Area",
                 "automation": "Bagian dari otomasi berikut",
@@ -1179,6 +1191,9 @@
                 "zha_device_card": {
                     "device_name_placeholder": "Ubah nama perangkat"
                 }
+            },
+            "zha_reconfigure_device": {
+                "heading": "Mengonfigurasi ulang perangkat"
             }
         },
         "duration": {
@@ -1199,6 +1214,14 @@
                 "key_wrong_type": "Nilai yang disediakan untuk \"{key}\" tidak didukung oleh editor visual. Kami mendukung ({type_correct}) tetapi diterima ({type_wrong}).",
                 "no_template_editor_support": "Templat tidak didukung di editor visual",
                 "no_type_provided": "Tidak ada tipe yang tersedia."
+            },
+            "supervisor": {
+                "ask": "Dapatkan bantuan",
+                "observer": "Periksa Observer",
+                "reboot": "Coba me-reboot host",
+                "system_health": "Periksa Kesehatan Sistem",
+                "title": "Tidak dapat memuat panel Supervisor!",
+                "wait": "Jika Anda baru saja memulai, pastikan Anda telah memberikan cukup waktu kepada Supervisor untuk memulai."
             }
         },
         "login-form": {
@@ -1216,10 +1239,12 @@
         "notification_toast": {
             "connection_lost": "Koneksi terputus. Menghubungkan kembali…",
             "dismiss": "Tutup",
+            "intergration_starting": "Memulai {integration}, tidak semuanya akan tersedia hingga prosesnya selesai.",
             "service_call_failed": "Gagal memanggil layanan {service}.",
             "started": "Home Assistant telah dimulai!",
             "starting": "Home Assistant sedang dimulai, belum semuanya akan tersedia hingga selesai.",
-            "triggered": "Dipicu {name}"
+            "triggered": "Dipicu {name}",
+            "wrapping_up_startup": "Menyelesaikan proses mulai, tidak semuanya akan tersedia hingga prosesnya selesai."
         },
         "panel": {
             "config": {
@@ -1307,6 +1332,7 @@
                                     "extra_fields": {
                                         "brightness_pct": "Kecerahan",
                                         "code": "Kode",
+                                        "flash": "Flash",
                                         "humidity": "Kelembaban",
                                         "message": "Pesan",
                                         "mode": "Mode",
@@ -1472,6 +1498,7 @@
                         "move_down": "Pindahkan ke bawah",
                         "move_up": "Pindahkan ke atas",
                         "save": "Simpan",
+                        "show_trace": "Tampilkan jejak",
                         "triggers": {
                             "add": "Tambah pemicu",
                             "delete": "Hapus",
@@ -1678,6 +1705,8 @@
                             "info": "Dengan integrasi Google Assistant untuk Home Assistant Cloud, Anda akan dapat mengontrol semua perangkat Home Assistant melalui perangkat yang mendukung Home Assistant.",
                             "info_state_reporting": "Jika Anda mengaktifkan pelaporan status, Home Assistant akan mengirim semua perubahan status entitas yang terpapar ke Google. Ini memungkinkan Anda untuk selalu melihat status terbaru di aplikasi Google.",
                             "manage_entities": "Kelola Entitas",
+                            "not_configured_text": "Sebelum dapat menggunakan Asisten Google, Anda harus mengaktifkan keterampilan Home Assistant Cloud untuk Asisten Google di aplikasi Google Home.",
+                            "not_configured_title": "Asisten Google tidak diaktifkan",
                             "security_devices": "Perangkat Keamanan",
                             "sync_entities": "Sinkronkan Entitas ke Google",
                             "sync_entities_404_message": "Gagal menyinkronkan entitas Anda ke Google, minta Google 'Ok Google, sinkronkan perangkat saya' untuk menyinkronkan entitas Anda.",
@@ -1840,6 +1869,21 @@
                     "description": "Sistem unit, lokasi, zona waktu & parameter umum lainnya",
                     "section": {
                         "core": {
+                            "analytics": {
+                                "documentation": "Sebelum Anda mengaktifkan, pastikan Anda mengunjungi halaman dokumentasi analitika {link} untuk memahami apa yang Anda kirim dan bagaimana penyimpanannya.",
+                                "header": "Analitika",
+                                "instance_id": "ID Instans: {huuid}",
+                                "learn_more": "Cara kami memproses data Anda",
+                                "needs_base": "Anda perlu mengaktifkan analitik dasar agar opsi ini tersedia",
+                                "preference": {
+                                    "base": {
+                                        "description": "ID instans, versi, dan jenis instalasi."
+                                    },
+                                    "usage_supervisor": {
+                                        "title": "Integrasi dan add-on yang digunakan"
+                                    }
+                                }
+                            },
                             "core_config": {
                                 "edit_requires_storage": "Editor dinonaktifkan karena konfigurasi disimpan dalam configuration.yaml.",
                                 "elevation": "Ketinggian",
@@ -2027,6 +2071,9 @@
                     "filtering_by": "Filter menurut",
                     "show": "Tampilkan"
                 },
+                "hassio": {
+                    "button": "Konfigurasi"
+                },
                 "header": "Mengonfigurasi Home Assistant",
                 "helpers": {
                     "caption": "Pembantu",
@@ -2113,8 +2160,10 @@
                         "entity_unavailable": "Entitas tidak tersedia",
                         "firmware": "Firmware: {version}",
                         "hub": "Terhubung via",
+                        "logs": "log",
                         "manuf": "oleh {manufacturer}",
                         "no_area": "Tidak Ada Area",
+                        "not_loaded": "Tidak dimuat, periksa {logs_link}",
                         "options": "Opsi",
                         "reload": "Muat Ulang",
                         "reload_confirm": "Integrasi telah dimuat ulang",
@@ -2140,6 +2189,7 @@
                         "finish": "Selesai",
                         "loading_first_time": "Mohon tunggu sementara integrasi sedang dipasang",
                         "not_all_required_fields": "Belum semua bidang wajib telah terisi.",
+                        "not_loaded": "Integrasi tidak dapat dimuat, coba mulai ulang Home Assistant.",
                         "pick_flow_step": {
                             "new_flow": "Tidak, siapkan instans {integration} lainnya",
                             "title": "Kami menemukan yang berikut, ingin menyiapkannya?"
@@ -2154,6 +2204,7 @@
                     "disable": {
                         "disabled_integrations": "{number} dinonaktifkan",
                         "hide_disabled": "Sembunyikan integrasi yang dinonaktifkan",
+                        "show": "Tampilkan",
                         "show_disabled": "Tampilkan integrasi yang dinonaktifkan"
                     },
                     "discovered": "Ditemukan",
@@ -2189,6 +2240,13 @@
                     "clear": "Bersihkan",
                     "description": "Lihat log Home Assistant",
                     "details": "Detail Log ({level})",
+                    "level": {
+                        "critical": "CRITICAL",
+                        "debug": "DEBUG",
+                        "error": "ERROR",
+                        "info": "INFO",
+                        "warning": "WARNING"
+                    },
                     "load_full_log": "Muat Log Lengkap Home Assistant",
                     "loading_log": "Memuat log kesalahan…",
                     "multiple_messages": "pesan pertama kali muncul pada {time} dan muncul {counter} kali",
@@ -3674,6 +3732,10 @@
                 }
             },
             "page-onboarding": {
+                "analytics": {
+                    "finish": "Berikutnya",
+                    "intro": "Bagikan analitika dari instans Anda. Data ini akan tersedia untuk umum di {link}"
+                },
                 "core-config": {
                     "button_detect": "Deteksi",
                     "finish": "Berikutnya",
@@ -3683,12 +3745,14 @@
                     "location_name": "Beri nama instalasi Home Assistant Anda",
                     "location_name_default": "Rumah"
                 },
+                "finish": "Selesai",
                 "integration": {
                     "finish": "Selesai",
                     "intro": "Perangkat dan layanan diwakili di Home Assistant sebagai integrasi. Anda dapat mengaturnya sekarang, atau melakukannya nanti dari layar konfigurasi.",
                     "more_integrations": "Lebih Lanjut"
                 },
                 "intro": "Siap untuk membuat rumah Anda lebih hidup, merebut kembali privasi Anda, dan bergabung dengan komunitas pemikir di seluruh dunia?",
+                "next": "Berikutnya",
                 "restore": {
                     "description": "Atau, Anda dapat memulihkan dari snapshot sebelumnya.",
                     "hide_log": "Sembunyikan log lengkap",
@@ -3783,6 +3847,19 @@
                     "enable": "Aktifkan",
                     "header": "Modul Autentikasi Multifaktor"
                 },
+                "number_format": {
+                    "description": "Pilih cara pemformatan bilangan",
+                    "dropdown_label": "Format bilangan",
+                    "formats": {
+                        "comma_decimal": "1,234,567.89",
+                        "decimal_comma": "1.234.567,89",
+                        "language": "Otomatis (gunakan pengaturan bahasa)",
+                        "none": "Tidak ada",
+                        "space_comma": "1 234 567,89",
+                        "system": "Gunakan pelokalan sistem"
+                    },
+                    "header": "Format Bilangan"
+                },
                 "push_notifications": {
                     "add_device_prompt": {
                         "input_label": "Nama perangkat",
diff --git a/translations/frontend/it.json b/translations/frontend/it.json
index 217bb31b80..5c10d7d9f8 100644
--- a/translations/frontend/it.json
+++ b/translations/frontend/it.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "L'installazione non è integra",
                 "unsupported_description": "Di seguito è riportato un elenco dei problemi riscontrati con l'installazione, fare clic sui collegamenti per scoprire come risolvere i problemi.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor non è abilitato sull'host",
                     "container": "Container noti per causare problemi",
                     "content-trust": "La convalida dell'attendibilità del contenuto è disabilitata",
                     "dbus": "DBUS",
@@ -706,7 +707,7 @@
                     "text": "Inserisci il nome della nuova area.",
                     "title": "Aggiungi nuova area"
                 },
-                "add_new": "Aggiungi nuova area…",
+                "add_new": "Aggiungi nuova area",
                 "area": "Area",
                 "clear": "Cancella",
                 "no_areas": "Non hai aree",
@@ -885,6 +886,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Documentazione dell'integrazione",
                 "required": "Questo campo è obbligatorio",
                 "service_data": "Dati del servizio",
                 "target": "Destinazioni",
@@ -1213,6 +1215,14 @@
                 "key_wrong_type": "Il valore fornito per \"{key}\" non è supportato dall'editor visivo. Supportiamo ({type_correct}) ma ricevuto ({type_wrong}).",
                 "no_template_editor_support": "Modelli non supportati nell'editor visivo",
                 "no_type_provided": "Nessun tipo fornito."
+            },
+            "supervisor": {
+                "ask": "Chiedere aiuto",
+                "observer": "Controlla l'Observer",
+                "reboot": "Prova a riavviare l'host",
+                "system_health": "Controlla l'integrità del sistema",
+                "title": "Impossibile caricare il pannello Supervisor!",
+                "wait": "Se hai appena avviato, assicurati di aver dato al Supervisor abbastanza tempo per partire."
             }
         },
         "login-form": {
@@ -1230,10 +1240,12 @@
         "notification_toast": {
             "connection_lost": "Connessione persa. Riconnessione…",
             "dismiss": "Rimuovi",
+            "intergration_starting": "{integration} si sta avviando, non tutto sarà disponibile fino ad avvio completo.",
             "service_call_failed": "Fallita chiamata a servizio {service} .",
             "started": "Home Assistant si è avviato!",
             "starting": "Home Assistant si sta avviando, non tutto sarà disponibile fino ad avvio completo.",
-            "triggered": "Attivato {name}"
+            "triggered": "Attivato {name}",
+            "wrapping_up_startup": "Si sta concludendo l'avvio, non tutto sarà disponibile fino al termine."
         },
         "panel": {
             "config": {
@@ -1597,7 +1609,7 @@
                         "delete_automation": "Elimina automazione",
                         "delete_confirm": "Sei sicuro di voler eliminare questa automazione?",
                         "dev_automation": "Debug dell'automazione",
-                        "dev_only_editable": "È possibile eseguire il debug solo delle automazioni definite in automations.yaml.",
+                        "dev_only_editable": "Solo le automazioni che hanno assegnato un ID univoco sono debuggabili.",
                         "duplicate": "Duplica",
                         "duplicate_automation": "Duplica automazione",
                         "edit_automation": "Modifica automazione",
@@ -1684,7 +1696,7 @@
                         },
                         "connected": "Connesso",
                         "connection_status": "Stato della connessione cloud",
-                        "fetching_subscription": "Recupero abbonamento ...",
+                        "fetching_subscription": "Recupero iscrizione in corso...",
                         "google": {
                             "config_documentation": "Documentazione di configurazione",
                             "devices_pin": "PIN dei dispositivi di sicurezza",
@@ -1740,7 +1752,7 @@
                             "disable_hook_error_msg": "Impossibile disabilitare webhook:",
                             "info": "Tutto ciò che è configurato per essere attivato da un webhook può essere dotato di un URL accessibile pubblicamente per consentire d'inviare i dati ad Home Assistant da qualsiasi luogo, senza esporre la vostra istanza a Internet.",
                             "link_learn_more": "Ulteriori informazioni sulla creazione di automazioni basate su webhook.",
-                            "loading": "Caricamento in corso ...",
+                            "loading": "Caricamento in corso...",
                             "manage": "Gestisci",
                             "no_hooks_yet": "Sembra che tu non abbia ancora dei webhook. Per iniziare, configurare un ",
                             "no_hooks_yet_link_automation": "automazione webhook",
@@ -1864,28 +1876,28 @@
                                 "documentation": "Prima di abilitarlo, assicurati di visitare la pagina della documentazione di analisi {link} per capire cosa stai inviando e come viene archiviato.",
                                 "header": "Analisi",
                                 "instance_id": "ID istanza: {huuid}",
-                                "introduction": "Condividi l'analisi dalla tua istanza. Questi dati saranno disponibili pubblicamente all'indirizzo {link}",
-                                "learn_more": "Scopri di più su come verranno elaborati i tuoi dati.",
+                                "introduction": "Condividi le informazioni di installazione per migliorare Home Assistant e aiutarci a convincere i produttori ad aggiungere funzionalità incentrate sul controllo locale e sulla privacy.",
+                                "learn_more": "Come elaboriamo i tuoi dati",
                                 "needs_base": "È necessario abilitare l'analisi di base affinché questa opzione sia disponibile",
                                 "preference": {
                                     "base": {
-                                        "description": "Questo include l'ID dell'istanza, la versione e il tipo di installazione",
+                                        "description": "ID dell'istanza, versione e tipo di installazione.",
                                         "title": "Analisi di base"
                                     },
                                     "diagnostics": {
-                                        "description": "Condividi i rapporti sugli arresti anomali e le informazioni diagnostiche",
+                                        "description": "Condividi i rapporti sugli arresti anomali quando si verificano errori imprevisti.",
                                         "title": "Diagnostica"
                                     },
                                     "statistics": {
-                                        "description": "Questo include un conteggio degli elementi nella tua installazione, per un elenco completo guarda la documentazione",
+                                        "description": "Totale entità, utenti e altri elementi utilizzati.",
                                         "title": "Statistiche d'uso"
                                     },
                                     "usage_supervisor": {
-                                        "description": "Questo include i nomi e le funzionalità delle integrazioni e dei componenti aggiuntivi",
+                                        "description": "Nomi, versioni e funzionalità.",
                                         "title": "Integrazioni e componenti aggiuntivi utilizzati"
                                     },
                                     "usage": {
-                                        "description": "Questo include i nomi delle tue integrazioni",
+                                        "description": "Nomi e informazioni sulla versione.",
                                         "title": "Integrazioni usate"
                                     }
                                 }
@@ -2145,8 +2157,11 @@
                     "caption": "Integrazioni",
                     "config_entry": {
                         "area": "In {area}",
+                        "check_the_logs": "Controlla i registri",
+                        "configure": "Configura",
                         "delete": "Elimina",
                         "delete_confirm": "Sei sicuro di voler eliminare questa integrazione?",
+                        "depends_on_cloud": "Dipende dal cloud",
                         "device_unavailable": "Dispositivo non disponibile",
                         "devices": "{count} {count, plural, \none {dispositivo}\nother {dispositivi}\n}",
                         "disable_restart_confirm": "Riavvia Home Assistant per terminare la disabilitazione di questa integrazione",
@@ -2169,14 +2184,23 @@
                         "logs": "registri",
                         "manuf": "da {manufacturer}",
                         "no_area": "Nessuna area",
-                        "not_loaded": "Non caricato, controlla il {logs_link}",
+                        "not_loaded": "Non caricato",
                         "options": "Opzioni",
+                        "provided_by_custom_integration": "Fornito da un'integrazione personalizzata",
                         "reload": "Ricarica",
                         "reload_confirm": "L'integrazione è stata ricaricata",
                         "reload_restart_confirm": "Riavvia Home Assistant per completare il ricaricamento di questa integrazione",
                         "rename": "Rinomina",
                         "restart_confirm": "Riavvia Home Assistant per completare la rimozione di questa integrazione",
                         "services": "{count} {count, plural,\n  one {servizio}\n  other {servizi}\n}",
+                        "state": {
+                            "failed_unload": "Impossibile scaricare",
+                            "loaded": "Caricato",
+                            "migration_error": "Errore di migrazione",
+                            "not_loaded": "Non caricato",
+                            "setup_error": "Configurazione non riuscita",
+                            "setup_retry": "Nuovo tentativo di configurazione"
+                        },
                         "system_options": "Opzioni di sistema",
                         "unnamed_entry": "Voce senza nome"
                     },
@@ -2205,7 +2229,7 @@
                     "configure": "Configura",
                     "configured": "Configurato",
                     "confirm_new": "Vuoi configurare {integration}?",
-                    "description": "Gestisci le integrazioni con servizi, dispositivi, ...",
+                    "description": "Gestisci le integrazioni con servizi o dispositivi",
                     "details": "Dettagli dell'integrazione",
                     "disable": {
                         "disabled_integrations": "{number} disabilitate",
@@ -2244,8 +2268,10 @@
                 "logs": {
                     "caption": "Registri",
                     "clear": "Pulisci",
+                    "custom_integration": "integrazione personalizzata",
                     "description": "Vedi i registri di Home Assistant",
                     "details": "Dettagli registro ({level})",
+                    "error_from_custom_integration": "Questo errore ha avuto origine da un'integrazione personalizzata.",
                     "level": {
                         "critical": "CRITICO",
                         "debug": "DEBUG",
@@ -2635,7 +2661,7 @@
                             "confirm_restart": "Sei sicuro di voler riavviare Home Assistant?",
                             "confirm_stop": "Sei sicuro di voler arrestare Home Assistant?",
                             "heading": "Gestione del Server",
-                            "introduction": "Controllare il server Home Assistant... da Home Assistant.",
+                            "introduction": "Controlla il tuo Server Home Assistant... da Home Assistant.",
                             "restart": "Riavviare",
                             "stop": "Arrestare"
                         },
@@ -2762,6 +2788,15 @@
                         "manufacturer_code_override": "Sostituzione codice produttore",
                         "value": "Valore"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Collegamenti",
+                        "update_button": "Aggiorna Configurazione",
+                        "zha_options": {
+                            "default_light_transition": "Tempo di transizione della luce predefinito (secondi)",
+                            "enable_identify_on_join": "Abilita la notifica di identificazione quando i dispositivi si collegano alla rete",
+                            "title": "Opzioni Globali"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Configurazione completata",
                         "CONFIGURED_status_text": "Inizializzazione",
@@ -3028,12 +3063,12 @@
                         "count_listeners": " ({count} ascoltatori)",
                         "data": "Dati Evento (YAML, opzionale)",
                         "description": "Attiva un evento sul bus eventi.",
-                        "documentation": "Documentazione degli Eventi.",
+                        "documentation": "Documentazione degli eventi",
                         "event_fired": "Evento {name} generato",
                         "fire_event": "Scatena Evento",
                         "listen_to_events": "Ascoltare gli eventi",
                         "listening_to": "In ascolto di",
-                        "notification_event_fired": "Evento {type} eseguito correttamente!",
+                        "notification_event_fired": "Evento {type} eseguito con successo!",
                         "start_listening": "Iniziare ad ascoltare",
                         "stop_listening": "Interrompere l'ascolto",
                         "subscribe_to": "Evento a cui iscriversi",
@@ -3060,8 +3095,8 @@
                         "attributes": "Attributi",
                         "copy_id": "Copia ID negli appunti",
                         "current_entities": "Entità correnti",
-                        "description1": "Impostare la rappresentazione di un dispositivo all'interno di Home Assistant.",
-                        "description2": "Questo non comunicherà con il dispositivo attuale.",
+                        "description1": "Imposta lo stato corrente di un'entità all'interno di Home Assistant.",
+                        "description2": "Se l'entità appartiene a un dispositivo, non si potrà attuare nessuna comunicazione con esso.",
                         "entity": "Entità",
                         "filter_attributes": "Filtra attributi",
                         "filter_entities": "Filtra entità",
@@ -3433,7 +3468,7 @@
                         "duplicate": "Duplica scheda",
                         "edit": "Modifica",
                         "header": "Configurazione della scheda",
-                        "move": "Sposta nella vista",
+                        "move": "Sposta in Visualizza",
                         "move_after": "Sposta la scheda dopo",
                         "move_before": "Sposta la scheda prima",
                         "options": "Altre opzioni",
diff --git a/translations/frontend/ja.json b/translations/frontend/ja.json
index c2be0b070b..7e032802f8 100644
--- a/translations/frontend/ja.json
+++ b/translations/frontend/ja.json
@@ -467,6 +467,7 @@
                 "unhealthy_title": "インストールが正常でない",
                 "unsupported_description": "以下は、インストールに関する問題の一覧です。",
                 "unsupported_reason": {
+                    "apparmor": "ホストでAppArmorが有効になっていない",
                     "container": "問題が発生することが知られているコンテナ",
                     "content-trust": "コンテンツ信頼の検証が無効になっています",
                     "dbus": "DBUS",
@@ -767,9 +768,9 @@
                     "set": "セット",
                     "turned_off": "オフになりました",
                     "turned_on": "オンになりました",
-                    "was_at_home": "家にいた",
+                    "was_at_home": "在宅中",
                     "was_at_state": "{state}でした",
-                    "was_away": "離れていた",
+                    "was_away": "外出中",
                     "was_closed": "閉鎖されました",
                     "was_connected": "接続されました",
                     "was_disconnected": "切断されました",
@@ -1173,6 +1174,9 @@
                 "zha_device_card": {
                     "device_name_placeholder": "デバイス名の変更"
                 }
+            },
+            "zha_reconfigure_device": {
+                "heading": "デバイスを再設定"
             }
         },
         "duration": {
@@ -1193,6 +1197,14 @@
                 "key_wrong_type": "\"{key}\" に指定された値は、ビジュアル エディターではサポートされていません。({type_correct}) をサポートしていますが、受信しました ({type_wrong})。",
                 "no_template_editor_support": "ビジュアルエディタでサポートされていないテンプレート",
                 "no_type_provided": "タイプは提供されていません。"
+            },
+            "supervisor": {
+                "ask": "ヘルプを確認する",
+                "observer": "オブザーバーの確認",
+                "reboot": "ホストを再起動してみてください",
+                "system_health": "システム状態のチェック",
+                "title": "スーパーバイザ パネルを読み込めませんでした。",
+                "wait": "開始したばかりの場合は、開始するのに十分な時間をスーパーバイザーに与えていることを確認してください。"
             }
         },
         "login-form": {
@@ -1210,10 +1222,12 @@
         "notification_toast": {
             "connection_lost": "接続が切れました。再接続中...",
             "dismiss": "閉じる",
+            "intergration_starting": "{integration}を開始すると、完了するまですべてが利用できるわけではありません。",
             "service_call_failed": "サービス{service}の呼び出しに失敗しました。",
             "started": "ホームアシスタントが開始されました！",
             "starting": "Home Assistantが起動中です。全て利用可能なるまでもうしばらくお待ち下さい。",
-            "triggered": "トリガーしました {name}"
+            "triggered": "トリガーしました {name}",
+            "wrapping_up_startup": "スタートアップを総括すると、完成するまですべてが公開されるわけではありません。"
         },
         "panel": {
             "config": {
@@ -1373,7 +1387,7 @@
                             "type_select": "条件の種類",
                             "type": {
                                 "and": {
-                                    "label": "の"
+                                    "label": "AND"
                                 },
                                 "device": {
                                     "condition": "条件",
@@ -1387,16 +1401,16 @@
                                     "label": "デバイス"
                                 },
                                 "not": {
-                                    "label": "ない"
+                                    "label": "Not"
                                 },
                                 "numeric_state": {
                                     "above": "超過",
                                     "below": "未満",
-                                    "label": "数的な状態",
+                                    "label": "数的状態",
                                     "value_template": "バリューテンプレート（オプショナル）"
                                 },
                                 "or": {
-                                    "label": "または"
+                                    "label": "OR"
                                 },
                                 "state": {
                                     "label": "状態",
@@ -1676,6 +1690,8 @@
                             "info": "ホーム アシスタント クラウド向けの Google アシスタント統合機能を使用すると、Google アシスタント対応のデバイスを介してすべてのホーム アシスタント デバイスを制御できます。",
                             "info_state_reporting": "状態レポートを有効にすると、ホーム アシスタントは公開されたエンティティのすべての状態変更を Google に送信します。これにより、Google アプリで最新の状態を常に確認できます。",
                             "manage_entities": "エンティティの管理",
+                            "not_configured_text": "Google アシスタントを使用する前に、「Google Home」アプリで「Google アシスタント」のホームアシスタントクラウドスキルを有効にする必要があります。",
+                            "not_configured_title": "Googleアシスタントがアクティブ化されていません",
                             "security_devices": "セキュリティデバイス",
                             "sync_entities": "エンティティをGoogleに同期",
                             "sync_entities_404_message": "エンティティをGoogleに同期できませんでした。Googleに「OK Google、デバイスを同期して」と尋ねてエンティティを同期してください。",
@@ -1843,6 +1859,7 @@
                                 "header": "アナリティクス",
                                 "instance_id": "インスタンス ID: {huuid}",
                                 "introduction": "インスタンスからの分析を共有します。 {link}で公開されます",
+                                "learn_more": "データの処理方法",
                                 "needs_base": "このオプションを有効にするには、ベースアナリティクスを有効にする必要があります。",
                                 "preference": {
                                     "base": {
@@ -2054,6 +2071,9 @@
                     "filtering_by": "フィルタリング",
                     "show": "表示"
                 },
+                "hassio": {
+                    "button": "設定"
+                },
                 "header": "Home Assistant の設定",
                 "helpers": {
                     "caption": "ヘルパー",
@@ -2140,8 +2160,10 @@
                         "entity_unavailable": "エンティティは利用できません",
                         "firmware": "ファームウェア： {version}",
                         "hub": "経由で接続",
+                        "logs": "ログ",
                         "manuf": "{manufacturer}",
                         "no_area": "エリアなし",
+                        "not_loaded": "読み込まれていない場合は{logs_link} を確認してください",
                         "options": "オプション",
                         "reload": "再読込",
                         "reload_confirm": "インテグレーションが再読み込みされました",
@@ -2167,6 +2189,7 @@
                         "finish": "完了",
                         "loading_first_time": "インテグレーションのインストールを完了するまでお待ちください",
                         "not_all_required_fields": "必須フィールドの一覧に入力するわけではありません。",
+                        "not_loaded": "インテグレーションファイルを読み込めませんでした。ホームアシスタントを再起動してください。",
                         "pick_flow_step": {
                             "new_flow": "いいえ、{integration} の他のインスタンスを設定します",
                             "title": "これらを発見しました。設定しますか？"
@@ -2215,8 +2238,17 @@
                 "logs": {
                     "caption": "ログ",
                     "clear": "消去",
+                    "custom_integration": "カスタム・インテグレーション",
                     "description": "Home Assistantログを表示する",
                     "details": "ログの詳細（ {level} ）",
+                    "error_from_custom_integration": "このエラーは、カスタム統合から発生しました。",
+                    "level": {
+                        "critical": "クリティカル",
+                        "debug": "デバッグ",
+                        "error": "エラー",
+                        "info": "情報",
+                        "warning": "警告"
+                    },
                     "load_full_log": "完全な Home Assistant ログを読み込む",
                     "loading_log": "エラーログを読み込んでいます…",
                     "multiple_messages": "メッセージは最初に{time}発生し、 {counter}回表示されます",
@@ -3712,6 +3744,10 @@
                 }
             },
             "page-onboarding": {
+                "analytics": {
+                    "finish": "次",
+                    "intro": "インスタンスのアナリティクスを共有する。このデータは{link}で公開されます。"
+                },
                 "core-config": {
                     "button_detect": "検出",
                     "finish": "次",
@@ -3721,6 +3757,7 @@
                     "location_name": "ホーム アシスタントの名前",
                     "location_name_default": "自宅"
                 },
+                "finish": "終了",
                 "integration": {
                     "finish": "完了",
                     "intro": "デバイスとサービスは、統合としてHome Assistantに表示されます。今すぐ設定することも、後で設定画面から設定することもできます。",
diff --git a/translations/frontend/ko.json b/translations/frontend/ko.json
index 49431e7819..eb9912cc82 100644
--- a/translations/frontend/ko.json
+++ b/translations/frontend/ko.json
@@ -15,7 +15,7 @@
     },
     "panel": {
         "calendar": "캘린더",
-        "config": "구성",
+        "config": "구성하기",
         "developer_tools": "개발자 도구",
         "history": "기록 그래프",
         "logbook": "로그북",
@@ -290,7 +290,7 @@
             "restart_name": "{name} 다시 시작하기",
             "running_version": "현재 {version} 버전을 실행 중입니다",
             "save": "저장하기",
-            "show_more": "이에 대한 자세한 정보 표시하기",
+            "show_more": "자세한 정보 표시하기",
             "update": "업데이트하기",
             "update_available": "{count, plural,\n  one{개의 업데이트}\n  other{{count}개의 업데이트}\n} 보류 중",
             "version": "버전",
@@ -453,14 +453,14 @@
                 "failed_to_set_option": "Supervisor 옵션을 설정하지 못했습니다",
                 "failed_to_update": "Supervisor를 업데이트하지 못했습니다",
                 "join_beta_action": "베타 채널에 가입하기",
-                "join_beta_description": "Home Assistant (출시 직전버전), Supervisor 및 호스트에 대한 베타 업데이트를 가져옵니다",
+                "join_beta_description": "Home Assistant (출시 직전버전), Supervisor 및 호스트의 베타 업데이트를 가져옵니다",
                 "leave_beta_action": "베타 채널에서 탈퇴하기",
-                "leave_beta_description": "Home Assistant, Supervisor 및 호스트에 대한 안정적인 업데이트를 가져옵니다",
+                "leave_beta_description": "Home Assistant, Supervisor 및 호스트의 공식 업데이트를 가져옵니다",
                 "ram_usage": "Supervisor RAM 사용량",
                 "reload_supervisor": "Supervisor 다시 읽어오기",
                 "share_diagnostics": "진단 정보 공유하기",
                 "share_diagnostics_description": "충돌 보고서 및 진단 정보를 공유합니다.",
-                "share_diagonstics_description": "Supervisor에서 예기치 않은 오류가 발생할 경우 충돌 보고서 및 진단 정보를 자동으로 공유하시겠습니까? {line_break} 공유된 내용으로 발생된 문제를 해결할 수 있으며, 해당 정보는 Home Assistant Core 팀에서만 접근할 수 있을 뿐, 다른 사람과 공유되지 않습니다.{line_break} 데이터에는 개인 및 민감한 정보가 포함되어 있지 않으므로 언제든지 설정에서 이 정보를 사용하지 않도록 설정할 수 있습니다.",
+                "share_diagonstics_description": "Supervisor에서 예기치 않은 오류가 발생한 경우 충돌 보고서 및 진단 정보를 자동으로 공유하시겠습니까? {line_break} 공유된 내용으로 발생된 문제를 해결할 수 있으며, 해당 정보는 Home Assistant Core 팀에서만 접근할 수 있을 뿐, 다른 사람과 공유되지 않습니다.{line_break} 데이터에는 개인정보 및 민감한 정보가 포함되어 있지 않으므로 언제든지 설정에서 이 정보를 사용하지 않도록 설정할 수 있습니다.",
                 "share_diagonstics_title": "Home Assistant 개선 도와주기",
                 "unhealthy_description": "비정상적으로 설치된 Supervisor를 실행하면 문제가 발생합니다. 다음은 설치 환경에서 발견된 문제 목록입니다. 문제를 해결하는 방법에 대해 알아보려면 링크를 클릭해주세요.",
                 "unhealthy_reason": {
@@ -473,6 +473,7 @@
                 "unhealthy_title": "설치 상태가 비정상적입니다",
                 "unsupported_description": "다음은 설치된 Supervisor에서 발견된 문제 목록입니다. 문제를 해결하는 방법에 대해 알아보려면 링크를 클릭해주세요.",
                 "unsupported_reason": {
+                    "apparmor": "호스트에서 AppArmor가 활성화되지 않았습니다.",
                     "container": "문제를 일으키는 것으로 알려진 컨테이너입니다",
                     "content-trust": "이미지 무결성 검사가 비활성화되었습니다",
                     "dbus": "DBUS",
@@ -885,6 +886,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "통합구성요소 설명서",
                 "required": "이 입력란은 필수 요소입니다",
                 "service_data": "서비스 데이터",
                 "target": "대상",
@@ -1145,7 +1147,7 @@
                         "stop": "중지하기"
                     },
                     "types": {
-                        "navigation": "탐색하기",
+                        "navigation": "이동하기",
                         "reload": "다시 읽어오기",
                         "server_control": "서버 제어하기"
                     }
@@ -1213,6 +1215,14 @@
                 "key_wrong_type": "\"{key}\"에 제공된 값은 비주얼 편집기에서 지원되지 않습니다. ({type_correct})을(를) 지원하지만 ({type_wrong})을(를) 받았습니다.",
                 "no_template_editor_support": "비주얼 편집기에서 템플릿이 지원되지 않습니다",
                 "no_type_provided": "유형이 제공되지 않았습니다."
+            },
+            "supervisor": {
+                "ask": "문의하기",
+                "observer": "Observer 확인하기",
+                "reboot": "호스트 재부팅 시도하기",
+                "system_health": "시스템 상태 확인하기",
+                "title": "Supervisor 패널을 불러올 수 없습니다!",
+                "wait": "방금 시작한 경우 Supervisor가 완전히 시작되기까지 잠시 기다려주세요."
             }
         },
         "login-form": {
@@ -1230,10 +1240,12 @@
         "notification_toast": {
             "connection_lost": "서버와 연결이 끊어졌습니다. 다시 연결하는 중...",
             "dismiss": "해제하기",
+            "intergration_starting": "{integration}을(를) 시작하는 중입니다. 완료될 때까지 일부 기능은 작동하지 않을 수 있습니다.",
             "service_call_failed": "{service} 서비스를 호출하지 못했습니다.",
             "started": "Home Assistant가 시작되었습니다!",
-            "starting": "Home Assistant가 시작됩니다. 완료될 때까지 모든 기능을 사용할 수 있는 것은 아닙니다.",
-            "triggered": "{name}이(가) 트리거됨"
+            "starting": "Home Assistant가 시작됩니다. 완료될 때까지 일부 기능은 작동하지 않을 수 있습니다.",
+            "triggered": "{name}이(가) 트리거됨",
+            "wrapping_up_startup": "시작을 마무리하는 중입니다. 완료될 때까지 일부 기능은 작동하지 않을 수 있습니다."
         },
         "panel": {
             "config": {
@@ -1861,31 +1873,31 @@
                     "section": {
                         "core": {
                             "analytics": {
-                                "documentation": "이 옵션을 활성화하기 전에 분석 관련 문서 페이지 {link}을(를) 방문하여 사용자 통계를 보내는 내용과 저장 방법에 대해 알아보세요.",
+                                "documentation": "이 옵션을 활성화하기 전에 분석 관련 문서 페이지 {link}을(를) 방문하여 어떤 데이터를 보내고 어떻게 저장되는지 알아보세요.",
                                 "header": "분석",
                                 "instance_id": "인스턴스 ID: {huuid}",
-                                "introduction": "인스턴스의 분석 내용을 공유합니다. 이 데이터는 {link}에서 공개적으로 사용될 수 있습니다",
-                                "learn_more": "통계자료가 어떻게 처리되는지 알아보기.",
+                                "introduction": "설치 정보를 공유하여 Home Assistant를 개선하고 제조업체가 로컬 제어 및 개인 정보 보호 기능을 추가하도록 설득하는 데 도움이됩니다.",
+                                "learn_more": "수집된 데이터가 어떻게 처리되는지 알아보기",
                                 "needs_base": "이 옵션을 사용하려면 기본 분석을 활성화해야 합니다",
                                 "preference": {
                                     "base": {
-                                        "description": "여기에는 인스턴스 ID, 버전 및 설치 유형이 포함됩니다",
+                                        "description": "인스턴스 ID, 버전과 설치 방법.",
                                         "title": "기본 분석"
                                     },
                                     "diagnostics": {
-                                        "description": "충돌 보고서 및 진단 정보를 공유합니다",
+                                        "description": "예기치 않은 오류가 발생할 경우 충돌 보고서를 공유합니다.",
                                         "title": "진단"
                                     },
                                     "statistics": {
-                                        "description": "여기에는 설치에 사용된 요소의 개수가 포함되며 전체 목록은 문서를 참조해주세요",
+                                        "description": "사용된 구성요소와 사용자계정 갯수 외 기타 요소.",
                                         "title": "사용 통계"
                                     },
                                     "usage_supervisor": {
-                                        "description": "여기에는 통합 구성요소 및 애드온의 이름과 기능이 포함됩니다",
+                                        "description": "이름, 버전 그리고 기타 정보.",
                                         "title": "사용된 통합 구성요소 및 애드온"
                                     },
                                     "usage": {
-                                        "description": "여기에는 통합 구성요소의 이름이 포함됩니다",
+                                        "description": "이름과 버전 정보.",
                                         "title": "사용된 통합 구성요소"
                                     }
                                 }
@@ -2145,6 +2157,8 @@
                     "caption": "통합 구성요소",
                     "config_entry": {
                         "area": "{area}에 위치",
+                        "check_the_logs": "로그 확인",
+                        "configure": "구성",
                         "delete": "삭제하기",
                         "delete_confirm": "이 통합 구성요소를 제거하시겠습니까?",
                         "device_unavailable": "기기 사용불가",
@@ -2169,7 +2183,7 @@
                         "logs": "로그",
                         "manuf": "{manufacturer} 제조",
                         "no_area": "영역 없음",
-                        "not_loaded": "불러오지 못했습니다. {logs_link}을(를) 확인해주세요.",
+                        "not_loaded": "로드되지 않음",
                         "options": "옵션",
                         "reload": "다시 읽어오기",
                         "reload_confirm": "통합 구성요소를 다시 읽어 들였습니다",
@@ -2177,6 +2191,14 @@
                         "rename": "이름 변경하기",
                         "restart_confirm": "이 통합 구성요소를 제거하려면 Home Assistant를 다시 시작해주세요",
                         "services": "{count} {count, plural,\n  one{개의 서비스}\n  other{개의 서비스}\n}",
+                        "state": {
+                            "failed_unload": "언로드 실패",
+                            "loaded": "로드 됨",
+                            "migration_error": "마이그레이션 오류",
+                            "not_loaded": "로드되지 않음",
+                            "setup_error": "설정 실패",
+                            "setup_retry": "설정 재시도"
+                        },
                         "system_options": "시스템 옵션",
                         "unnamed_entry": "이름이 없는 항목"
                     },
@@ -2205,7 +2227,7 @@
                     "configure": "구성하기",
                     "configured": "구성된 통합 구성요소",
                     "confirm_new": "{integration}을(를) 설정하시겠습니까?",
-                    "description": "통합 구성요소를 관리합니다",
+                    "description": "서비스 또는 기기의 통합 구성요소를 관리합니다",
                     "details": "통합 구성요소 상세정보",
                     "disable": {
                         "disabled_integrations": "{number}개의 비활성화된 통합 구성요소",
@@ -2244,8 +2266,10 @@
                 "logs": {
                     "caption": "로그",
                     "clear": "지우기",
+                    "custom_integration": "사용자 통합 구성요소",
                     "description": "Home Assistant 로그 내역을 봅니다",
                     "details": "로그 상세정보 ({level})",
+                    "error_from_custom_integration": "이 오류는 사용자 통합 구성요소에서 발생했습니다.",
                     "level": {
                         "critical": "치명적오류",
                         "debug": "디버그",
@@ -2762,6 +2786,13 @@
                         "manufacturer_code_override": "제조업체 코드 재정의",
                         "value": "값"
                     },
+                    "configuration_page": {
+                        "update_button": "구성 업데이트",
+                        "zha_options": {
+                            "default_light_transition": "조명 전환 시간 기본 값(초)",
+                            "title": "전역 옵션"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "구성이 완료되었습니다",
                         "CONFIGURED_status_text": "초기화 중",
@@ -2901,6 +2932,9 @@
                         "header": "Z-Wave 기기 구성",
                         "introduction": "선택한 기기(노드)의 매개 변수를 관리하고 조정합니다.",
                         "parameter_is_read_only": "이 매개 변수는 읽기 전용입니다.",
+                        "set_param_accepted": "매개 변수가 업데이트되었습니다.",
+                        "set_param_error": "오류가 발생했습니다.",
+                        "set_param_queued": "장치의 절전모드가 해제되면 매개 변수가 업데이트됩니다.",
                         "zwave_js_device_database": "Z-Wave JS 기기 데이터베이스"
                     },
                     "node_status": {
@@ -3041,7 +3075,7 @@
                         "type": "이벤트 유형"
                     },
                     "services": {
-                        "accepts_target": "이 서비스는 대상을 지정받습니다. 예: `entity_id: light.bed_light`",
+                        "accepts_target": "이 서비스는 대상을 지정할 수 있습니다. 예: `entity_id: light.bed_light`",
                         "all_parameters": "사용 가능한 모든 매개 변수",
                         "call_service": "서비스 호출",
                         "column_description": "상세정보",
@@ -3100,7 +3134,7 @@
                     "observer": "Observer 확인하기",
                     "reboot": "호스트 재부팅 시도하기",
                     "system_health": "시스템 상태 확인하기",
-                    "title": "Supervisor 화면을 불러올 수 없습니다!",
+                    "title": "Supervisor 패널을 불러올 수 없습니다!",
                     "wait": "방금 시작한 경우 Supervisor가 완전히 시작되기까지 잠시 기다려주세요."
                 }
             },
@@ -3865,7 +3899,7 @@
                     "header": "다단계 인증 모듈"
                 },
                 "number_format": {
-                    "description": "숫자 형식을 선택해주세요.",
+                    "description": "숫자 형식을 선택합니다.",
                     "dropdown_label": "숫자 형식",
                     "formats": {
                         "comma_decimal": "1,234,567.89",
diff --git a/translations/frontend/lb.json b/translations/frontend/lb.json
index 39829025fe..29201c41aa 100644
--- a/translations/frontend/lb.json
+++ b/translations/frontend/lb.json
@@ -749,6 +749,9 @@
                 "label": "Bild",
                 "unsupported_format": "Net ënnerstëtzte Format, wiel e JPEG, PNG oder GIF Bild."
             },
+            "related-filter-menu": {
+                "filter_by_entity": "Der Entitéit no filteren"
+            },
             "related-items": {
                 "area": "Beräich",
                 "automation": "Deel vun de folgenden Automatismen",
@@ -1055,6 +1058,9 @@
                 "zha_device_card": {
                     "device_name_placeholder": "Numm vum Apparat änneren"
                 }
+            },
+            "zha_reconfigure_device": {
+                "heading": "Apparat frësch konfiguréieren"
             }
         },
         "duration": {
@@ -1075,6 +1081,10 @@
                 "key_wrong_type": "De Wäert fir \"{key}\" ass net vum visuelle Editeur ënnerstëtzt. Mir ënnerstëtzen ({type_correct}) mee mir kruuten ({type_wrong}).",
                 "no_template_editor_support": "Modeller net ënnerstëtzt am Visuellen Editeur",
                 "no_type_provided": "Keen Typ uginn."
+            },
+            "supervisor": {
+                "ask": "No Hëllef froen",
+                "system_health": "System Zoustand iwwerpréiwen"
             }
         },
         "login-form": {
@@ -1889,6 +1899,9 @@
                     "filtering_by": "Filteren anhand vun",
                     "show": "Uweisen"
                 },
+                "hassio": {
+                    "button": "Astellen"
+                },
                 "header": "Home Assistant astellen",
                 "helpers": {
                     "caption": "Helper",
@@ -1954,8 +1967,11 @@
                     "caption": "Integratiounen",
                     "config_entry": {
                         "area": "An {area}",
+                        "check_the_logs": "Logs iwwerpréifen",
+                        "configure": "Astellen",
                         "delete": "Läschen",
                         "delete_confirm": "Sécher fir dës Integratioun ze läsche?",
+                        "depends_on_cloud": "Cloud ofhängeg",
                         "device_unavailable": "Apparat net erreechbar",
                         "devices": "{count} {count, plural,\n  one {Apparat}\n  other {Apparaten}\n}",
                         "disable": {
@@ -1973,12 +1989,21 @@
                         "hub": "Verbonnen via",
                         "manuf": "vun {manufacturer}",
                         "no_area": "Kee Beräich",
+                        "not_loaded": "Net gelueden",
                         "options": "Optiounen",
                         "reload": "Nei lueden",
                         "reload_confirm": "Integratioun gouf frësch gelueden",
                         "reload_restart_confirm": "Start Home Assistant nei fir dës Integratioun fäerdeg ze lueden",
                         "rename": "Ëmbenennen",
                         "restart_confirm": "Start Home Assistant nei fir dës Integratioun ze läschen",
+                        "state": {
+                            "failed_unload": "Feeler beim entlueden",
+                            "loaded": "Gelueden",
+                            "migration_error": "Feeler bei der Migratioun",
+                            "not_loaded": "Net gelueden",
+                            "setup_error": "Feeler beim ariichten",
+                            "setup_retry": "Probéiert nach emol anzeriichten"
+                        },
                         "system_options": "System Optiounen",
                         "unnamed_entry": "Entrée ouni Numm"
                     },
@@ -2038,6 +2063,11 @@
                     "clear": "Läschen",
                     "description": "Home Assistant Logbicher ukucken",
                     "details": "Detailler vum Log ({level})",
+                    "level": {
+                        "error": "FEELER",
+                        "info": "INFO",
+                        "warning": "WARNUNG"
+                    },
                     "load_full_log": "Kompletten Home Assistant Log lueden",
                     "loading_log": "Feeler Log gëtt gelueden...",
                     "multiple_messages": "Noriicht als éischt opgetrueden um {time} a säit deem {counter} mol opgetrueden",
@@ -3446,6 +3476,9 @@
                 }
             },
             "page-onboarding": {
+                "analytics": {
+                    "finish": "Nächst"
+                },
                 "core-config": {
                     "button_detect": "Entdecken",
                     "finish": "Nächst",
@@ -3455,12 +3488,14 @@
                     "location_name": "Numm vun denger Home Assistant Installatioun",
                     "location_name_default": "Doheem"
                 },
+                "finish": "Ofschléissen",
                 "integration": {
                     "finish": "Ofschléissen",
                     "intro": "Apparaten a Servicë ginn am Home Assistant als Integratioune representéiert. Dir kënnt si elo astellen, oder méi spéit vun der Konfiguratioun's Säit aus.",
                     "more_integrations": "Méi"
                 },
                 "intro": "Sidd Dir prett fir Äert Heem interessant ze maachen, Är Privatsphär ze garantéieren an enger weltwäiter Gemeinschaft bei ze trieden?",
+                "next": "Nächst",
                 "restore": {
                     "description": "Alternativ kanns Du aus engem fréiere Snapshot restauréieren.",
                     "hide_log": "Komplette Log verstoppen",
diff --git a/translations/frontend/lt.json b/translations/frontend/lt.json
index 8cb0fa7ce1..fef434b079 100644
--- a/translations/frontend/lt.json
+++ b/translations/frontend/lt.json
@@ -658,7 +658,8 @@
                 "integrations": {
                     "config_entry": {
                         "hub": "Prijungtas per",
-                        "no_area": "Nėra srities"
+                        "no_area": "Nėra srities",
+                        "provided_by_custom_integration": "Teikiama naudojant pasirinktinę integraciją"
                     },
                     "config_flow": {
                         "aborted": "Nutraukta",
diff --git a/translations/frontend/nb.json b/translations/frontend/nb.json
index a59b4f694a..87f3dfe880 100644
--- a/translations/frontend/nb.json
+++ b/translations/frontend/nb.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Installasjonen din er usunn",
                 "unsupported_description": "Nedenfor er en liste over problemer som er funnet med installasjonen din. Klikk på lenkene for å lære hvordan du kan løse problemene.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor er ikke aktivert på verten",
                     "container": "Containere som er kjent for å forårsake problemer",
                     "content-trust": "Validering av innholds klarering er deaktivert",
                     "dbus": "",
@@ -706,7 +707,7 @@
                     "text": "Fyll inn navnet på det nye området.",
                     "title": "Legg til nytt område"
                 },
-                "add_new": "Legg til nytt område ...",
+                "add_new": "Legg til nytt område...",
                 "area": "Område",
                 "clear": "Tøm",
                 "no_areas": "Du har ingen områder",
@@ -885,6 +886,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Dokumentasjon for integrering",
                 "required": "Dette feltet er påkrevd",
                 "service_data": "Tjenestedata",
                 "target": "Mål",
@@ -1117,7 +1119,7 @@
                         "group": "Grupper, gruppeenheter og varsler tjenester",
                         "history_stats": "Historikkstatistiske enheter",
                         "homekit": "HomeKit",
-                        "input_boolean": "Inngang booleans",
+                        "input_boolean": "Boolske innganger",
                         "input_datetime": "Inngangsdato ganger",
                         "input_number": "Inndatanumre",
                         "input_select": "Inngang velges",
@@ -1213,6 +1215,14 @@
                 "key_wrong_type": "Den angitte verdien for \"{key}\" støttes ikke av det visuelle redigeringsprogrammet. Vi støtter ({type_correct}), men mottatt ({type_wrong}).",
                 "no_template_editor_support": "Maler støttes ikke i visual editor",
                 "no_type_provided": "Ingen type oppgitt."
+            },
+            "supervisor": {
+                "ask": "Be om hjelp",
+                "observer": "Sjekk observatøren",
+                "reboot": "Prøv en omstart av verten",
+                "system_health": "Sjekk systemtilstand",
+                "title": "Kunne ikke laste Supervisor-panelet!",
+                "wait": "Hvis du nettopp startet, må du sørge for at du har gitt Supervisor nok tid til å starte."
             }
         },
         "login-form": {
@@ -1228,12 +1238,14 @@
             "title": "Varsler"
         },
         "notification_toast": {
-            "connection_lost": "Forbindelsen ble brutt. Kobler til på nytt...",
+            "connection_lost": "Forbindelse mistet. Koble til igjen...",
             "dismiss": "Avvis",
+            "intergration_starting": "Starter {integration}. Ikke alt er tilgjengelig før lasting er ferdig.",
             "service_call_failed": "Kunne ikke tilkalle tjenesten: {service}",
             "started": "Home Assistant har startet!",
             "starting": "Home Assistant starter, alt er ikke tilgjengelig før starten er fullført.",
-            "triggered": "Utløst {name}"
+            "triggered": "Utløst {name}",
+            "wrapping_up_startup": "Oppstart pågår, ikke alt er tilgjengelig før den er ferdig."
         },
         "panel": {
             "config": {
@@ -1597,7 +1609,7 @@
                         "delete_automation": "Slett automasjon",
                         "delete_confirm": "Er du sikker på at du vil slette denne automasjonen?",
                         "dev_automation": "Feilsøk automatisering",
-                        "dev_only_editable": "Bare automatiseringer definert i automations.yaml kan feilsøkes.",
+                        "dev_only_editable": "Bare automatisering som har en unik ID tildelt, kan feilsøkes.",
                         "duplicate": "Dupliser",
                         "duplicate_automation": "Dupliser automasjon",
                         "edit_automation": "Rediger automasjon",
@@ -1740,7 +1752,7 @@
                             "disable_hook_error_msg": "Kan ikke deaktivere webhook:",
                             "info": "Alt som er konfigurert til å utløses av en webhook, kan gis en offentlig tilgjengelig URL-adresse for å tillate deg å sende data tilbake til Home Assistent fra hvor som helst, uten å utsette forekomsten din for Internett.",
                             "link_learn_more": "Finn ut mer om hvordan du oppretter webhook-drevne automasjoner.",
-                            "loading": "Laster inn ...",
+                            "loading": "Laster inn...",
                             "manage": "Administrer",
                             "no_hooks_yet": "Ser ut som du ikke har noen webhook'er ennå. Kom i gang ved å konfigurere en ",
                             "no_hooks_yet_link_automation": "webhook-automasjon",
@@ -1861,31 +1873,31 @@
                     "section": {
                         "core": {
                             "analytics": {
-                                "documentation": "Før du aktiverer dette, må du gå til analysedokumentasjonssiden {link} å forstå hva du sender og hvordan den er lagret.",
-                                "header": "Analytics",
+                                "documentation": "Før du aktiverer dette, må du gå til analysedokumentasjonssiden {link} for å forstå hva du sender og hvordan den er lagret.",
+                                "header": "Analyser",
                                 "instance_id": "Forekomst-ID: {huuid}",
-                                "introduction": "Del analyser fra forekomsten din. Disse dataene vil være offentlig tilgjengelige på {link}",
-                                "learn_more": "Lær mer om hvordan dataene dine blir behandlet.",
+                                "introduction": "Del installasjonsinformasjonen din for å gjøre Home Assistant bedre og hjelpe oss med å overbevise produsenter om å legge til lokal kontroll og personvernfokuserte funksjoner.",
+                                "learn_more": "Hvordan vi behandler dataene dine",
                                 "needs_base": "Du må aktivere basisanalyse for at dette alternativet skal være tilgjengelig",
                                 "preference": {
                                     "base": {
-                                        "description": "Dette inkluderer forekomst-ID, versjon og installasjonstype",
+                                        "description": "Forekomst-ID, versjon og installasjonstype.",
                                         "title": "Grunnleggende analyse"
                                     },
                                     "diagnostics": {
-                                        "description": "Del krasjrapporter og diagnostisk informasjon",
+                                        "description": "Del krasjrapporter når uventede feil oppstår.",
                                         "title": "Diagnostikk"
                                     },
                                     "statistics": {
-                                        "description": "Dette inkluderer en rekke elementer i installasjonen din, for å se en fullstendig liste i dokumentasjonen",
+                                        "description": "Totalt brukte enheter, brukere og andre elementer.",
                                         "title": "Bruksstatistikk"
                                     },
                                     "usage_supervisor": {
-                                        "description": "Dette inkluderer navnene og funksjonene til integrasjonene og tilleggene dine",
+                                        "description": "Navn, versjoner og evner.",
                                         "title": "Brukte integrasjoner og tillegg"
                                     },
                                     "usage": {
-                                        "description": "Dette inkluderer navnene på integrasjonene dine",
+                                        "description": "Navn og versjonsinformasjon.",
                                         "title": "Brukte integrasjoner"
                                     }
                                 }
@@ -2145,8 +2157,11 @@
                     "caption": "Integrasjoner",
                     "config_entry": {
                         "area": "I {area}",
+                        "check_the_logs": "Kontroller loggene",
+                        "configure": "Konfigurer",
                         "delete": "Slett",
                         "delete_confirm": "Er du sikker på at du vil slette denne integrasjonen?",
+                        "depends_on_cloud": "Avhenger av skyen",
                         "device_unavailable": "Enheten er utilgjengelig",
                         "devices": "{count} {count, plural,\n  one {enhet}\n  other {enheter}\n}",
                         "disable_restart_confirm": "Start Home Assistant på nytt for å fullføre deaktiveringen av denne integreringen",
@@ -2169,14 +2184,23 @@
                         "logs": "Logger",
                         "manuf": "av {manufacturer}",
                         "no_area": "Intet område",
-                        "not_loaded": "Ikke lastet inn, sjekk {logs_link}",
+                        "not_loaded": "Ikke lastet",
                         "options": "Alternativer",
+                        "provided_by_custom_integration": "Levert av en tilpasset integrasjon",
                         "reload": "Last inn på nytt",
                         "reload_confirm": "Integrasjonen ble lastet på nytt",
                         "reload_restart_confirm": "Start Home Assistant på nytt for å fullføre omlastingen av denne integrasjonen",
                         "rename": "Gi nytt navn",
                         "restart_confirm": "Start Home Assistant på nytt for å fullføre fjerningen av denne integrasjonen",
                         "services": "{count} {count, plural,\n  one {tjeneste}\n  other {tjenester}\n}",
+                        "state": {
+                            "failed_unload": "Kan ikke laste ut",
+                            "loaded": "Lastet",
+                            "migration_error": "Migrasjonsfeil",
+                            "not_loaded": "Ikke lastet",
+                            "setup_error": "Kunne ikke konfigurere",
+                            "setup_retry": "Prøver på nytt oppsett"
+                        },
                         "system_options": "Systemalternativer",
                         "unnamed_entry": "Ikke navngitt oppføring"
                     },
@@ -2205,7 +2229,7 @@
                     "configure": "Konfigurer",
                     "configured": "Konfigurert",
                     "confirm_new": "Vil du sette opp {integration}?",
-                    "description": "Administrer integrasjoner med tjenester, enheter, ...",
+                    "description": "Administrer integrasjoner med tjenester eller enheter",
                     "details": "Integrasjonsdetaljer",
                     "disable": {
                         "disabled_integrations": "{number} deaktivert",
@@ -2244,8 +2268,10 @@
                 "logs": {
                     "caption": "Logger",
                     "clear": "Tøm",
+                    "custom_integration": "tilpasset integrasjon",
                     "description": "Vis Home Assistant loggene",
                     "details": "Loggdetaljer ({level})",
+                    "error_from_custom_integration": "Denne feilen stammer fra en tilpasset integrasjon.",
                     "level": {
                         "critical": "KRITISK",
                         "debug": "DEBUG",
@@ -2254,7 +2280,7 @@
                         "warning": "ADVARSEL"
                     },
                     "load_full_log": "Last inn fullstendig Home Assistant logg",
-                    "loading_log": "Laster inn feillogg ...",
+                    "loading_log": "Laster inn feillogg...",
                     "multiple_messages": "meldingen oppstod først ved {time} og vist {counter} ganger",
                     "no_errors": "Ingen feil er rapportert",
                     "no_issues": "Det er ingen nye problemer!",
@@ -2608,7 +2634,7 @@
                             "heading": "YAML konfigurasjon lastes på nytt",
                             "history_stats": "Historikkstatistiske enheter",
                             "homekit": "HomeKit",
-                            "input_boolean": "Inngang booleans",
+                            "input_boolean": "Boolske innganger",
                             "input_datetime": "Inngangsdato ganger",
                             "input_number": "Inndatanumre",
                             "input_select": "Inngang velges",
@@ -2635,7 +2661,7 @@
                             "confirm_restart": "Er du sikker på at du vil starte Home Assistant på nytt?",
                             "confirm_stop": "Er du sikker på at du vil stoppe Home Assistant?",
                             "heading": "Serveradministrasjon",
-                            "introduction": "Kontroller din Home Assistant server... fra Home Assistant.",
+                            "introduction": "Kontroller Home Assistant-serveren ... fra Home Assistant.",
                             "restart": "Omstart",
                             "stop": "Stopp"
                         },
@@ -2762,6 +2788,15 @@
                         "manufacturer_code_override": "Overstyring av produsentkode",
                         "value": "Verdi"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Snarveier",
+                        "update_button": "Oppdater konfigurasjon",
+                        "zha_options": {
+                            "default_light_transition": "Standard overgangstid for lys (sekunder)",
+                            "enable_identify_on_join": "Aktiver identifiseringseffekt når enheter blir med i nettverket",
+                            "title": "Globale alternativer"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Konfigurasjonen er fullført",
                         "CONFIGURED_status_text": "Initialiserer",
@@ -2901,6 +2936,9 @@
                         "header": "Z-Wave enhetskonfigurasjon",
                         "introduction": "Administrer og juster enhets (node) spesifikke konfigurasjonsparametere for den valgte enheten",
                         "parameter_is_read_only": "Denne parameteren er skrivebeskyttet.",
+                        "set_param_accepted": "Parameteren er oppdatert.",
+                        "set_param_error": "Det oppstod en feil.",
+                        "set_param_queued": "Parameterendringen har blitt satt i kø, og vil bli oppdatert når enheten våkner.",
                         "zwave_js_device_database": "Z-Wave JS Device Database"
                     },
                     "node_status": {
@@ -3028,12 +3066,12 @@
                         "count_listeners": " ({count} lyttere)",
                         "data": "Hendelsedata (YAML, valgfritt)",
                         "description": "Send ut en hendelse på hendelsesbussen",
-                        "documentation": "Hendelsedokumentasjon.",
+                        "documentation": "Dokumentasjon for hendelser",
                         "event_fired": "Hendelse {name} utført",
                         "fire_event": "Utfør hendelse",
                         "listen_to_events": "Lytt til hendelser",
                         "listening_to": "Lytte til",
-                        "notification_event_fired": "Hendelse {type} vellykket utløst!",
+                        "notification_event_fired": "Arrangementet {type} vellykket!",
                         "start_listening": "Begynn å lytte",
                         "stop_listening": "Stopp lytting",
                         "subscribe_to": "Hendelse for å abonnere på",
@@ -3060,8 +3098,8 @@
                         "attributes": "Attributter",
                         "copy_id": "Kopier ID til utklippstavlen",
                         "current_entities": "Gjeldende entiteter",
-                        "description1": "Angi representasjonen av en enhet i Home Assistant.",
-                        "description2": "Dette vil ikke kommunisere med den faktiske enheten.",
+                        "description1": "Angi gjeldende tilstandsrepresentasjon for en enhet i Home Assistant.",
+                        "description2": "Hvis enheten tilhører en enhet, vil det ikke være noen faktisk kommunikasjon med den enheten.",
                         "entity": "Entitet",
                         "filter_attributes": "Filtrere attributter",
                         "filter_entities": "Filtrere entiteter",
@@ -3433,7 +3471,7 @@
                         "duplicate": "Dupliser kort",
                         "edit": "Rediger",
                         "header": "Kortkonfigurasjon",
-                        "move": "Flytt til visning",
+                        "move": "Gå til visning",
                         "move_after": "Flytt kortet etter",
                         "move_before": "Flytt kortet før",
                         "options": "Flere alternativer",
@@ -3873,7 +3911,7 @@
                         "language": "Automatisk (bruk språkinnstilling)",
                         "none": "Ingen",
                         "space_comma": "1 234 567,89",
-                        "system": "Bruk systemområdet"
+                        "system": "Bruk systemets lokasjonsinnstilling."
                     },
                     "header": "Tallformat"
                 },
diff --git a/translations/frontend/nl.json b/translations/frontend/nl.json
index cfd2067c2d..deaa8deb46 100644
--- a/translations/frontend/nl.json
+++ b/translations/frontend/nl.json
@@ -240,7 +240,7 @@
                     "title": "Waarschuwing: Beschermingsmodus is uitgeschakeld!"
                 },
                 "ram_usage": "Add-on RAM-gebruik",
-                "rebuild": "Herbouw",
+                "rebuild": "herbouw",
                 "restart": "herstart",
                 "start": "start",
                 "stop": "stop",
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Er is iets mis met je installatie",
                 "unsupported_description": "Hieronder vindt je een lijst met problemen die bij je installatie zijn aangetroffen. Klik op de links om te zien hoe je de problemen kunt oplossen.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor is niet ingeschakeld op de host",
                     "container": "Containers waarvan bekend is dat ze problemen veroorzaken",
                     "content-trust": "Validatie van content-trust is uitgeschakeld",
                     "dbus": "DBUS",
@@ -706,7 +707,7 @@
                     "text": "Geef de naam op van het nieuwe gebied.",
                     "title": "Gebied toevoegen"
                 },
-                "add_new": "Gebied toevoegen...",
+                "add_new": "Nieuw gebied toevoegen...",
                 "area": "Gebied",
                 "clear": "Wis",
                 "no_areas": "Je hebt geen gebieden",
@@ -885,6 +886,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Integratiedocumentatie",
                 "required": "Dit veld is verplicht",
                 "service_data": "Service data",
                 "target": "Doelen",
@@ -1122,7 +1124,7 @@
                         "input_number": "Input numbers",
                         "input_select": "Input selects",
                         "input_text": "Input texts",
-                        "min_max": "Laad min/max entiteiten opnieuw",
+                        "min_max": "Min/max entiteiten",
                         "mqtt": "Handmatig geconfigureerde MQTT-entiteiten",
                         "person": "Personen",
                         "ping": "Ping binaire sensor entiteiten",
@@ -1238,10 +1240,12 @@
         "notification_toast": {
             "connection_lost": "Verbinding verbroken. Opnieuw verbinden...",
             "dismiss": "Afwijzen",
+            "intergration_starting": "Start {integration}, niet alles is beschikbaar totdat het voltooid is.",
             "service_call_failed": "Kan service {service} niet aanroepen",
             "started": "Home Assistant is gestart!",
-            "starting": "Home Assistant is aan het opstarten. Gedurende het opstarten is niet alles beschikbaar.",
-            "triggered": "Geactiveerd {name}"
+            "starting": "Home Assistant is aan het opstarten. Tijdens het opstarten is niet alles beschikbaar.",
+            "triggered": "Geactiveerd {name}",
+            "wrapping_up_startup": "Opstarten aan het afronden, niet alles is beschikbaar totdat het voltooid is."
         },
         "panel": {
             "config": {
@@ -1432,9 +1436,9 @@
                                 },
                                 "sun": {
                                     "after": "Na:",
-                                    "after_offset": "Na offset (optioneel)",
+                                    "after_offset": "Afwijking na (optioneel)",
                                     "before": "Voor:",
-                                    "before_offset": "Voor offset (optioneel)",
+                                    "before_offset": "Afwijking voor (optioneel)",
                                     "label": "Zon",
                                     "sunrise": "Zonsopkomst",
                                     "sunset": "Zonsondergang"
@@ -1560,7 +1564,7 @@
                                 "sun": {
                                     "event": "Gebeurtenis:",
                                     "label": "Zon",
-                                    "offset": "Offset (optioneel)",
+                                    "offset": "Afwijking (optioneel)",
                                     "sunrise": "Zonsopkomst",
                                     "sunset": "Zonsondergang"
                                 },
@@ -1872,28 +1876,28 @@
                                 "documentation": "Voordat u dit inschakelt, moet u de analytics documentatie pagina {link} bezoeken om te begrijpen wat u verstuurt en hoe het wordt opgeslagen.",
                                 "header": "Analytics",
                                 "instance_id": "Instantie-ID: {huuid}",
-                                "introduction": "Deel analyses vanuit uw instantie. Deze gegevens zijn openbaar beschikbaar op {link}",
-                                "learn_more": "Lees meer over hoe uw gegevens worden verwerkt.",
+                                "introduction": "Deel uw installatie-informatie om Home Assistant te helpen verbeteren en ons te helpen fabrikanten te overtuigen om lokale controle en privacygerichte functies toe te voegen.",
+                                "learn_more": "Hoe wij uw gegevens verwerken",
                                 "needs_base": "U moet basisanalyses inschakelen om deze optie beschikbaar te maken",
                                 "preference": {
                                     "base": {
-                                        "description": "Dit bevat de instantie-ID, de versie en het installatietype",
+                                        "description": "Instantie-ID, versie en installatietype.",
                                         "title": "Basisanalyses"
                                     },
                                     "diagnostics": {
-                                        "description": "Deel crashrapporten en diagnostische informatie",
+                                        "description": "Deel crashrapporten wanneer onverwachte fouten optreden.",
                                         "title": "Diagnostiek"
                                     },
                                     "statistics": {
-                                        "description": "Dit omvat een telling van elementen in uw installatie, voor een volledige lijst zie de documentatie",
+                                        "description": "Totaal gebruikte entiteiten, gebruikers en andere elementen.",
                                         "title": "Gebruiksstatistieken"
                                     },
                                     "usage_supervisor": {
-                                        "description": "Dit omvat de namen en mogelijkheden van uw integraties en add-ons",
+                                        "description": "Namen, versies en mogelijkheden.",
                                         "title": "Gebruikte integraties en add-ons"
                                     },
                                     "usage": {
-                                        "description": "Dit bevat de namen van uw integraties",
+                                        "description": "Namen en versie-informatie.",
                                         "title": "Gebruikte integraties"
                                     }
                                 }
@@ -1931,7 +1935,7 @@
                     "different_include": "Mogelijk via een domein, een glob of een andere include.",
                     "pick_attribute": "Kies een attribuut om te overschrijven",
                     "picker": {
-                        "documentation": "Documentatie aanpassen",
+                        "documentation": "Documentatie van aanpassingen",
                         "header": "Aanpassingen",
                         "introduction": "Pas attributen per entiteit aan. Toegevoegde/gewijzigde aanpassingen worden onmiddellijk van kracht. Verwijderde aanpassingen worden van kracht wanneer de entiteit wordt bijgewerkt."
                     },
@@ -2153,8 +2157,11 @@
                     "caption": "Integraties",
                     "config_entry": {
                         "area": "In {area}",
+                        "check_the_logs": "Controleer de logboeken",
+                        "configure": "Configureer",
                         "delete": "Verwijder",
                         "delete_confirm": "Weet je zeker dat je deze integratie wilt verwijderen?",
+                        "depends_on_cloud": "Cloud afhankelijk",
                         "device_unavailable": "Apparaat niet beschikbaar",
                         "devices": "{count} {count, plural,\n  one {apparaat}\n  other {apparaten}\n}",
                         "disable_restart_confirm": "Start Home Assistant opnieuw op om het uitzetten van deze integratie te voltooien",
@@ -2177,14 +2184,23 @@
                         "logs": "logs",
                         "manuf": "door {manufacturer}",
                         "no_area": "Geen Gebied",
-                        "not_loaded": "Niet geladen, controleer de {logs_link}",
+                        "not_loaded": "Niet geladen",
                         "options": "Opties",
+                        "provided_by_custom_integration": "Geleverd door een aangepaste integratie",
                         "reload": "Herlaad",
                         "reload_confirm": "De integratie is opnieuw geladen",
                         "reload_restart_confirm": "Start Home Assistant opnieuw om het opnieuw laden van deze integratie te voltooien",
                         "rename": "Naam wijzigen",
                         "restart_confirm": "Herstart Home Assistant om het verwijderen van deze integratie te voltooien",
                         "services": "{count} {count, plural,\n  one {service}\n  other {services}\n}",
+                        "state": {
+                            "failed_unload": "Uitladen mislukt",
+                            "loaded": "Geladen",
+                            "migration_error": "Migratiefout",
+                            "not_loaded": "Niet geladen",
+                            "setup_error": "Instellen mislukt",
+                            "setup_retry": "Opnieuw proberen in te stellen"
+                        },
                         "system_options": "Systeeminstellingen",
                         "unnamed_entry": "Naamloze invoer"
                     },
@@ -2213,7 +2229,7 @@
                     "configure": "Configureer",
                     "configured": "Geconfigureerd",
                     "confirm_new": "Wil je {integration} instellen?",
-                    "description": "Beheer integraties met services, apparaten, ...",
+                    "description": "Beheer integraties met services of apparaten",
                     "details": "Integratiedetails",
                     "disable": {
                         "disabled_integrations": "{number} uitgeschakeld",
@@ -2252,8 +2268,10 @@
                 "logs": {
                     "caption": "Logboek",
                     "clear": "Wis",
+                    "custom_integration": "aangepaste integratie",
                     "description": "Home Assistant logboek bekijken",
                     "details": "Logboekdetails ({level})",
+                    "error_from_custom_integration": "Deze fout is ontstaan door een aangepaste integratie.",
                     "level": {
                         "critical": "KRITISCH",
                         "debug": "DEBUG",
@@ -2649,7 +2667,7 @@
                         },
                         "validation": {
                             "check_config": "Controleer configuratie",
-                            "heading": "Valideer configuratie",
+                            "heading": "Configuratie validatie",
                             "introduction": "Controleer je configuratie als je onlangs wijzigingen hebt aangebracht en zeker wilt weten dat ze geldig zijn",
                             "invalid": "Ongeldige configuratie",
                             "valid": "Geldige configuratie!"
@@ -2770,6 +2788,15 @@
                         "manufacturer_code_override": "Fabrikant Code Override",
                         "value": "Waarde"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Snelkoppelingen",
+                        "update_button": "Update configuratie",
+                        "zha_options": {
+                            "default_light_transition": "Standaard licht transitietijd (seconden)",
+                            "enable_identify_on_join": "Schakel het identificatie-effect in wanneer apparaten in het netwerk komen",
+                            "title": "Globale opties"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Configuratie voltooid",
                         "CONFIGURED_status_text": "Initialiseren",
@@ -2909,6 +2936,9 @@
                         "header": "Z-Wave apparaatconfiguratie",
                         "introduction": "Beheren en aanpassen van apparaat (node) specifieke configuratieparameters voor het geselecteerde apparaat",
                         "parameter_is_read_only": "Deze parameter is alleen-lezen.",
+                        "set_param_accepted": "De parameter is bijgewerkt.",
+                        "set_param_error": "Er is een fout opgetreden.",
+                        "set_param_queued": "De parameterwijziging is in een wachtrij geplaatst, en zal worden bijgewerkt wanneer het apparaat wakker wordt.",
                         "zwave_js_device_database": "Z-Wave JS Apparaat Database"
                     },
                     "node_status": {
@@ -3036,7 +3066,7 @@
                         "count_listeners": " ({count} luisteraars)",
                         "data": "Gebeurtenis data (YAML, optioneel)",
                         "description": "Start een evenement op de Home Assistant-gebeurtenisbus",
-                        "documentation": "Gebeurtenissen documentatie.",
+                        "documentation": "Gebeurtenissen documentatie",
                         "event_fired": "Gebeurtenis {name} uitgevoerd",
                         "fire_event": "Gebeurtenis uitvoeren",
                         "listen_to_events": "Luisteren naar gebeurtenissen",
@@ -3068,8 +3098,8 @@
                         "attributes": "Attributen",
                         "copy_id": "Kopieer ID naar klembord",
                         "current_entities": "Huidige entiteiten",
-                        "description1": "Stelt de weergave van een apparaat in Home Assistant in.",
-                        "description2": "Er vindt geen communicatie met het daadwerkelijke apparaat plaats.",
+                        "description1": "Stelt de weergave van een entiteit in Home Assistant in.",
+                        "description2": "Als de entiteit tot een apparaat behoort, dan is er geen daadwerkelijke communicatie met dat apparaat.",
                         "entity": "Entiteit",
                         "filter_attributes": "Filter attributen",
                         "filter_entities": "Filter entiteiten",
@@ -3441,7 +3471,7 @@
                         "duplicate": "Dupliceer kaart",
                         "edit": "Bewerken",
                         "header": "Kaart configuratie",
-                        "move": "Verplaatsen",
+                        "move": "Verplaats naar weergave",
                         "move_after": "Verplaats kaart na",
                         "move_before": "Verplaats kaart voor",
                         "options": "Meer opties",
@@ -3595,7 +3625,7 @@
                     "entity_non_numeric": "Entiteit is niet-numeriek: {entity}",
                     "entity_not_found": "Entiteit niet beschikbaar: {entity}",
                     "entity_unavailable": "Entiteit is momenteel niet beschikbaar: {entity}",
-                    "starting": "Home Assistant is aan het opstarten, wellicht is nog niet alles beschikbaar"
+                    "starting": "Home Assistant is aan het opstarten, nog niet alles is beschikbaar"
                 }
             },
             "mailbox": {
diff --git a/translations/frontend/pl.json b/translations/frontend/pl.json
index e05f09283b..077fbb4cff 100644
--- a/translations/frontend/pl.json
+++ b/translations/frontend/pl.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Twoja instalacja jest \"niezdrowa\"",
                 "unsupported_description": "Poniżej znajduje się lista problemów z Twoją instalacją. Kliknij łącza, aby dowiedzieć się, jak możesz je rozwiązać.",
                 "unsupported_reason": {
+                    "apparmor": "AppArmor nie jest włączony na hoście",
                     "container": "Kontenery, o których wiadomo, że powodują problemy",
                     "content-trust": "Weryfikacja zaufania zawartości jest wyłączona",
                     "dbus": "DBUS",
@@ -666,7 +667,7 @@
             "enable": "Włącz",
             "error_required": "To pole jest wymagane",
             "leave": "Wyjdź",
-            "loading": "Ładowanie",
+            "loading": "Wczytywanie",
             "menu": "Menu",
             "next": "Dalej",
             "no": "Nie",
@@ -693,7 +694,7 @@
                         "title": "Błąd podczas pobierania dodatków"
                     },
                     "no_supervisor": {
-                        "description": "Nie znaleziono Supervisora, więc nie można załadować dodatków.",
+                        "description": "Nie znaleziono Supervisora, więc nie można wczytać dodatków.",
                         "title": "Brak Supervisora"
                     }
                 }
@@ -757,7 +758,7 @@
             },
             "history_charts": {
                 "history_disabled": "Integracja historia wyłączona",
-                "loading_history": "Ładowanie historii...",
+                "loading_history": "Wczytywanie historii...",
                 "no_history_found": "Nie znaleziono historii."
             },
             "logbook": {
@@ -1000,7 +1001,7 @@
                     "pattern": "Wyrażenie regularne do sprawdzania poprawności po stronie klienta",
                     "text": "Pole tekstowe"
                 },
-                "platform_not_loaded": "Komponent {platform} nie jest załadowany, dodaj go do swojej konfiguracji dodając 'default_config:' lub ''{platform}:''.",
+                "platform_not_loaded": "Komponent {platform} nie jest wczytany, dodaj go do swojej konfiguracji dodając 'default_config:' lub ''{platform}:''.",
                 "required_error_msg": "To pole jest wymagane",
                 "timer": {
                     "duration": "Czas"
@@ -1219,7 +1220,7 @@
                 "observer": "Sprawdź obserwatora",
                 "reboot": "Spróbuj ponownie uruchomić hosta",
                 "system_health": "Sprawdź kondycję systemu",
-                "title": "Nie można załadować panelu Supervisora!",
+                "title": "Nie można wczytać panelu Supervisora!",
                 "wait": "Jeśli właśnie uruchomiłeś system, upewnij się, że dałeś Supervisorowi wystarczająco dużo czasu na start."
             }
         },
@@ -1238,10 +1239,12 @@
         "notification_toast": {
             "connection_lost": "Utracono połączenie. Łączę ponownie...",
             "dismiss": "Ukryj",
+            "intergration_starting": "{integration} uruchamia się, nie wszystko będzie dostępne, dopóki uruchamianie się nie zakończy.",
             "service_call_failed": "Nie udało się wywołać usługi {service}.",
             "started": "Home Assistant uruchomił się!",
             "starting": "Home Assistant uruchamia się, nie wszystko będzie dostępne, dopóki uruchamianie się nie zakończy.",
-            "triggered": "Wyzwolenie {name}"
+            "triggered": "Wyzwolenie {name}",
+            "wrapping_up_startup": "Home Assistant uruchamia się, nie wszystko będzie dostępne, dopóki uruchamianie się nie zakończy."
         },
         "panel": {
             "config": {
@@ -1478,7 +1481,7 @@
                         "enable_disable": "Włącz/wyłącz automatyzację",
                         "introduction": "Użyj automatyzacji, aby ożywić swój dom",
                         "load_error_not_editable": "Tylko automatyzacje zdefiniowane w pliku automations.yaml są edytowalne",
-                        "load_error_unknown": "Wystąpił błąd podczas ładowania automatyzacji ({err_no})",
+                        "load_error_unknown": "Wystąpił błąd podczas wczytywania automatyzacji ({err_no})",
                         "max": {
                             "parallel": "Maksymalna liczba równoległych uruchomień",
                             "queued": "Długość kolejki"
@@ -1605,7 +1608,7 @@
                         "delete_automation": "Usuń automatyzację",
                         "delete_confirm": "Czy na pewno chcesz usunąć tę automatyzację?",
                         "dev_automation": "Debuguj automatyzację",
-                        "dev_only_editable": "Można debugować tylko automatyzacje zdefiniowane w pliku automations.yaml.",
+                        "dev_only_editable": "Można debugować tylko automatyzacje mające unikalne identyfikatory.",
                         "duplicate": "Duplikuj",
                         "duplicate_automation": "Duplikuj automatyzację",
                         "edit_automation": "Edytuj automatyzację",
@@ -1870,30 +1873,30 @@
                         "core": {
                             "analytics": {
                                 "documentation": "Zanim to włączysz, odwiedź stronę z dokumentacją analityczną {link}, aby zrozumieć, co wysyłasz i jak to jest przechowywane.",
-                                "header": "Analityka",
+                                "header": "Dane analityczne",
                                 "instance_id": "Identyfikator instancji: {huuid}",
-                                "introduction": "Udostępniaj dane analityczne ze swojej instancji. Te dane będą publicznie dostępne pod adresem {link}",
-                                "learn_more": "Dowiedz się więcej, jak Twoje dane będą przetwarzane.",
-                                "needs_base": "Aby ta opcja była dostępna, musisz włączyć podstawowe analityki",
+                                "introduction": "Udostępnij informacje o instalacji, aby ulepszyć Home Assistant i pomóż nam przekonać producentów do dodania lokalnych funkcji sterowania i prywatności.",
+                                "learn_more": "Jak przetwarzamy Twoje dane",
+                                "needs_base": "Aby ta opcja była dostępna, musisz włączyć podstawowe dane analityczne",
                                 "preference": {
                                     "base": {
-                                        "description": "Obejmuje to identyfikator instancji, wersję i typ instalacji",
-                                        "title": "Podstawowe analityki"
+                                        "description": "Identyfikator instancji, wersja i typ instalacji.",
+                                        "title": "Podstawowe dane analityczne"
                                     },
                                     "diagnostics": {
-                                        "description": "Udostępniaj raporty o awariach i informacje diagnostyczne",
+                                        "description": "Udostępniaj raporty o awariach, gdy wystąpią nieoczekiwane błędy.",
                                         "title": "Diagnostyka"
                                     },
                                     "statistics": {
-                                        "description": "Obejmuje to liczbę elementów w instalacji. Pełną listę można znaleźć w dokumentacji.",
+                                        "description": "Suma wykorzystanych encji, użytkowników i innych elementów.",
                                         "title": "Statystyki użycia"
                                     },
                                     "usage_supervisor": {
-                                        "description": "Obejmuje to nazwy i możliwości twoich integracji i dodatków",
+                                        "description": "Nazwy, wersje i możliwości.",
                                         "title": "Użyte integracje i dodatki"
                                     },
                                     "usage": {
-                                        "description": "Obejmuje to nazwy twoich integracji",
+                                        "description": "Informacje o nazwie i wersji.",
                                         "title": "Używane integracje"
                                     }
                                 }
@@ -2136,7 +2139,7 @@
                     "path_configuration": "Ścieżka do pliku configuration.yaml: {path}",
                     "server": "serwer",
                     "source": "Źródło:",
-                    "system_health_error": "Komponent kondycji systemu nie jest załadowany. Dodaj 'system_health:' do pliku configuration.yaml",
+                    "system_health_error": "Komponent kondycji systemu nie jest wczytany. Dodaj 'system_health:' do pliku configuration.yaml",
                     "system_health": {
                         "manage": "Zarządzaj",
                         "more_info": "więcej info"
@@ -2153,8 +2156,11 @@
                     "caption": "Integracje",
                     "config_entry": {
                         "area": "obszar: {area}",
+                        "check_the_logs": "Sprawdź logi",
+                        "configure": "Konfiguruj",
                         "delete": "Usuń",
                         "delete_confirm": "Czy na pewno chcesz usunąć tę integrację?",
+                        "depends_on_cloud": "Zależny od chmury",
                         "device_unavailable": "Urządzenie niedostępne",
                         "devices": "{count} {count, plural,\n  one {urządzenie}\n  few {urządzenia}\n  many {urządzeń}\n  other {urządzeń}\n}",
                         "disable_restart_confirm": "Zrestartuj Home Assistanta, aby zakończyć wyłączanie tej integracji",
@@ -2177,21 +2183,30 @@
                         "logs": "logi",
                         "manuf": "producent: {manufacturer}",
                         "no_area": "brak",
-                        "not_loaded": "Nie załadowano, sprawdź {logs_link}",
+                        "not_loaded": "Nie wczytano",
                         "options": "Opcje",
+                        "provided_by_custom_integration": "Dostarczone przez niestandardowy komponent",
                         "reload": "Wczytaj ponownie",
                         "reload_confirm": "Integracja została ponownie wczytana",
                         "reload_restart_confirm": "Uruchom ponownie Home Assistanta, aby dokończyć ponowne wczytywanie tej integracji",
                         "rename": "Zmień nazwę",
                         "restart_confirm": "Zrestartuj Home Assistanta, aby zakończyć usuwanie tej integracji",
                         "services": "{count} {count, plural,\n  one {usługa}\n  few {usługi}\n  many {usług}\n  other {usług}\n}",
+                        "state": {
+                            "failed_unload": "Błąd usuwania",
+                            "loaded": "Wczytano",
+                            "migration_error": "Błąd migracji",
+                            "not_loaded": "Nie wczytano",
+                            "setup_error": "Błąd konfiguracji",
+                            "setup_retry": "Próbuję ponownie skonfigurować"
+                        },
                         "system_options": "Opcje systemowe",
                         "unnamed_entry": "Nienazwany wpis"
                     },
                     "config_flow": {
                         "aborted": "Przerwano",
                         "close": "Zamknij",
-                        "could_not_load": "Nie można wczytać interfejsu konfiguracji",
+                        "could_not_load": "Nie udało się wczytać interfejsu konfiguracji",
                         "created_config": "Utworzono konfigurację dla {name}.",
                         "dismiss": "Okno dialogowe odrzucenia",
                         "error": "Błąd",
@@ -2203,7 +2218,7 @@
                         "finish": "Zakończ",
                         "loading_first_time": "Proszę czekać, trwa instalowanie integracji...",
                         "not_all_required_fields": "Nie wszystkie wymagane pola są wypełnione.",
-                        "not_loaded": "Nie udało się załadować integracji, spróbuj ponownie uruchomić Home Assistanta.",
+                        "not_loaded": "Nie udało się wczytać integracji, spróbuj ponownie uruchomić Home Assistanta.",
                         "pick_flow_step": {
                             "new_flow": "Nie, skonfiguruj inną instancję integracji {integration}",
                             "title": "Odkryliśmy je, chcesz je skonfigurować?"
@@ -2213,7 +2228,7 @@
                     "configure": "Konfiguruj",
                     "configured": "Skonfigurowane",
                     "confirm_new": "Czy chcesz skonfigurować {integration}?",
-                    "description": "Zarządzaj integracjami z usługami, urządzeniami, ...",
+                    "description": "Zarządzaj integracjami z usługami lub urządzeniami",
                     "details": "Szczegóły integracji",
                     "disable": {
                         "disabled_integrations": "Wyłączonych: {number}",
@@ -2252,8 +2267,10 @@
                 "logs": {
                     "caption": "Logi",
                     "clear": "Wyczyść",
+                    "custom_integration": "niestandardowa integracja",
                     "description": "Wyświetlanie logów Home Assistanta",
                     "details": "Szczegóły loga ({level})",
+                    "error_from_custom_integration": "Ten błąd pochodzi z niestandardowej integracji.",
                     "level": {
                         "critical": "KRYTYCZNE",
                         "debug": "DEBUG",
@@ -2261,8 +2278,8 @@
                         "info": "INFO",
                         "warning": "OSTRZEŻENIE"
                     },
-                    "load_full_log": "Załaduj cały log Home Assistanta",
-                    "loading_log": "Ładowanie loga błędów…",
+                    "load_full_log": "Wczytaj cały log Home Assistanta",
+                    "loading_log": "Wczytywanie loga błędów…",
                     "multiple_messages": "wiadomość pojawiła się po raz pierwszy {time} i powtarzała się {counter} razy",
                     "no_errors": "Nie zgłoszono żadnych błędów",
                     "no_issues": "Nie ma nowych problemów!",
@@ -2421,7 +2438,7 @@
                     },
                     "node_query_stages": {
                         "associations": "Odświeżanie grup skojarzeń i członkostwa",
-                        "cacheload": "Ładowanie informacji z pliku pamięci podręcznej OpenZWave. Węzły baterii pozostaną na tym etapie, dopóki węzeł się nie wybudzi.",
+                        "cacheload": "Wczytywanie informacji z pliku pamięci podręcznej OpenZWave. Węzły baterii pozostaną na tym etapie, dopóki węzeł się nie wybudzi.",
                         "complete": "Proces odpytywania jest zakończony",
                         "configuration": "Pobieranie wartości konfiguracyjnych z węzła",
                         "dynamic": "Pobieranie często zmieniających się wartości z węzła",
@@ -2529,7 +2546,7 @@
                         "icon": "Ikona",
                         "introduction": "Użyj scen, aby ożywić swój dom.",
                         "load_error_not_editable": "Tylko sceny zdefiniowane w pliku scenes.yaml są edytowalne",
-                        "load_error_unknown": "Błąd ładowania sceny ({err_no})",
+                        "load_error_unknown": "Błąd wczytywania sceny ({err_no})",
                         "name": "Nazwa",
                         "save": "Zapisz",
                         "unsaved_confirm": "Masz niezapisane zmiany. Na pewno chcesz wyjść?"
@@ -3108,7 +3125,7 @@
                     "observer": "Sprawdź obserwatora",
                     "reboot": "Spróbuj ponownie uruchomić hosta",
                     "system_health": "Sprawdź kondycję systemu",
-                    "title": "Nie można załadować panelu Supervisora!",
+                    "title": "Nie można wczytać panelu Supervisora!",
                     "wait": "Jeśli właśnie uruchomiłeś system, upewnij się, że dałeś Supervisorowi wystarczająco dużo czasu na start."
                 }
             },
@@ -3162,7 +3179,7 @@
                         "url": "Otwórz okno do {url_path}"
                     },
                     "safe-mode": {
-                        "description": "Podczas ładowania konfiguracji Home Assistant napotkał problemy i działa teraz w trybie awaryjnym. Zajrzyj do loga, aby sprawdzić, co poszło nie tak.",
+                        "description": "Podczas wczytywania konfiguracji Home Assistant napotkał problemy i działa teraz w trybie awaryjnym. Zajrzyj do loga, aby sprawdzić, co poszło nie tak.",
                         "header": "Tryb awaryjny aktywny"
                     },
                     "shopping-list": {
@@ -3517,7 +3534,7 @@
                         "error_remove": "Nie można usunąć konfiguracji: {error}",
                         "error_save_yaml": "Nie można zapisać YAML: {error}",
                         "header": "Edytuj konfigurację",
-                        "lovelace_changed": "Konfiguracja Lovelace została zaktualizowana, czy chcesz załadować zaktualizowaną konfigurację do edytora i stracić obecne zmiany?",
+                        "lovelace_changed": "Konfiguracja Lovelace została zaktualizowana, czy chcesz wczytać zaktualizowaną konfigurację do edytora i stracić obecne zmiany?",
                         "reload": "Wczytaj ponownie",
                         "resources_moved": "Zasoby nie powinny być już dodawane do konfiguracji Lovelace, można je dodawać w panelu konfiguracji Lovelace.",
                         "save": "Zapisz",
diff --git a/translations/frontend/ro.json b/translations/frontend/ro.json
index 1278b240fd..554218de45 100644
--- a/translations/frontend/ro.json
+++ b/translations/frontend/ro.json
@@ -1451,6 +1451,14 @@
                     "description": "Sistemul de unități, locația, fusul orar și alți parametri generali",
                     "section": {
                         "core": {
+                            "analytics": {
+                                "documentation": "Inainte de activare acestuia asigurați-va ca vizitați pagina de documentare {link} pentru a înțelege ce trimiteți si cum este stocată",
+                                "preference": {
+                                    "statistics": {
+                                        "title": "Statistici de utilizare"
+                                    }
+                                }
+                            },
                             "core_config": {
                                 "edit_requires_storage": "Editorul a fost dezactivat deoarece configurația a fost stocata în configuration.yaml.",
                                 "elevation": "Altitudine",
@@ -3169,12 +3177,14 @@
                     "location_name": "Numele instalării Home Assistant",
                     "location_name_default": "Acasă"
                 },
+                "finish": "Finalizare",
                 "integration": {
                     "finish": "Finalizați",
                     "intro": "Dispozitivele și serviciile sunt reprezentate în Home Assistant ca integrări. Aveți posibilitatea să le configurați acum sau să le faceți mai târziu din ecranul de configurare.",
                     "more_integrations": "Mai Mult"
                 },
                 "intro": "Sunteți gata să vă treziți casa, să vă recuperați intimitatea și să vă alăturați unei comunități mondiale de creatori?",
+                "next": "Următorul",
                 "restore": {
                     "hide_log": "Ascundeți jurnalul complet",
                     "in_progress": "Restaurare în curs",
diff --git a/translations/frontend/ru.json b/translations/frontend/ru.json
index b80637f77e..ec43f9f5f8 100644
--- a/translations/frontend/ru.json
+++ b/translations/frontend/ru.json
@@ -405,7 +405,7 @@
             "upload_snapshot": "Загрузить снимок"
         },
         "store": {
-            "missing_addons": "Пропали дополнения? Включите расширенный режим на странице Вашего профиля пользователя",
+            "missing_addons": "Пропали дополнения? Активируйте расширенный режим на странице Вашего профиля пользователя",
             "no_results_found": "Не найдено результатов в {repository}.",
             "registries": "Реестры",
             "repositories": "Репозитории"
@@ -444,7 +444,7 @@
             },
             "supervisor": {
                 "beta_backup": "Перед активацией этой функции убедитесь, что у Вас есть резервная копия Ваших данных.",
-                "beta_join_confirm": "Перейти на бета-версии?",
+                "beta_join_confirm": "Вы уверены, что хотите перейти на бета-версии?",
                 "beta_release_items": "Канал обновлений включает в себя бета-версии для:",
                 "beta_warning": "Бета-версии предназначены для тестирования и могут содержать нестабильные изменения кода.",
                 "channel": "Канал обновлений",
@@ -453,14 +453,14 @@
                 "failed_to_set_option": "Не удалось настроить параметр Supervisor.",
                 "failed_to_update": "Не удалось обновить Supervisor.",
                 "join_beta_action": "Перейти на бета",
-                "join_beta_description": "Получать тестовые версии обновлений для Home Assistant, Supervisor и операционной системы хоста",
+                "join_beta_description": "Получать тестовые версии обновлений для Home Assistant (RC), Supervisor и операционной системы хоста",
                 "leave_beta_action": "Покинуть бета",
                 "leave_beta_description": "Получать стабильные версии обновлений для Home Assistant, Supervisor и операционной системы хоста",
                 "ram_usage": "Использование ОЗУ",
                 "reload_supervisor": "Перезагрузить Supervisor",
                 "share_diagnostics": "Отправлять данные для диагностики",
                 "share_diagnostics_description": "Автоматически отправлять отчеты о сбоях и диагностическую информацию",
-                "share_diagonstics_description": "Хотели бы Вы автоматически отправлять отчеты о сбоях и другую диагностическую информацию, когда Supervisor обнаруживает неожиданные ошибки? {line_break} Это позволит разработчикам получать необходимые данные для решения проблем. Данные не будут содержать никакой личной или конфиденциальной информации и будут доступны только основной команде Home Assistant. {line_break} Вы сможете отключить отправку данных в настройках в любое время.",
+                "share_diagonstics_description": "Хотели бы Вы автоматически отправлять отчеты о сбоях и другую диагностическую информацию, когда Supervisor обнаруживает неожиданные ошибки? {line_break} Это позволит разработчикам получать необходимые данные для решения проблем. Данные не будут содержать никакой личной или конфиденциальной информации и будут доступны только основной команде Home Assistant. {line_break} Вы сможете отменить отправку данных в настройках в любое время.",
                 "share_diagonstics_title": "Помогите улучшить Home Assistant",
                 "unhealthy_description": "Запуск неработоспособной системы может вызвать проблемы. Ниже приведен список проблем, обнаруженных при установке. Перейдите по ссылкам, чтобы узнать, как их решить.",
                 "unhealthy_reason": {
@@ -473,6 +473,7 @@
                 "unhealthy_title": "Ваша система неработоспособна",
                 "unsupported_description": "Ниже приведен список проблем, обнаруженных при установке. Перейдите по ссылкам, чтобы узнать, как их решить.",
                 "unsupported_reason": {
+                    "apparmor": "На хосте не активирован AppArmor",
                     "container": "Контейнеры, известные как вызывающие проблемы",
                     "content-trust": "Проверка доверия к контенту отключена",
                     "dbus": "DBUS",
@@ -502,7 +503,7 @@
                 "arm_away": "Охрана (не дома)",
                 "arm_custom_bypass": "Охрана с исключениями",
                 "arm_home": "Охрана (дома)",
-                "arm_night": "Ночная охрана",
+                "arm_night": "Охрана (ночь)",
                 "clear_code": "Сброс",
                 "code": "Код",
                 "disarm": "Снять с охраны"
@@ -560,9 +561,12 @@
             },
             "light": {
                 "brightness": "Яркость",
+                "cold_white_value": "Яркость холодного белого",
+                "color_brightness": "Яркость цвета",
                 "color_temperature": "Цветовая температура",
                 "effect": "Эффект",
-                "white_value": "Значение для белого цвета"
+                "warm_white_value": "Яркость теплого белого",
+                "white_value": "Яркость белого"
             },
             "lock": {
                 "code": "Код",
@@ -662,8 +666,8 @@
             "copied": "Скопировано",
             "copied_clipboard": "Скопировано в буфер обмена",
             "delete": "Удалить",
-            "disable": "Отключить",
-            "enable": "Включить",
+            "disable": "Деактивировать",
+            "enable": "Активировать",
             "error_required": "Обязательное поле",
             "leave": "Выйти",
             "loading": "Загрузка",
@@ -761,7 +765,7 @@
                 "no_history_found": "История не найдена."
             },
             "logbook": {
-                "by": "от",
+                "by": "- инициатор:",
                 "by_service": "службой",
                 "entries_not_found": "В журнале нет записей.",
                 "messages": {
@@ -885,6 +889,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "Документация по интеграции",
                 "required": "Обязательное поле",
                 "service_data": "Данные службы",
                 "target": "Цели",
@@ -931,11 +936,11 @@
                     "change_device_area": "Изменить помещение для устройства",
                     "confirm_delete": "Вы уверены, что хотите удалить эту запись?",
                     "delete": "Удалить",
-                    "device_disabled": "Родительское устройство этого объекта скрыто.",
-                    "enabled_cause": "Скрыто {cause}.",
+                    "device_disabled": "Родительское устройство этого объекта деактивировано.",
+                    "enabled_cause": "Деактивировано {cause}.",
                     "enabled_delay_confirm": "Объекты будут добавлены в Home Assistant через {delay} секунд",
-                    "enabled_description": "Скрытые объекты не будут доступны в Home Assistant.",
-                    "enabled_label": "Отображать объект",
+                    "enabled_description": "Деактивированные объекты не будут доступны в Home Assistant.",
+                    "enabled_label": "Активировать объект",
                     "enabled_restart_confirm": "Перезапустите Home Assistant, чтобы завершить изменение объектов",
                     "entity_id": "ID объекта",
                     "follow_device_area": "Получить настройки помещения от устройства",
@@ -1213,6 +1218,14 @@
                 "key_wrong_type": "Предоставленное значение для \"{key}\" не поддерживается визуальным редактором. Поддерживается: ({type_correct}), получено: ({type_wrong}).",
                 "no_template_editor_support": "В форме ввода шаблоны не поддерживаются",
                 "no_type_provided": "Тип не указан."
+            },
+            "supervisor": {
+                "ask": "Обратиться за помощью",
+                "observer": "Проверьте Observer",
+                "reboot": "Попробуйте перезагрузить хост",
+                "system_health": "Проверьте статус системы",
+                "title": "Не удалось загрузить панель Supervisor!",
+                "wait": "Убедитесь, что у Supervisor было достаточно времени для запуска."
             }
         },
         "login-form": {
@@ -1228,12 +1241,14 @@
             "title": "Уведомления"
         },
         "notification_toast": {
-            "connection_lost": "Соединение потеряно. Повторное подключение ...",
+            "connection_lost": "Соединение потеряно. Повторное подключение...",
             "dismiss": "Закрыть",
+            "intergration_starting": "Запуск {integration}, пока что не всё может быть доступно.",
             "service_call_failed": "Не удалось вызвать службу {service}.",
             "started": "Home Assistant работает!",
             "starting": "Home Assistant запускается, пока что не всё может быть доступно.",
-            "triggered": "Сработало от {name}"
+            "triggered": "Сработало от {name}",
+            "wrapping_up_startup": "Завершение запуска, пока что не всё может быть доступно."
         },
         "panel": {
             "config": {
@@ -1467,7 +1482,7 @@
                         },
                         "edit_ui": "Форма ввода",
                         "edit_yaml": "Текстовый редактор",
-                        "enable_disable": "Включить / выключить правило автоматизации",
+                        "enable_disable": "Активировать / деактивировать правило автоматизации",
                         "introduction": "Используйте автоматизацию, чтобы оживить Ваш дом.",
                         "load_error_not_editable": "Доступны для редактирования только автоматизации из automations.yaml.",
                         "load_error_unknown": "Ошибка загрузки автоматизации ({err_no}).",
@@ -1597,7 +1612,7 @@
                         "delete_automation": "Удалить автоматизацию",
                         "delete_confirm": "Вы уверены, что хотите удалить эту автоматизацию?",
                         "dev_automation": "Отладка автоматизации",
-                        "dev_only_editable": "Процесс отладки доступен только для автоматизаций, созданных в automations.yaml",
+                        "dev_only_editable": "Процесс отладки доступен только для автоматизаций с уникальным идентификатором.",
                         "duplicate": "Дублировать",
                         "duplicate_automation": "Дублировать",
                         "edit_automation": "Редактировать автоматизацию",
@@ -1670,15 +1685,15 @@
                     "account": {
                         "alexa": {
                             "config_documentation": "Инструкция по настройке",
-                            "disable": "отключить",
-                            "enable": "включить",
+                            "disable": "деактивировать",
+                            "enable": "активировать",
                             "enable_ha_skill": "Активировать навык Home Assistant для Alexa",
                             "enable_state_reporting": "Отправлять изменения состояний объектов",
                             "info": "Интеграция Alexa позволяет управлять устройствами, добавленными в Home Assistant, через любое устройство с поддержкой Alexa.",
-                            "info_state_reporting": "Если Вы включите этот параметр, Home Assistant будет отправлять все изменения состояний объектов, доступных Amazon. Это позволит Вам всегда видеть актуальные состояния в приложениях Alexa и использовать изменения состояний для автоматизации повседневных задач.",
+                            "info_state_reporting": "Если Вы активируете этот параметр, Home Assistant будет отправлять все изменения состояний объектов, доступных Amazon. Это позволит Вам всегда видеть актуальные состояния в приложениях Alexa и использовать изменения состояний для автоматизации повседневных задач.",
                             "manage_entities": "Управление объектами",
                             "state_reporting_error": "Не удалось {enable_disable} отправку изменения состояний.",
-                            "sync_entities": "Синхронизировать объекты с Amazon",
+                            "sync_entities": "Синхронизировать объекты",
                             "sync_entities_error": "Не удалось синхронизировать объекты:",
                             "title": "Alexa"
                         },
@@ -1694,7 +1709,7 @@
                             "enter_pin_hint": "PIN-код",
                             "enter_pin_info": "Введите PIN-код для взаимодействия с устройствами безопасности. Устройства безопасности — это двери, гаражные ворота и замки. При взаимодействии с такими устройствами через Google Assistant, Вам будет предложено сказать или ввести этот PIN-код.",
                             "info": "Интеграция Google Assistant позволяет управлять устройствами, добавленными в Home Assistant, через любое устройство с поддержкой Google Assistant.",
-                            "info_state_reporting": "Если Вы включите этот параметр, Home Assistant будет отправлять все изменения состояний объектов, доступных Google. Это позволит Вам всегда видеть актуальные состояния в приложениях Google.",
+                            "info_state_reporting": "Если Вы активируете этот параметр, Home Assistant будет отправлять все изменения состояний объектов, доступных Google. Это позволит Вам всегда видеть актуальные состояния в приложениях Google.",
                             "manage_entities": "Управление объектами",
                             "not_configured_text": "Перед использованием Google Assistant необходимо активировать навык Home Assistant Cloud в приложении \"Google Home\".",
                             "not_configured_title": "Google Assistant не активирован",
@@ -1740,7 +1755,7 @@
                             "disable_hook_error_msg": "Не удалось отключить Webhook",
                             "info": "Всему, что настроено на срабатывание через Webhook, может быть предоставлен общедоступный URL-адрес. Это позволяет отправлять данные в Home Assistant откуда угодно, не выставляя свой сервер в Интернете.",
                             "link_learn_more": "Узнайте больше о создании автоматизации на базе Webhook.",
-                            "loading": "Загрузка ...",
+                            "loading": "Загрузка...",
                             "manage": "Управление",
                             "no_hooks_yet": "У Вас еще нет добавленных Webhook. Начните с настройки ",
                             "no_hooks_yet_link_automation": "Webhook автоматизацию",
@@ -1864,28 +1879,28 @@
                                 "documentation": "Прежде всего, посетите страницу документации по аналитике {link}, чтобы понять, что Вы будете отправлять и как это будет храниться.",
                                 "header": "Аналитика",
                                 "instance_id": "ID экземпляра Home Assistant: {huuid}",
-                                "introduction": "Поделитесь аналитикой из Вашего Home Assistant. Эти данные будут доступны для всех по адресу {link}.",
-                                "learn_more": "Узнайте больше о том, как будут обрабатываться Ваши данные.",
-                                "needs_base": "Включите базовую аналитику, чтобы эта опция была доступна",
+                                "introduction": "Поделитесь информацией о Вашем Home Assistant, чтобы помочь сделать его ещё лучше. Полученные данные также помогут нам убедить производителей добавлять в свои продукты локальный контроль и функции, ориентированные на конфиденциальность.",
+                                "learn_more": "Как будут обрабатываться Ваши данные",
+                                "needs_base": "Активируйте базовую аналитику, чтобы эта опция была доступна",
                                 "preference": {
                                     "base": {
-                                        "description": "Включает в себя ID экземпляра, версию и тип установки.",
+                                        "description": "ID экземпляра Home Assistant, его версия и тип установки.",
                                         "title": "Базовая аналитика"
                                     },
                                     "diagnostics": {
-                                        "description": "Отправлять отчеты о сбоях и диагностическую информацию",
+                                        "description": "Отправлять отчеты при сбоях и возникновении непредвиденных ошибок.",
                                         "title": "Диагностика"
                                     },
                                     "statistics": {
-                                        "description": "Включает в себя подсчёт элементов для Вашего Home Assistant. О том, как получить полный список, смотрите в документации.",
+                                        "description": "Подсчёт количества объектов, пользователей и других элементов.",
                                         "title": "Статистика использования"
                                     },
                                     "usage_supervisor": {
-                                        "description": "Включает в себя названия и возможности используемых Вами интеграций и дополнений.",
+                                        "description": "Названия, версии и возможности.",
                                         "title": "Используемые интеграции и дополнения"
                                     },
                                     "usage": {
-                                        "description": "Включает в себя названия используемых Вами интеграций",
+                                        "description": "Названия интеграций и информация о версиях.",
                                         "title": "Используемые интеграции"
                                     }
                                 }
@@ -1948,7 +1963,7 @@
                             "unknown_condition": "Неизвестное условие"
                         },
                         "create": "Создать автоматизацию",
-                        "create_disable": "Скрытые устройства нельзя использовать для создания автоматизаций",
+                        "create_disable": "Деактивированные устройства нельзя использовать для создания автоматизаций",
                         "no_automations": "Нет автоматизаций",
                         "no_device_automations": "Для этого устройства нет средств автоматизации.",
                         "triggers": {
@@ -1961,7 +1976,7 @@
                     "cant_edit": "Вы можете редактировать только созданные в пользовательском интерфейсе элементы.",
                     "caption": "Устройства",
                     "confirm_delete": "Вы уверены, что хотите удалить это устройство?",
-                    "confirm_disable_config_entry": "Для записи конфигурации {entry_name} больше нет устройств. Отключить вместо этого запись конфигурации?",
+                    "confirm_disable_config_entry": "Для записи конфигурации {entry_name} больше нет устройств. Деактивировать вместо этого запись конфигурации?",
                     "confirm_rename_entity_ids": "Хотите ли Вы также переименовать идентификаторы объектов?",
                     "confirm_rename_entity_ids_warning": "Переименование повлечёт за собой необходимость вручную обновлять изменённые данные в правилах автоматизации, скриптах, сценах и пользовательском интерфейсе.",
                     "data_table": {
@@ -1977,20 +1992,20 @@
                     "description": "Управление подключенными устройствами",
                     "device_info": "Устройство",
                     "device_not_found": "Устройство не найдено",
-                    "disabled": "Скрыто",
+                    "disabled": "Деактивировано",
                     "disabled_by": {
                         "config_entry": "конфигурацией",
                         "integration": "интеграцией",
                         "user": "пользователем"
                     },
-                    "enabled_cause": "Устройство скрыто {cause}.",
-                    "enabled_description": "Скрытые устройства и их дочерние объекты не будут доступны в Home Assistant.",
-                    "enabled_label": "Отображать устройство",
+                    "enabled_cause": "Устройство деактивировано {cause}.",
+                    "enabled_description": "Деактивированные устройства и их дочерние объекты не будут доступны в Home Assistant.",
+                    "enabled_label": "Активировать устройство",
                     "entities": {
                         "add_entities_lovelace": "Добавить объекты в Lovelace UI",
-                        "disabled_entities": "Показать {count} {count, plural,\n  one {скрытый объект}\n  other {скрытых объектов}\n}",
+                        "disabled_entities": "Показать {count, plural,\n  one {деактивированные объекты:}\n  other {деактивированные объекты:}\n} {count}",
                         "entities": "Объекты",
-                        "hide_disabled": "Не показывать скрытые",
+                        "hide_disabled": "Скрыть деактивированные объекты",
                         "none": "У этого устройства нет объектов"
                     },
                     "name": "Название",
@@ -1998,22 +2013,22 @@
                     "picker": {
                         "filter": {
                             "filter": "Фильтр",
-                            "hidden_devices": "{number, plural,\n  one {скрытых устройств:}\n  other {скрытых устройств:}\n} {number}",
+                            "hidden_devices": "{number, plural,\n  one {Скрытых устройств:}\n  other {Скрытых устройств:}\n} {number}",
                             "show_all": "Показать все",
-                            "show_disabled": "Скрытые устройства"
+                            "show_disabled": "Деактивированные устройства"
                         },
                         "search": "Поиск устройств"
                     },
                     "scene": {
                         "create": "Создать сцену",
-                        "create_disable": "Скрытые устройства нельзя использовать для создания сцен",
+                        "create_disable": "Деактивированные устройства нельзя использовать для создания сцен",
                         "no_scenes": "Нет сцен",
                         "scenes": "Сцены"
                     },
                     "scenes": "Сцены",
                     "script": {
                         "create": "Создать скрипт",
-                        "create_disable": "Скрытые устройства нельзя использовать для создания скриптов",
+                        "create_disable": "Деактивированные устройства нельзя использовать для создания скриптов",
                         "no_scripts": "Нет скриптов",
                         "scripts": "Скрипты"
                     },
@@ -2027,20 +2042,20 @@
                     "description": "Управление доступными объектами",
                     "picker": {
                         "disable_selected": {
-                            "button": "Скрыть выбранные",
-                            "confirm_text": "Скрытые объекты не будут доступны в Home Assistant.",
-                            "confirm_title": "Вы уверены, что хотите скрыть {number} {number, plural,\n  one {выбранный объект}\n  other {выбранных объектов}\n}?"
+                            "button": "Деактивировать выбранные",
+                            "confirm_text": "Деактивированные объекты не будут доступны в Home Assistant.",
+                            "confirm_title": "Вы уверены, что хотите деактивировать {number} {number, plural,\n  one {выбранный объект}\n  other {выбранных объектов}\n}?"
                         },
                         "enable_selected": {
-                            "button": "Отображать выбранные",
-                            "confirm_text": "Если эти объекты ранее были скрыты, они снова будут отображаться в Home Assistant.",
-                            "confirm_title": "Отображать {number} {number, plural,\n  one {выбранный объект}\n  other {выбранных объектов}\n}?"
+                            "button": "Активировать выбранные",
+                            "confirm_text": "Если эти объекты ранее были деактивированы, они снова будут доступными в Home Assistant.",
+                            "confirm_title": "Активировать {number} {number, plural,\n  one {выбранный объект}\n  other {выбранных объектов}\n}?"
                         },
                         "filter": {
                             "filter": "Фильтр",
-                            "hidden_entities": "{number, plural,\n  one {скрытых объектов:}\n  other {скрытых объектов:}\n} {number}",
+                            "hidden_entities": "{number, plural,\n  one {Скрытых объектов:}\n  other {Скрытых объектов:}\n} {number}",
                             "show_all": "Показать все",
-                            "show_disabled": "Скрытые объекты",
+                            "show_disabled": "Деактивированные объекты",
                             "show_readonly": "Объекты, доступные только для чтения",
                             "show_unavailable": "Недоступные объекты"
                         },
@@ -2064,7 +2079,7 @@
                         "search": "Поиск объектов",
                         "selected": "Выбрано: {number}",
                         "status": {
-                            "disabled": "Скрыто",
+                            "disabled": "Деактивировано",
                             "ok": "Ok",
                             "readonly": "Только для чтения",
                             "restored": "Восстановлено",
@@ -2145,20 +2160,23 @@
                     "caption": "Интеграции",
                     "config_entry": {
                         "area": "Помещение: {area}",
+                        "check_the_logs": "Проверить журналы",
+                        "configure": "Настроить",
                         "delete": "Удалить",
                         "delete_confirm": "Вы уверены, что хотите удалить эту интеграцию?",
+                        "depends_on_cloud": "Зависящие от облачных сервисов",
                         "device_unavailable": "Устройство недоступно",
                         "devices": "{count, plural,\n  one {устройств:}\n  other {устройств:}\n} {count}",
-                        "disable_restart_confirm": "Перезапустите Home Assistant, чтобы завершить отключение этой интеграции.",
+                        "disable_restart_confirm": "Перезапустите Home Assistant, чтобы завершить деактивацию этой интеграции.",
                         "disable": {
-                            "disable_confirm": "Вы уверены, что хотите отключить эту запись конфигурации? Её дочерние устройства и объекты будут также отключены.",
-                            "disabled": "Отключено",
+                            "disable_confirm": "Вы уверены, что хотите деактивировать эту запись конфигурации? Её дочерние устройства и объекты будут также деактивированы.",
+                            "disabled": "Деактивировано",
                             "disabled_by": {
                                 "device": "устройством",
                                 "integration": "интеграцией",
                                 "user": "пользователем"
                             },
-                            "disabled_cause": "Отключено {cause}"
+                            "disabled_cause": "Деактивировано {cause}"
                         },
                         "documentation": "Документация",
                         "enable_restart_confirm": "Перезапустите Home Assistant, чтобы завершить подключение этой интеграции.",
@@ -2169,14 +2187,23 @@
                         "logs": "журналы",
                         "manuf": "{manufacturer}",
                         "no_area": "Не указано",
-                        "not_loaded": "Не загружено, проверьте {logs_link}",
+                        "not_loaded": "Не загружено",
                         "options": "Настройки",
+                        "provided_by_custom_integration": "Предоставляется кастомной интеграцией",
                         "reload": "Перезагрузить",
                         "reload_confirm": "Перезагрузка интеграции выполнена",
                         "reload_restart_confirm": "Перезапустите Home Assistant, чтобы завершить перезагрузку этой интеграции",
                         "rename": "Переименовать",
                         "restart_confirm": "Перезапустите Home Assistant, чтобы завершить удаление этой интеграции",
                         "services": "{count, plural,\n  one {служб:}\n  other {служб:}\n} {count}",
+                        "state": {
+                            "failed_unload": "Не удалось выгрузить",
+                            "loaded": "Загружено",
+                            "migration_error": "Ошибка при миграции",
+                            "not_loaded": "Не загружено",
+                            "setup_error": "Не удалось настроить",
+                            "setup_retry": "Повторная настройка"
+                        },
                         "system_options": "Настройки интеграции",
                         "unnamed_entry": "Без названия"
                     },
@@ -2208,22 +2235,22 @@
                     "description": "Управление интеграциями с устройствами или службами",
                     "details": "Детали интеграции",
                     "disable": {
-                        "disabled_integrations": "Отключено: {number}",
-                        "hide_disabled": "Скрыть отключенные интеграции",
+                        "disabled_integrations": "Деактивировано: {number}",
+                        "hide_disabled": "Скрыть деактивированные интеграции",
                         "show": "Показать",
-                        "show_disabled": "Показать отключенные интеграции"
+                        "show_disabled": "Деактивированные интеграции"
                     },
                     "discovered": "Обнаружено",
                     "home_assistant_website": "сайте Home Assistant",
                     "ignore": {
                         "confirm_delete_ignore": "Эта интеграция станет доступна для обнаружения системой. Обнаружение произойдёт автоматически в течении некоторого времени, либо после перезапуска системы.",
                         "confirm_delete_ignore_title": "Прекратить игнорировать {name}?",
-                        "confirm_ignore": "Вы сможете снова включить обнаружение этой интеграции. Для этого откройте меню в правом верхнем углу и нажмите «Показать игнорируемые интеграции».",
+                        "confirm_ignore": "Вы сможете снова включить обнаружение этой интеграции. Для этого откройте меню в правом верхнем углу и нажмите «Игнорируемые интеграции».",
                         "confirm_ignore_title": "Игнорировать обнаружение интеграции {name}?",
                         "hide_ignored": "Скрыть игнорируемые интеграции",
                         "ignore": "Игнорировать",
                         "ignored": "Игнорируется",
-                        "show_ignored": "Показать игнорируемые интеграции",
+                        "show_ignored": "Игнорируемые интеграции",
                         "stop_ignore": "Прекратить игнорировать"
                     },
                     "integration": "интеграции",
@@ -2244,10 +2271,12 @@
                 "logs": {
                     "caption": "Журнал сервера",
                     "clear": "Очистить",
+                    "custom_integration": "кастомная интеграция",
                     "description": "Журналы работы сервера",
                     "details": "Уровень: {level}",
+                    "error_from_custom_integration": "Эта ошибка возникла в кастомной интеграции.",
                     "level": {
-                        "critical": "КРИТИЧЕСКАЯ НЕИСПРАВНОСТЬ",
+                        "critical": "КРИТИЧЕСКАЯ ОШИБКА",
                         "debug": "ОТЛАДКА",
                         "error": "ОШИБКА",
                         "info": "ИНФОРМАЦИЯ",
@@ -2762,6 +2791,15 @@
                         "manufacturer_code_override": "Переназначить код производителя",
                         "value": "Значение"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "Ярлыки",
+                        "update_button": "Обновить конфигурацию",
+                        "zha_options": {
+                            "default_light_transition": "Время плавного перехода света по умолчанию (в секундах)",
+                            "enable_identify_on_join": "Эффект для идентификации присоединения устройства к сети",
+                            "title": "Глобальные настройки"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "Настройка завершена",
                         "CONFIGURED_status_text": "Инициализация",
@@ -2901,6 +2939,9 @@
                         "header": "Настройки устройства Z-Wave",
                         "introduction": "Настройка параметров конфигурации выбранного узла для выбранного устройства.",
                         "parameter_is_read_only": "Этот параметр доступен только для чтения.",
+                        "set_param_accepted": "Параметр обновлен",
+                        "set_param_error": "Произошла ошибка",
+                        "set_param_queued": "Изменение параметра поставлено в очередь и будет обновлено, когда устройство выйдет из спящего режима",
                         "zwave_js_device_database": "базой данных устройств Z-Wave JS"
                     },
                     "node_status": {
@@ -3033,7 +3074,7 @@
                         "fire_event": "Создать событие",
                         "listen_to_events": "Подписаться на событие",
                         "listening_to": "Подписано на",
-                        "notification_event_fired": "Событие {type} успешно создано",
+                        "notification_event_fired": "Событие {type} создано успешно",
                         "start_listening": "Подписаться",
                         "stop_listening": "Отписаться",
                         "subscribe_to": "Событие",
@@ -3060,8 +3101,8 @@
                         "attributes": "Атрибуты",
                         "copy_id": "Скопировать ID в буфер обмена",
                         "current_entities": "Список объектов",
-                        "description1": "Здесь Вы можете вручную изменить состояние устройства в Home Assistant.",
-                        "description2": "Изменённое состояние не будет синхронизировано с устройством.",
+                        "description1": "Здесь Вы можете вручную изменить отображение текущего состояния объекта в Home Assistant.",
+                        "description2": "Если этот объект связан с устройством, фактической связи с этим устройством не будет.",
                         "entity": "Объект",
                         "filter_attributes": "Поиск",
                         "filter_entities": "Поиск",
diff --git a/translations/frontend/sk.json b/translations/frontend/sk.json
index 59aa2e9108..1470603626 100644
--- a/translations/frontend/sk.json
+++ b/translations/frontend/sk.json
@@ -149,7 +149,7 @@
                     },
                     "ingress": {
                         "description": "Tento doplnok používa vniknutie na bezpečné vloženie svojho rozhrania do Home Assistant.",
-                        "title": "vniknutie"
+                        "title": "Vniknutie"
                     },
                     "label": {
                         "apparmor": "apparmor",
@@ -1121,7 +1121,7 @@
                     "picker": {
                         "create_area": "Vytvoriť oblasť",
                         "header": "Register oblastí",
-                        "integrations_page": "Stránka Integrácie",
+                        "integrations_page": "Stránka Integrácií",
                         "introduction": "Oblasti sa používajú na usporiadanie zariadení. Tieto informácie sa použijú v službe Home Assistant, aby vám pomohli pri organizovaní rozhrania, povolení a integrácií s inými systémami.",
                         "introduction2": "Ak chcete umiestniť zariadenia do oblasti, pomocou odkazu nižšie prejdite na stránku integrácií a potom kliknite na nakonfigurovanú integráciu a prejdite na karty zariadení.",
                         "no_areas": "Vyzerá to, že ešte nemáte žiadne oblasti!"
@@ -1850,7 +1850,8 @@
                     }
                 },
                 "integration_panel_move": {
-                    "link_integration_page": "stránka integrácie"
+                    "link_integration_page": "stránka integrácií",
+                    "missing_zha": "Chýba vám konfiguračný panel ZHA? Bol presunutý do položky ZHA na {integrations_page}."
                 },
                 "integrations": {
                     "add_integration": "Pridať integráciu",
@@ -2116,7 +2117,7 @@
                         "device_tracker_intro": "Vyberte zariadenia, ktoré patria tejto osobe.",
                         "device_tracker_pick": "Vyberte zariadenie na sledovanie",
                         "device_tracker_picked": "Sledovať zariadenie",
-                        "link_integrations_page": "Stránka Integrácie",
+                        "link_integrations_page": "Stránka Integrácií",
                         "link_presence_detection_integrations": "Integrácie detekcie prítomnosti",
                         "linked_user": "Prepojený používateľa",
                         "name": "Meno",
diff --git a/translations/frontend/sv.json b/translations/frontend/sv.json
index f4e7f913b1..39c7792d77 100644
--- a/translations/frontend/sv.json
+++ b/translations/frontend/sv.json
@@ -1049,6 +1049,10 @@
                 "key_not_expected": "Nyckeln \"{key}\" förväntas inte eller stöds inte av den visuella redigeraren.",
                 "key_wrong_type": "Det angivna värdet för \"{key}\" stöds inte av den visuella redigeraren. Vi stöder ({type_correct}) men fick ({type_wrong}).",
                 "no_type_provided": "Ingen typ angiven."
+            },
+            "supervisor": {
+                "ask": "Be om hjälp",
+                "wait": "Om du precis börjat, se till att du har gett Supervisor tillräckligt med tid för att starta."
             }
         },
         "login-form": {
@@ -1682,6 +1686,9 @@
                     "description": "Ändra din grundkonfiguration för Home Assistant.",
                     "section": {
                         "core": {
+                            "analytics": {
+                                "learn_more": "Hur vi behandlar din data"
+                            },
                             "core_config": {
                                 "edit_requires_storage": "Redigeraren är inaktiverad eftersom konfigurationen lagras i configuration.yaml.",
                                 "elevation": "Höjd över havet",
@@ -1867,6 +1874,9 @@
                     "clear": "Rensa",
                     "filtering_by": "Filtrera efter"
                 },
+                "hassio": {
+                    "button": "Konfigurera"
+                },
                 "header": "Konfigurera Home Assistant",
                 "helpers": {
                     "caption": "Hjälpare",
@@ -2020,6 +2030,13 @@
                     "clear": "Rensa",
                     "description": "Visa Home Assistant loggarna",
                     "details": "Logginformation ({level})",
+                    "level": {
+                        "critical": "KRITISK",
+                        "debug": "DEBUG",
+                        "error": "FEL",
+                        "info": "INFO",
+                        "warning": "VARNING"
+                    },
                     "load_full_log": "Ladda hela Home Assistant-loggen",
                     "loading_log": "Läser in fellogg ...",
                     "multiple_messages": "Meddelandet inträffade först {time} och har hänt {counter} gånger",
@@ -3262,7 +3279,7 @@
                         "unsaved_changes": "Osparade ändringar"
                     },
                     "save_config": {
-                        "cancel": "Glöm det",
+                        "cancel": "Avbryt",
                         "close": "Stäng",
                         "empty_config": "Börja med en tom instrumentpanel",
                         "header": "Ta kontroll över Lovelace UI",
diff --git a/translations/frontend/tr.json b/translations/frontend/tr.json
index b9a766daf2..f54dbe9f2f 100644
--- a/translations/frontend/tr.json
+++ b/translations/frontend/tr.json
@@ -1594,7 +1594,7 @@
                         "dev_automation": "Hata ayıklama otomasyonu",
                         "dev_only_editable": "Yalnızca automations.yaml'de tanımlanan otomasyonlarda hata ayıklama yapılabilir.",
                         "duplicate": "Çiftleme",
-                        "duplicate_automation": "Yinelenen otomasyon",
+                        "duplicate_automation": "Otomasyonu çiftleme",
                         "edit_automation": "Otomasyonu düzenle",
                         "header": "Otomasyon Düzenleyici",
                         "headers": {
@@ -2136,6 +2136,7 @@
                     "caption": "Entegrasyonlar",
                     "config_entry": {
                         "area": "{area} içinde",
+                        "check_the_logs": "Günlükleri kontrol edin",
                         "delete": "Sil",
                         "delete_confirm": "Bu entegrasyonu silmek istediğinizden emin misiniz?",
                         "device_unavailable": "Cihaz kullanılamıyor",
@@ -2168,6 +2169,13 @@
                         "rename": "Yeniden adlandır",
                         "restart_confirm": "Bu entegrasyonu kaldırmaya devam etmek için Home Assistant'ı yeniden başlatın",
                         "services": "{count} {count, plural,\n  one {hizmet}\n  other {hizmetler}\n}",
+                        "state": {
+                            "failed_unload": "Kaldırılamadı",
+                            "loaded": "Yüklendi",
+                            "migration_error": "Taşıma hatası",
+                            "not_loaded": "Yüklenmedi",
+                            "setup_error": "Kurulum başarısız oldu"
+                        },
                         "system_options": "Sistem seçenekleri",
                         "unnamed_entry": "Adsız giriş"
                     },
diff --git a/translations/frontend/zh-Hans.json b/translations/frontend/zh-Hans.json
index b1effc5b06..849d7e3c85 100644
--- a/translations/frontend/zh-Hans.json
+++ b/translations/frontend/zh-Hans.json
@@ -473,6 +473,7 @@
                 "unhealthy_title": "系统状态不佳",
                 "unsupported_description": "以下是系统存在的问题的列表，请点击链接以了解如何解决问题。",
                 "unsupported_reason": {
+                    "apparmor": "未在主机上启用 AppArmor",
                     "container": "已知会导致问题的容器",
                     "content-trust": "内容信任验证已禁用",
                     "dbus": "DBUS",
@@ -885,6 +886,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "集成文档",
                 "required": "此字段为必填字段",
                 "service_data": "服务数据",
                 "target": "目标",
@@ -949,7 +951,7 @@
                 },
                 "faq": "文档",
                 "info_customize": "您可以在{customize_link}部分中覆盖一些属性。",
-                "no_unique_id": "该实体 (\"{entity_id}\") 没有唯一的 ID，因此无法由 UI 管理其设置。请参阅 {faq_link} 以详细了解。",
+                "no_unique_id": "该实体 (\"{entity_id}\") 没有 unique ID，因此无法由 UI 管理其设置。请参阅 {faq_link} 以详细了解。",
                 "related": "关联",
                 "settings": "设置"
             },
@@ -1213,6 +1215,14 @@
                 "key_wrong_type": "“{key}”的值不受可视化编辑器支持。支持 ({type_correct}) 但得到 ({type_wrong})。",
                 "no_template_editor_support": "可视化编辑器不支持模板",
                 "no_type_provided": "未提供类型。"
+            },
+            "supervisor": {
+                "ask": "寻求帮助",
+                "observer": "检查 Observer",
+                "reboot": "请尝试重启主机",
+                "system_health": "检查系统状态",
+                "title": "无法加载 Supervisor 面板！",
+                "wait": "如果系统刚刚启动，请确保已等候足够的时间以便 Supervisor 启动完成。"
             }
         },
         "login-form": {
@@ -1230,10 +1240,12 @@
         "notification_toast": {
             "connection_lost": "连接中断。正在重新连接...",
             "dismiss": "关闭",
+            "intergration_starting": "正在启动 {integration}。在启动完成前，部分功能暂不可用。",
             "service_call_failed": "调用服务 {service} 失败。",
             "started": "Home Assistant 已启动！",
             "starting": "Home Assistant 正在启动。在启动完成前，部分功能暂不可用。",
-            "triggered": "已触发 {name}"
+            "triggered": "已触发 {name}",
+            "wrapping_up_startup": "启动即将完成。完成后即可使用全部功能。"
         },
         "panel": {
             "config": {
@@ -1597,7 +1609,7 @@
                         "delete_automation": "删除自动化",
                         "delete_confirm": "您确定要删除此自动化吗？",
                         "dev_automation": "调试自动化",
-                        "dev_only_editable": "只能调试 automations.yaml 中的自动化。",
+                        "dev_only_editable": "只能调试具有 unique ID 的自动化。",
                         "duplicate": "制作副本",
                         "duplicate_automation": "复制自动化",
                         "edit_automation": "编辑自动化",
@@ -1864,28 +1876,28 @@
                                 "documentation": "在启用此功能之前，请确保您已阅读了分析文档页面 {link}，以了解将发送的内容及其存储方式。",
                                 "header": "分析",
                                 "instance_id": "实例ID: {huuid}",
-                                "introduction": "共享实例的分析。此数据将在 {link} 公开。",
-                                "learn_more": "详细了解您的数据将被如何处理。",
+                                "introduction": "分享您的安装信息，让 Home Assistant 变得更好，并帮助我们与厂商沟通，增加本地控制和注重隐私的功能。",
+                                "learn_more": "我们如何处理您的数据",
                                 "needs_base": "需要启用基础分析才能启用此选项",
                                 "preference": {
                                     "base": {
-                                        "description": "包括实例 ID，版本号和安装类型",
+                                        "description": "实例 ID、版本号和安装类型。",
                                         "title": "基础分析"
                                     },
                                     "diagnostics": {
-                                        "description": "共享崩溃报告和诊断信息",
+                                        "description": "发生意外错误时共享崩溃报告。",
                                         "title": "诊断"
                                     },
                                     "statistics": {
-                                        "description": "包括安装的元素数量，完整列表请参阅文档",
+                                        "description": "已使用的实体、用户和其他元素数量。",
                                         "title": "使用情况统计"
                                     },
                                     "usage_supervisor": {
-                                        "description": "包括集成和加载项的名称和能力",
+                                        "description": "名称、版本和功能。",
                                         "title": "使用的集成和加载项"
                                     },
                                     "usage": {
-                                        "description": "包括集成的名称",
+                                        "description": "名称和版本信息。",
                                         "title": "使用的集成"
                                     }
                                 }
@@ -2145,8 +2157,11 @@
                     "caption": "集成",
                     "config_entry": {
                         "area": "位于：{area}",
+                        "check_the_logs": "检查日志",
+                        "configure": "选项",
                         "delete": "删除",
                         "delete_confirm": "您确定要删除此集成吗？",
+                        "depends_on_cloud": "取决于云端",
                         "device_unavailable": "设备不可用",
                         "devices": "{count} {count, plural,\n  one {个设备}\n  other {个设备}\n}",
                         "disable_restart_confirm": "重启 Home Assistant 以完成此集成的禁用",
@@ -2169,14 +2184,23 @@
                         "logs": "日志",
                         "manuf": "by {manufacturer}",
                         "no_area": "没有区域",
-                        "not_loaded": "未加载，请检查{logs_link}",
+                        "not_loaded": "未加载",
                         "options": "选项",
+                        "provided_by_custom_integration": "由自定义集成提供",
                         "reload": "重载",
                         "reload_confirm": "集成已重新加载",
                         "reload_restart_confirm": "重启 Home Assistant 以完成此集成的重载",
                         "rename": "重命名",
                         "restart_confirm": "重启 Home Assistant 以完成此集成的删除",
                         "services": "{count} {count, plural,\n  one {个服务}\n  other {个服务}\n}",
+                        "state": {
+                            "failed_unload": "卸载失败",
+                            "loaded": "已加载",
+                            "migration_error": "迁移错误",
+                            "not_loaded": "未加载",
+                            "setup_error": "设置失败",
+                            "setup_retry": "正在重试设置"
+                        },
                         "system_options": "系统选项",
                         "unnamed_entry": "未命名条目"
                     },
@@ -2244,8 +2268,10 @@
                 "logs": {
                     "caption": "日志",
                     "clear": "清除",
+                    "custom_integration": "自定义集成",
                     "description": "查看 Home Assistant 日志",
                     "details": "日志详细信息（ {level} ）",
+                    "error_from_custom_integration": "此错误来自自定义集成。",
                     "level": {
                         "critical": "CRITICAL",
                         "debug": "DEBUG",
@@ -2762,6 +2788,15 @@
                         "manufacturer_code_override": "制造商代码覆盖",
                         "value": "值"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "捷径",
+                        "update_button": "更新配置",
+                        "zha_options": {
+                            "default_light_transition": "默认灯光过渡时长（秒）",
+                            "enable_identify_on_join": "设备加入网络时启用识别效果",
+                            "title": "全局选项"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "配置完成",
                         "CONFIGURED_status_text": "正在初始化",
@@ -2901,6 +2936,9 @@
                         "header": "Z-Wave 设备配置",
                         "introduction": "管理并调整所选设备（节点）的具体配置参数。",
                         "parameter_is_read_only": "此参数为只读。",
+                        "set_param_accepted": "参数已更新。",
+                        "set_param_error": "发生错误。",
+                        "set_param_queued": "参数更改操作已加入队列，将在设备唤醒时更新。",
                         "zwave_js_device_database": "Z-Wave JS 设备数据库"
                     },
                     "node_status": {
diff --git a/translations/frontend/zh-Hant.json b/translations/frontend/zh-Hant.json
index f67f03898d..fa26265bb7 100644
--- a/translations/frontend/zh-Hant.json
+++ b/translations/frontend/zh-Hant.json
@@ -242,7 +242,7 @@
                 "ram_usage": "附加元件 RAM 使用率",
                 "rebuild": "重建",
                 "restart": "重啟",
-                "start": "開始",
+                "start": "啟動",
                 "stop": "停止",
                 "uninstall": "移除",
                 "visit_addon_page": "參閱 {name} 頁面以獲得更詳細資訊"
@@ -473,6 +473,7 @@
                 "unhealthy_title": "安裝版本不健康",
                 "unsupported_description": "執行不健康的安裝版本可能會導致問題。下方列表為安裝問題清單，點選連結以了解如何解決問題。",
                 "unsupported_reason": {
+                    "apparmor": "主機端未啟用 AppArmor",
                     "container": "已知造成問題的 Container",
                     "content-trust": "內容認證已關閉",
                     "dbus": "DBUS",
@@ -885,6 +886,7 @@
                 }
             },
             "service-control": {
+                "integration_doc": "整合文件",
                 "required": "必填欄位",
                 "service_data": "服務資料",
                 "target": "目標",
@@ -1213,6 +1215,14 @@
                 "key_wrong_type": "視覺化編輯器不支援所提供的 \"{key}\" 數值。支援 ({type_correct}) 但卻收到 ({type_wrong})。",
                 "no_template_editor_support": "視覺化編輯器不支援模版",
                 "no_type_provided": "未提供類型。"
+            },
+            "supervisor": {
+                "ask": "尋求協助",
+                "observer": "檢查 Observer",
+                "reboot": "嘗試重啟主機",
+                "system_health": "檢查系統健康狀態",
+                "title": "無法載入 Supervisor 面板！",
+                "wait": "假如為剛剛啟動，請確認已經給予 Supervisor 足夠時間進行啟動。"
             }
         },
         "login-form": {
@@ -1230,10 +1240,12 @@
         "notification_toast": {
             "connection_lost": "連線中斷。重新連線中...",
             "dismiss": "關閉",
+            "intergration_starting": "{integration} 正在啟動，在完成載入前、可能無法顯示所有功能。",
             "service_call_failed": "服務 {service} 執行失敗。",
             "started": "Home Assistant 已啟動！",
             "starting": "Home Assistant 正在啟動，在完成載入前、可能無法顯示所有功能。",
-            "triggered": "觸發 {name}"
+            "triggered": "觸發 {name}",
+            "wrapping_up_startup": "啟動完成中，在完成載入前、可能無法顯示所有功能。"
         },
         "panel": {
             "config": {
@@ -1597,7 +1609,7 @@
                         "delete_automation": "刪除自動化",
                         "delete_confirm": "確定要刪除此自動化？",
                         "dev_automation": "自動化除錯",
-                        "dev_only_editable": "僅有於 automations.yaml 內定義的自動化、方能進行除錯。",
+                        "dev_only_editable": "僅有具有唯一 ID 指派的自動化、方能進行除錯。",
                         "duplicate": "複製",
                         "duplicate_automation": "複製自動化",
                         "edit_automation": "編輯自動化",
@@ -1864,28 +1876,28 @@
                                 "documentation": "於開啟前，請先確定您已經瀏覽分析資料文件頁面 {link}、並了解所要傳送的資料及相關資料如何儲存。",
                                 "header": "分析資料",
                                 "instance_id": "實例 ID：{huuid}",
-                                "introduction": "分享實例分析資料，資料將可透過 {link} 連結公開取得",
-                                "learn_more": "詳細了解資料會如何處理。",
+                                "introduction": "分享安裝資訊將有助於協助 Home Assistant 改善、並協助說服更多製造廠商包含本地端控制與隱私權相關功能。",
+                                "learn_more": "資料會如何處理。",
                                 "needs_base": "需要開啟基本分析、方能使用此選項",
                                 "preference": {
                                     "base": {
-                                        "description": "將包含實例 ID、版本與安裝類型",
+                                        "description": "實例 ID、版本與安裝類型。",
                                         "title": "基本分析"
                                     },
                                     "diagnostics": {
-                                        "description": "分享當機回報與診斷資訊",
+                                        "description": "當發生位預期錯誤時，分享當機回報。",
                                         "title": "診斷資料"
                                     },
                                     "statistics": {
-                                        "description": "將包含安裝的元件總數，完整列表、請參閱文件",
+                                        "description": "已使用實體、使用者與其他元素總數。",
                                         "title": "統計資訊"
                                     },
                                     "usage_supervisor": {
-                                        "description": "將包含整合與附加元件的名稱與功能",
+                                        "description": "名稱、版本與功能。",
                                         "title": "已使用整合與附加元件"
                                     },
                                     "usage": {
-                                        "description": "將包含整合名稱",
+                                        "description": "名稱與版本資訊。",
                                         "title": "已使用整合"
                                     }
                                 }
@@ -2145,8 +2157,11 @@
                     "caption": "整合",
                     "config_entry": {
                         "area": "於 {area}",
+                        "check_the_logs": "檢查日誌",
+                        "configure": "設定",
                         "delete": "刪除",
                         "delete_confirm": "確定要刪除此整合？",
+                        "depends_on_cloud": "跟隨雲服務",
                         "device_unavailable": "裝置不可用",
                         "devices": "{count} {count, plural,\n  one {個裝置}\n  other {個裝置}\n}",
                         "disable_restart_confirm": "重啟 Home Assistant 以完成整合關閉",
@@ -2169,14 +2184,23 @@
                         "logs": "日誌",
                         "manuf": "廠牌：{manufacturer}",
                         "no_area": "無分區",
-                        "not_loaded": "未載入，請檢查 {logs_link}",
+                        "not_loaded": "未載入",
                         "options": "選項",
+                        "provided_by_custom_integration": "由自訂整合提供",
                         "reload": "重新載入",
                         "reload_confirm": "整合已重新載入",
                         "reload_restart_confirm": "重啟 Home Assistant 以完成整合重新載入",
                         "rename": "重新命名",
                         "restart_confirm": "重啟 Home Assistant 以完成此整合移動",
                         "services": "{count} {count, plural,\n  one {項服務}\n  other {項服務}\n}",
+                        "state": {
+                            "failed_unload": "卸載失敗",
+                            "loaded": "已載入",
+                            "migration_error": "遷移錯誤",
+                            "not_loaded": "未載入",
+                            "setup_error": "設定失敗",
+                            "setup_retry": "重試設定中"
+                        },
                         "system_options": "系統選項",
                         "unnamed_entry": "未命名實體"
                     },
@@ -2205,7 +2229,7 @@
                     "configure": "設定",
                     "configured": "已設定整合",
                     "confirm_new": "是否要設定 {integration}？",
-                    "description": "管理服務、裝置整合等",
+                    "description": "管理整合服務或裝置",
                     "details": "整合詳細資訊",
                     "disable": {
                         "disabled_integrations": "{number} 個已關閉",
@@ -2244,8 +2268,10 @@
                 "logs": {
                     "caption": "記錄",
                     "clear": "清除",
+                    "custom_integration": "自訂整合",
                     "description": "檢視 Home Assistant 日誌",
                     "details": "記錄詳細資料（{level}）",
+                    "error_from_custom_integration": "自訂整合產生錯誤。",
                     "level": {
                         "critical": "緊急",
                         "debug": "除錯",
@@ -2635,7 +2661,7 @@
                             "confirm_restart": "確定要重啟 Home Assistant 嗎？",
                             "confirm_stop": "確定要停止 Home Assistant 嗎？",
                             "heading": "服務器管理",
-                            "introduction": "由 Home Assistant，控制 Home Assistant 伺服器。",
+                            "introduction": "使用 Home Assistant、於離家時遠端控制 Home Assistant 伺服器。",
                             "restart": "重啟",
                             "stop": "停止"
                         },
@@ -2762,6 +2788,15 @@
                         "manufacturer_code_override": "製造商代碼覆寫",
                         "value": "數值"
                     },
+                    "configuration_page": {
+                        "shortcuts_title": "捷徑",
+                        "update_button": "更新設定",
+                        "zha_options": {
+                            "default_light_transition": "預設燈光轉換時間（秒）",
+                            "enable_identify_on_join": "當裝置加入網路時、開啟識別效果",
+                            "title": "Global 選項"
+                        }
+                    },
                     "device_pairing_card": {
                         "CONFIGURED": "設定完成",
                         "CONFIGURED_status_text": "初始化中",
@@ -2901,6 +2936,9 @@
                         "header": "Z-Wave 裝置設定",
                         "introduction": "管理與調整所選擇裝置 (節點) 之特定設定參數",
                         "parameter_is_read_only": "此參數為唯讀。",
+                        "set_param_accepted": "參數已更新。",
+                        "set_param_error": "發生錯誤。",
+                        "set_param_queued": "參數變更已排序、將會於裝置喚醒時更新。",
                         "zwave_js_device_database": "Z-Wave JS 裝置資料庫"
                     },
                     "node_status": {
@@ -3060,8 +3098,8 @@
                         "attributes": "屬性",
                         "copy_id": "複製 ID 至剪貼簿",
                         "current_entities": "目前實體",
-                        "description1": "設定 Home Assistant 裝置代表。",
-                        "description2": "將不會與實際裝置進行通訊。",
+                        "description1": "設定 Home Assistant 實體目前狀態。",
+                        "description2": "假如實體屬於裝置，將不會與實際裝置進行通訊。",
                         "entity": "實體",
                         "filter_attributes": "屬性篩選器",
                         "filter_entities": "實體篩選器",
diff --git a/yarn.lock b/yarn.lock
index da1bba399b..51c30e60e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,19 +16,12 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
-  integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
   dependencies:
-    "@babel/highlight" "^7.0.0"
-
-"@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
-  dependencies:
-    "@babel/highlight" "^7.8.3"
+    "@babel/highlight" "^7.12.13"
 
 "@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
   version "7.11.0"
@@ -39,14 +32,31 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/compat-data@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
-  integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
+  integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
+
+"@babel/core@^7.11.1":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a"
+  integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==
   dependencies:
-    browserslist "^4.11.1"
-    invariant "^2.2.4"
-    semver "^5.5.0"
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.16"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@babel/helper-module-transforms" "^7.13.14"
+    "@babel/helpers" "^7.13.16"
+    "@babel/parser" "^7.13.16"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.15"
+    "@babel/types" "^7.13.16"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
 
 "@babel/core@^7.11.6":
   version "7.11.6"
@@ -92,28 +102,6 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.8.4":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
-  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.6"
-    "@babel/parser" "^7.9.6"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.11.5", "@babel/generator@^7.11.6":
   version "7.11.6"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
@@ -132,34 +120,13 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e"
-  integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==
+"@babel/generator@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
+  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.13.16"
     jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
-  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
-  dependencies:
-    "@babel/types" "^7.9.5"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
-  dependencies:
-    "@babel/types" "^7.9.6"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
 "@babel/helper-annotate-as-pure@^7.10.4":
@@ -169,12 +136,12 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-annotate-as-pure@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
-  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
+"@babel/helper-annotate-as-pure@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
+  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.13"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
   version "7.10.4"
@@ -184,13 +151,13 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
+  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-explode-assignable-expression" "^7.12.13"
+    "@babel/types" "^7.12.13"
 
 "@babel/helper-compilation-targets@^7.10.4":
   version "7.10.4"
@@ -203,16 +170,15 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-compilation-targets@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
-  integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
+  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
   dependencies:
-    "@babel/compat-data" "^7.9.6"
-    browserslist "^4.11.1"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
-    semver "^5.5.0"
+    "@babel/compat-data" "^7.13.15"
+    "@babel/helper-validator-option" "^7.12.17"
+    browserslist "^4.14.5"
+    semver "^6.3.0"
 
 "@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5":
   version "7.10.5"
@@ -237,6 +203,17 @@
     "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
+"@babel/helper-create-class-features-plugin@^7.13.0":
+  version "7.13.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6"
+  integrity sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==
+  dependencies:
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-member-expression-to-functions" "^7.13.0"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+
 "@babel/helper-create-regexp-features-plugin@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
@@ -246,22 +223,13 @@
     "@babel/helper-regex" "^7.10.4"
     regexpu-core "^4.7.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz#c774268c95ec07ee92476a3862b75cc2839beb79"
-  integrity sha512-Gcsm1OHCUr9o9TcJln57xhWHtdXbA2pgQ58S0Lxlks0WMGNXuki4+GLfX0p+L2ZkINUGZvfkz8rzoqJQSthI+Q==
+"@babel/helper-create-regexp-features-plugin@^7.12.13":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
+  integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
   dependencies:
-    "@babel/helper-regex" "^7.8.3"
-    regexpu-core "^4.6.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.8.8":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
-  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-    regexpu-core "^4.7.0"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    regexpu-core "^4.7.1"
 
 "@babel/helper-define-map@^7.10.4":
   version "7.10.5"
@@ -272,14 +240,19 @@
     "@babel/types" "^7.10.5"
     lodash "^4.17.19"
 
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
+"@babel/helper-define-polyfill-provider@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1"
+  integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
 
 "@babel/helper-explode-assignable-expression@^7.10.4":
   version "7.11.4"
@@ -288,13 +261,12 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@babel/helper-explode-assignable-expression@^7.12.13":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
+  integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.13.0"
 
 "@babel/helper-function-name@^7.10.4":
   version "7.10.4"
@@ -305,23 +277,14 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
-  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
+"@babel/helper-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.12.13"
 
 "@babel/helper-get-function-arity@^7.10.4":
   version "7.10.4"
@@ -330,12 +293,12 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.13"
 
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
@@ -344,12 +307,13 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-hoist-variables@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
-  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
+"@babel/helper-hoist-variables@^7.13.0":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30"
+  integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/traverse" "^7.13.15"
+    "@babel/types" "^7.13.16"
 
 "@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
   version "7.11.0"
@@ -365,19 +329,12 @@
   dependencies:
     "@babel/types" "^7.12.7"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+"@babel/helper-member-expression-to-functions@^7.13.0", "@babel/helper-member-expression-to-functions@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
+  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
   dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-module-imports@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
-  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
-  dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-module-imports@^7.10.4":
   version "7.10.4"
@@ -393,12 +350,12 @@
   dependencies:
     "@babel/types" "^7.12.5"
 
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
+  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
   version "7.11.0"
@@ -428,18 +385,19 @@
     "@babel/types" "^7.12.1"
     lodash "^4.17.19"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
+"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.13.14":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
+  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-simple-access" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.13"
+    "@babel/types" "^7.13.14"
 
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
@@ -448,28 +406,23 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.13"
 
-"@babel/helper-plugin-utils@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
-  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
+  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
 
 "@babel/helper-plugin-utils@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
-
 "@babel/helper-regex@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
@@ -477,13 +430,6 @@
   dependencies:
     lodash "^4.17.19"
 
-"@babel/helper-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
-  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
-  dependencies:
-    lodash "^4.17.13"
-
 "@babel/helper-remap-async-to-generator@^7.10.4":
   version "7.11.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d"
@@ -494,16 +440,14 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+"@babel/helper-remap-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
+  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-wrap-function" "^7.13.0"
+    "@babel/types" "^7.13.0"
 
 "@babel/helper-replace-supers@^7.10.4":
   version "7.10.4"
@@ -525,25 +469,15 @@
     "@babel/traverse" "^7.12.5"
     "@babel/types" "^7.12.5"
 
-"@babel/helper-replace-supers@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc"
-  integrity sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==
+"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
+  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-replace-supers@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
-  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/helper-member-expression-to-functions" "^7.13.12"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-simple-access@^7.10.4":
   version "7.10.4"
@@ -560,13 +494,12 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
+"@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
+  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
   version "7.11.0"
@@ -575,6 +508,13 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
+  dependencies:
+    "@babel/types" "^7.12.1"
+
 "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
@@ -582,22 +522,27 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.12.13"
 
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
+"@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/helper-validator-option@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
+  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
 
 "@babel/helper-wrap-function@^7.10.4":
   version "7.10.4"
@@ -609,15 +554,15 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+"@babel/helper-wrap-function@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
+  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
 
 "@babel/helpers@^7.10.4":
   version "7.10.4"
@@ -637,22 +582,22 @@
     "@babel/traverse" "^7.12.5"
     "@babel/types" "^7.12.5"
 
-"@babel/helpers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
-  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
+"@babel/helpers@^7.13.16":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6"
+  integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.17"
+    "@babel/types" "^7.13.17"
 
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+"@babel/highlight@^7.0.0", "@babel/highlight@^7.12.13":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
+  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
   dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
     chalk "^2.0.0"
-    esutils "^2.0.2"
     js-tokens "^4.0.0"
 
 "@babel/highlight@^7.10.4":
@@ -664,39 +609,29 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
-  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
-
 "@babel/parser@^7.10.4", "@babel/parser@^7.11.5":
   version "7.11.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
   integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
 
+"@babel/parser@^7.12.13", "@babel/parser@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
+  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
+
 "@babel/parser@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
   integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
 
-"@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
-  integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
-
-"@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
-  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
-
-"@babel/parser@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
+  integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
 
 "@babel/plugin-external-helpers@^7.10.4":
   version "7.10.4"
@@ -714,14 +649,14 @@
     "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
+"@babel/plugin-proposal-async-generator-functions@^7.13.15":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b"
+  integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-proposal-class-properties@^7.10.4":
   version "7.10.4"
@@ -739,6 +674,14 @@
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-class-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
+  integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-proposal-decorators@^7.10.5":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz#42898bba478bc4b1ae242a703a953a7ad350ffb4"
@@ -756,13 +699,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
+"@babel/plugin-proposal-dynamic-import@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d"
+  integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
 "@babel/plugin-proposal-export-namespace-from@^7.10.4":
   version "7.10.4"
@@ -772,6 +715,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
+"@babel/plugin-proposal-export-namespace-from@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
+  integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
 "@babel/plugin-proposal-json-strings@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz#593e59c63528160233bd321b1aebe0820c2341db"
@@ -780,13 +731,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+"@babel/plugin-proposal-json-strings@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
+  integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
 "@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
   version "7.11.0"
@@ -796,6 +747,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
+"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
+  integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
@@ -804,13 +763,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
+  integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
 "@babel/plugin-proposal-numeric-separator@^7.10.4":
   version "7.10.4"
@@ -820,13 +779,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
+"@babel/plugin-proposal-numeric-separator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
+  integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-proposal-object-rest-spread@^7.11.0":
   version "7.11.0"
@@ -837,14 +796,16 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
-  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
+"@babel/plugin-proposal-object-rest-spread@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
+  integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
+    "@babel/compat-data" "^7.13.8"
+    "@babel/helper-compilation-targets" "^7.13.8"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.13.0"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.10.4":
   version "7.10.4"
@@ -854,13 +815,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
+"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
+  integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
 "@babel/plugin-proposal-optional-chaining@^7.11.0":
   version "7.11.0"
@@ -871,13 +832,14 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+"@babel/plugin-proposal-optional-chaining@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866"
+  integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
 "@babel/plugin-proposal-private-methods@^7.10.4":
   version "7.10.4"
@@ -887,6 +849,14 @@
     "@babel/helper-create-class-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-private-methods@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
+  integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
@@ -895,23 +865,15 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
-  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
+  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz#b646c3adea5f98800c9ab45105ac34d06cd4a47f"
-  integrity sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-syntax-async-generators@^7.8.0":
+"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -925,6 +887,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-syntax-decorators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz#6853085b2c429f9d322d02f5a635018cdeb2360c"
@@ -960,7 +929,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-json-strings@^7.8.0":
+"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
@@ -974,7 +943,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
@@ -988,28 +957,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.0":
+"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0":
+"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
@@ -1030,12 +992,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
+"@babel/plugin-syntax-top-level-await@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
+  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-typescript@^7.10.4":
   version "7.10.4"
@@ -1051,12 +1013,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
+"@babel/plugin-transform-arrow-functions@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
+  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
 "@babel/plugin-transform-async-to-generator@^7.10.4":
   version "7.10.4"
@@ -1067,14 +1029,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
+"@babel/plugin-transform-async-to-generator@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
+  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-remap-async-to-generator" "^7.13.0"
 
 "@babel/plugin-transform-block-scoped-functions@^7.10.4":
   version "7.10.4"
@@ -1083,12 +1045,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
+"@babel/plugin-transform-block-scoped-functions@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
+  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-block-scoping@^7.10.4":
   version "7.11.1"
@@ -1097,13 +1059,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
+"@babel/plugin-transform-block-scoping@^7.12.13":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892"
+  integrity sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
 "@babel/plugin-transform-classes@^7.10.4":
   version "7.10.4"
@@ -1119,18 +1080,17 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
+"@babel/plugin-transform-classes@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
+  integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-replace-supers" "^7.13.0"
+    "@babel/helper-split-export-declaration" "^7.12.13"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.10.4":
@@ -1140,12 +1100,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
+"@babel/plugin-transform-computed-properties@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
+  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
 "@babel/plugin-transform-destructuring@^7.10.4":
   version "7.10.4"
@@ -1154,12 +1114,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
-  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
+"@babel/plugin-transform-destructuring@^7.13.0":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27"
+  integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
 "@babel/plugin-transform-dotall-regex@^7.10.4":
   version "7.10.4"
@@ -1169,13 +1129,13 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
-  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
+"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
+  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-duplicate-keys@^7.10.4":
   version "7.10.4"
@@ -1184,12 +1144,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
+"@babel/plugin-transform-duplicate-keys@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
+  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-exponentiation-operator@^7.10.4":
   version "7.10.4"
@@ -1199,13 +1159,13 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
+"@babel/plugin-transform-exponentiation-operator@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
+  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-for-of@^7.10.4":
   version "7.10.4"
@@ -1214,12 +1174,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
+"@babel/plugin-transform-for-of@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
+  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
 "@babel/plugin-transform-function-name@^7.10.4":
   version "7.10.4"
@@ -1229,13 +1189,13 @@
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
+"@babel/plugin-transform-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
+  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-literals@^7.10.4":
   version "7.10.4"
@@ -1244,12 +1204,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
+"@babel/plugin-transform-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
+  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-member-expression-literals@^7.10.4":
   version "7.10.4"
@@ -1258,12 +1218,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
+"@babel/plugin-transform-member-expression-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
+  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-modules-amd@^7.10.4":
   version "7.10.5"
@@ -1274,13 +1234,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
-  integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
+"@babel/plugin-transform-modules-amd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3"
+  integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-commonjs@^7.10.4":
@@ -1293,14 +1253,14 @@
     "@babel/helper-simple-access" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
-  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
+"@babel/plugin-transform-modules-commonjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"
+  integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-simple-access" "^7.12.13"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-systemjs@^7.10.4":
@@ -1313,14 +1273,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
-  integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
+"@babel/plugin-transform-modules-systemjs@^7.13.8":
+  version "7.13.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
+  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-hoist-variables" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-identifier" "^7.12.11"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-umd@^7.10.4":
@@ -1331,13 +1292,13 @@
     "@babel/helper-module-transforms" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+"@babel/plugin-transform-modules-umd@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b"
+  integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
 "@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
   version "7.10.4"
@@ -1346,12 +1307,12 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
+  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
 
 "@babel/plugin-transform-new-target@^7.10.4":
   version "7.10.4"
@@ -1360,12 +1321,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@babel/plugin-transform-new-target@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
+  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-object-super@^7.10.4":
   version "7.10.4"
@@ -1375,13 +1336,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+"@babel/plugin-transform-object-super@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
+  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-replace-supers" "^7.12.13"
 
 "@babel/plugin-transform-parameters@^7.10.4":
   version "7.10.5"
@@ -1391,13 +1352,12 @@
     "@babel/helper-get-function-arity" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@babel/plugin-transform-parameters@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
+  integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
 "@babel/plugin-transform-property-literals@^7.10.4":
   version "7.10.4"
@@ -1406,12 +1366,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+"@babel/plugin-transform-property-literals@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
+  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-regenerator@^7.10.4":
   version "7.10.4"
@@ -1420,10 +1380,10 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+"@babel/plugin-transform-regenerator@^7.13.15":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
+  integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
   dependencies:
     regenerator-transform "^0.14.2"
 
@@ -1434,12 +1394,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+"@babel/plugin-transform-reserved-words@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
+  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-shorthand-properties@^7.10.4":
   version "7.10.4"
@@ -1448,12 +1408,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
+"@babel/plugin-transform-shorthand-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
+  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-spread@^7.11.0":
   version "7.11.0"
@@ -1463,12 +1423,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
 
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
+"@babel/plugin-transform-spread@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
+  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
 "@babel/plugin-transform-sticky-regex@^7.10.4":
   version "7.10.4"
@@ -1478,13 +1439,12 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
 
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
+"@babel/plugin-transform-sticky-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
+  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-template-literals@^7.10.4":
   version "7.10.5"
@@ -1494,13 +1454,12 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+"@babel/plugin-transform-template-literals@^7.13.0":
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
+  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.13.0"
 
 "@babel/plugin-transform-typeof-symbol@^7.10.4":
   version "7.10.4"
@@ -1509,12 +1468,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+"@babel/plugin-transform-typeof-symbol@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
+  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-transform-typescript@^7.10.4":
   version "7.11.0"
@@ -1532,6 +1491,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-unicode-escapes@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
+  integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
 "@babel/plugin-transform-unicode-regex@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz#e56d71f9282fac6db09c82742055576d5e6d80a8"
@@ -1540,13 +1506,88 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+"@babel/plugin-transform-unicode-regex@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
+  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/preset-env@^7.11.0":
+  version "7.13.15"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.15.tgz#c8a6eb584f96ecba183d3d414a83553a599f478f"
+  integrity sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA==
+  dependencies:
+    "@babel/compat-data" "^7.13.15"
+    "@babel/helper-compilation-targets" "^7.13.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12"
+    "@babel/plugin-proposal-async-generator-functions" "^7.13.15"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.13.8"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
+    "@babel/plugin-proposal-json-strings" "^7.13.8"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.13"
+    "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
+    "@babel/plugin-proposal-private-methods" "^7.13.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.12.13"
+    "@babel/plugin-transform-arrow-functions" "^7.13.0"
+    "@babel/plugin-transform-async-to-generator" "^7.13.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
+    "@babel/plugin-transform-block-scoping" "^7.12.13"
+    "@babel/plugin-transform-classes" "^7.13.0"
+    "@babel/plugin-transform-computed-properties" "^7.13.0"
+    "@babel/plugin-transform-destructuring" "^7.13.0"
+    "@babel/plugin-transform-dotall-regex" "^7.12.13"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.13"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
+    "@babel/plugin-transform-for-of" "^7.13.0"
+    "@babel/plugin-transform-function-name" "^7.12.13"
+    "@babel/plugin-transform-literals" "^7.12.13"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.13"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.13.8"
+    "@babel/plugin-transform-modules-umd" "^7.13.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
+    "@babel/plugin-transform-new-target" "^7.12.13"
+    "@babel/plugin-transform-object-super" "^7.12.13"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+    "@babel/plugin-transform-property-literals" "^7.12.13"
+    "@babel/plugin-transform-regenerator" "^7.13.15"
+    "@babel/plugin-transform-reserved-words" "^7.12.13"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.13"
+    "@babel/plugin-transform-spread" "^7.13.0"
+    "@babel/plugin-transform-sticky-regex" "^7.12.13"
+    "@babel/plugin-transform-template-literals" "^7.13.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.13"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.13"
+    "@babel/plugin-transform-unicode-regex" "^7.12.13"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.13.14"
+    babel-plugin-polyfill-corejs2 "^0.2.0"
+    babel-plugin-polyfill-corejs3 "^0.2.0"
+    babel-plugin-polyfill-regenerator "^0.2.0"
+    core-js-compat "^3.9.0"
+    semver "^6.3.0"
 
 "@babel/preset-env@^7.11.5":
   version "7.11.5"
@@ -1622,76 +1663,10 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.8.4":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
-  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
-  dependencies:
-    "@babel/compat-data" "^7.9.6"
-    "@babel/helper-compilation-targets" "^7.9.6"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.6"
-    browserslist "^4.11.1"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
-"@babel/preset-modules@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
-  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+"@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1721,6 +1696,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.8.4":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.17.tgz#8966d1fc9593bf848602f0662d6b4d0069e3a7ec"
+  integrity sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.7.2":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
@@ -1728,13 +1710,6 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.8.4":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
-  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
 "@babel/template@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
@@ -1744,6 +1719,15 @@
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/template@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
 "@babel/template@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
@@ -1753,24 +1737,6 @@
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
 
-"@babel/template@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
-  integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
 "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.5":
   version "7.11.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
@@ -1801,59 +1767,19 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/traverse@^7.8.3":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
-  integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
+  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.4"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.8.4"
-    "@babel/types" "^7.8.3"
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.16"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.13.16"
+    "@babel/types" "^7.13.17"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.8.6":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
-  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.5"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.5"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
-  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.6"
-    "@babel/types" "^7.9.6"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/types@^7.0.0":
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.0.tgz#670724f77d24cce6cc7d8cf64599d511d164894c"
-  integrity sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.11"
-    to-fast-properties "^2.0.0"
 
 "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5":
   version "7.11.5"
@@ -1873,31 +1799,12 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.4.4":
-  version "7.6.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
-  integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==
+"@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.4.4":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
+  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
   dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
-  integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
-  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
     to-fast-properties "^2.0.0"
 
 "@braintree/sanitize-url@^5.0.0":
@@ -1906,9 +1813,9 @@
   integrity sha512-WmKrB/575EJCzbeSJR3YQ5sET5FaizeljLRw1382qVUeGqzuWBgIS+AF5a0FO51uQTrDpoRgvuHC2IWVsgwkkA==
 
 "@codemirror/commands@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.18.0.tgz#10344d7d7a0fecad826e9853c1e6069d706298c6"
-  integrity sha512-4H63B4oqr8dmJ3VOKvMI7xrZIBJjAdtz3Z0V/Jt0HlIYTe76Omy4h9BS3b9EgyNaWjIO/Slz3KQPwihcC8uR5Q==
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.18.1.tgz#2866a15936b7ab3ff30112eb1887a0e01fef6205"
+  integrity sha512-JBdGjRTCHi/eVsj5oL1S4kzhepyUVW0EnmOvwh1IYH9iN6FnRkEgaxJBryRgbos7Or8RomOKK01pprGjfqN6oA==
   dependencies:
     "@codemirror/language" "^0.18.0"
     "@codemirror/matchbrackets" "^0.18.0"
@@ -1918,15 +1825,15 @@
     lezer-tree "^0.13.0"
 
 "@codemirror/gutter@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/gutter/-/gutter-0.18.0.tgz#b6fb340f7cc7b4ed1a67687e145489b3ed93098d"
-  integrity sha512-9hcKzBM5EjhWwrau5Xiv0ll/yOvkgiyLnH7DTsjFCUvuyfbS45WVEMhQ6C+HfsoRVR4TJqRVLJjaIktZqaAqnw==
+  version "0.18.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/gutter/-/gutter-0.18.2.tgz#b47ad6ea2ae9f18eccf015610598dfb302d086d3"
+  integrity sha512-mrmzt6TG9sXSKOjL5LRLv/yPbVdQqVDNSUrisq9OpIHXwZgb2pg9jYhlhw8zdgB952BmENIMr2624I13uy568Q==
   dependencies:
     "@codemirror/rangeset" "^0.18.0"
     "@codemirror/state" "^0.18.0"
     "@codemirror/view" "^0.18.0"
 
-"@codemirror/highlight@^0.18.0", "@codemirror/highlight@^0.18.1":
+"@codemirror/highlight@^0.18.0":
   version "0.18.3"
   resolved "https://registry.yarnpkg.com/@codemirror/highlight/-/highlight-0.18.3.tgz#50e268630f113c322a2dc97c9f68d71934fffcb0"
   integrity sha512-NmRmkmWl8ht6Y6Y39ghov84AMPCqhUPIH9fmILs2NaWxZFZf4jGCTzrULnmREGsTie+26+LbKUncIU+PBu1Qng==
@@ -1939,17 +1846,17 @@
     style-mod "^4.0.0"
 
 "@codemirror/history@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/history/-/history-0.18.0.tgz#1267499e20f977b5b4179ec2cfd5013d78ab0cbc"
-  integrity sha512-oMpvu7c8GQnEn1nX98+WuVQuMEVxOPJFU1yrA22sWfqG7lkrJAv7p4geCWOpwQY9/LWw4sICkDbCeirre4BqBA==
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/history/-/history-0.18.1.tgz#853cde4b138b172235d58f945871f0fc08b7310a"
+  integrity sha512-Aad3p4zs6UYKCUMXYjh7cvPK0ajuL+rMib9yBZ61w81LLl6OkM31Xrn9J6CLJmPxCwP3OJFiqBmNSBQ05oIsTw==
   dependencies:
-    "@codemirror/state" "^0.18.0"
+    "@codemirror/state" "^0.18.3"
     "@codemirror/view" "^0.18.0"
 
 "@codemirror/language@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-0.18.0.tgz#16c3beaf372d0ecfcb76d708a8f55efccaa25563"
-  integrity sha512-gryu0Sej1vG3S3njwsJ+bhz9zLoJxZ2TahLlxpqOB3uqVGZrGDyE+GmZBnA6I3hwHvaO1O4WXKScVsKoW6HqFA==
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-0.18.1.tgz#23682324228606c4ae5b6a9f7cd0a4b9fdff83dd"
+  integrity sha512-j/TWV8sNmzU79kk/hPLb9NqSPoH59850kQSpgY11LxOEBlKVRKgaWabgNtUCSeVCAnfisGekupk3aq2ftILqug==
   dependencies:
     "@codemirror/state" "^0.18.0"
     "@codemirror/text" "^0.18.0"
@@ -1974,10 +1881,10 @@
     "@codemirror/view" "^0.18.0"
     lezer-tree "^0.13.0"
 
-"@codemirror/panel@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/panel/-/panel-0.18.0.tgz#79726a4506f45b5abbe31a6dd80f4cd29a810e49"
-  integrity sha512-wgKpe+QRjZwFKoMbMxqUFlV4j3dvgm8Q4v12SS0L6yxnFZkMsdbmowh0+pBa1Cp5iTSb0pdEOjAQaiWFZyIk9g==
+"@codemirror/panel@^0.18.1":
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/panel/-/panel-0.18.1.tgz#b2179cdfb7d7c2913ba682d61d00edff160cfad0"
+  integrity sha512-5Zo9cUw0QDlFzX4nhIDYjTARPOnPk5rzxAUQo1O35kTLV+6zRh7wsGlvU7VrZnBcIoaAmHfKrZ4lt6+h7fbFGw==
   dependencies:
     "@codemirror/state" "^0.18.0"
     "@codemirror/view" "^0.18.0"
@@ -1999,28 +1906,28 @@
     "@codemirror/view" "^0.18.0"
 
 "@codemirror/search@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-0.18.0.tgz#aabb53d4678196e82309241753cd67403149e35d"
-  integrity sha512-gjg1yDz6gof0lhOEzjqofidd5tH2dwUwiyzym6E78n3tZBh/KygLKmw0B0T9a5s9JTVZtzup95i+TmcHrz2MQg==
+  version "0.18.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-0.18.2.tgz#7f6311ce4d5749d92aefb41b2f8628d28d90918c"
+  integrity sha512-t90Ra34piJDF589hNDmuA1fVKCFDh0FTuTZTHDmmSaWS5OWq2++zAwRTQnOdQD+uGfEUwLQPiLJzu60NDhA5xw==
   dependencies:
-    "@codemirror/panel" "^0.18.0"
+    "@codemirror/panel" "^0.18.1"
     "@codemirror/rangeset" "^0.18.0"
     "@codemirror/state" "^0.18.0"
     "@codemirror/text" "^0.18.0"
     "@codemirror/view" "^0.18.0"
     crelt "^1.0.5"
 
-"@codemirror/state@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-0.18.0.tgz#5bb5600c5bf32d4103b6576cd33bdb8cf926d602"
-  integrity sha512-E5Tgx/CVmQQdiIOoJ4xX4hy2RGqTjxbpzDifGn8wUu3Driq/uZ+ncr7M4ojWs1T83yYFevNBmPtT5vprD25vYA==
+"@codemirror/state@^0.18.0", "@codemirror/state@^0.18.3":
+  version "0.18.6"
+  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-0.18.6.tgz#46f4cabd7e635dd0f229d0ff1136d79b071354f8"
+  integrity sha512-jBY4KFY6RGPkuRUFXSZtgxpKebju8CJq7SkKYf+NsD8OZzDSauxPPYAL7V2z8ubvw74qLPIKIX2hERvY6WBdbg==
   dependencies:
     "@codemirror/text" "^0.18.0"
 
 "@codemirror/stream-parser@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@codemirror/stream-parser/-/stream-parser-0.18.0.tgz#d4eaf7043324bf9d20c518732a2ce2ff845256a5"
-  integrity sha512-qxtSBvn2kKMm0XlfJ0e7FbVIg10RsaNjX5n/jRWlK2Y0kHjk+Huk5vkkGR3vjwHDgRdfwQe/vqZtkPz3DFQpLQ==
+  version "0.18.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/stream-parser/-/stream-parser-0.18.2.tgz#d96ac5724650719c4a7784f2b94449366b22130e"
+  integrity sha512-3RTRmhIixcC2ps/G8So+BL0qJkwaspjyYt4smVYlSn4eNbxGK9K2RCnSmOPRv0SkuQMu3oUFbprFI/SbtZrPKg==
   dependencies:
     "@codemirror/highlight" "^0.18.0"
     "@codemirror/language" "^0.18.0"
@@ -2035,9 +1942,9 @@
   integrity sha512-HMzHNIAbjCiCf3tEJMRg6ul01KPuXxQGNiHlHgAnqPguq/CX+L4Nvj5JlWQAI91Pupk18zhmM1c6eaazX4YeTg==
 
 "@codemirror/view@^0.18.0":
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-0.18.1.tgz#5fbc97acd28997ed2aafbe6e8d48d9446b4bf5ff"
-  integrity sha512-chyy+oEnywKMUFDMafVAMcrV+DkjJT3l6pSfN1cvM2LBM/eY54gekv/aXtmsBFRSnd+u09mhjb/kGB+EdNHIjg==
+  version "0.18.9"
+  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-0.18.9.tgz#bc2e4a30556888a07490df293171880275e0cdc3"
+  integrity sha512-u/sqtt1Exbcpwzj/K37++eToT/MehS6LFE3rfYMNsoxmjT75z2oFM2Q9PLymu344ZxgjgUNWh5cWmVxdjFdTwA==
   dependencies:
     "@codemirror/rangeset" "^0.18.0"
     "@codemirror/state" "^0.18.0"
@@ -2132,32 +2039,38 @@
   dependencies:
     base64-js "^1.3.0"
 
-"@hapi/address@2.x.x":
+"@hapi/address@^2.1.2":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
   integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==
 
-"@hapi/bourne@1.x.x":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
-  integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
+"@hapi/formula@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-1.2.0.tgz#994649c7fea1a90b91a0a1e6d983523f680e10cd"
+  integrity sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==
 
-"@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0":
+"@hapi/hoek@^8.2.4", "@hapi/hoek@^8.3.0":
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz#fde96064ca446dec8c55a8c2f130957b070c6e06"
   integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==
 
-"@hapi/joi@^15.1.0":
-  version "15.1.1"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
-  integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
+"@hapi/joi@^16.1.8":
+  version "16.1.8"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.8.tgz#84c1f126269489871ad4e2decc786e0adef06839"
+  integrity sha512-wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==
   dependencies:
-    "@hapi/address" "2.x.x"
-    "@hapi/bourne" "1.x.x"
-    "@hapi/hoek" "8.x.x"
-    "@hapi/topo" "3.x.x"
+    "@hapi/address" "^2.1.2"
+    "@hapi/formula" "^1.2.0"
+    "@hapi/hoek" "^8.2.4"
+    "@hapi/pinpoint" "^1.0.2"
+    "@hapi/topo" "^3.1.3"
 
-"@hapi/topo@3.x.x":
+"@hapi/pinpoint@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-1.0.2.tgz#025b7a36dbbf4d35bf1acd071c26b20ef41e0d13"
+  integrity sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==
+
+"@hapi/topo@^3.1.3":
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz#68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"
   integrity sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==
@@ -3350,6 +3263,14 @@
   dependencies:
     "@webcomponents/shadycss" "^1.5.2"
 
+"@rollup/plugin-babel@^5.2.0":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.0.tgz#9cb1c5146ddd6a4968ad96f209c50c62f92f9879"
+  integrity sha512-9uIC8HZOnVLrLHxayq/PTzw+uS25E14KPUBh5ktF+18Mjo5yK0ToMMx6epY0uEgkjwJw0aBW4x2horYXh8juWw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.10.4"
+    "@rollup/pluginutils" "^3.1.0"
+
 "@rollup/plugin-babel@^5.2.1":
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz#20fc8f8864dc0eaa1c5578408459606808f72924"
@@ -3378,7 +3299,19 @@
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
-"@rollup/plugin-node-resolve@^7.1.1", "@rollup/plugin-node-resolve@^7.1.3":
+"@rollup/plugin-node-resolve@^11.2.1":
+  version "11.2.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60"
+  integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    "@types/resolve" "1.17.1"
+    builtin-modules "^3.1.0"
+    deepmerge "^4.2.2"
+    is-module "^1.0.0"
+    resolve "^1.19.0"
+
+"@rollup/plugin-node-resolve@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz#80de384edfbd7bfc9101164910f86078151a3eca"
   integrity sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==
@@ -3402,7 +3335,7 @@
     is-module "^1.0.0"
     resolve "^1.17.0"
 
-"@rollup/plugin-replace@^2.3.1", "@rollup/plugin-replace@^2.3.2":
+"@rollup/plugin-replace@^2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.3.2.tgz#da4e0939047f793c2eb5eedfd6c271232d0a033f"
   integrity sha512-KEEL7V2tMNOsbAoNMKg91l1sNXBDoiP31GFlqXVOuV5691VQKzKBh91+OKKOG4uQWYqcFskcjFyh1d5YnZd0Zw==
@@ -3410,16 +3343,15 @@
     "@rollup/pluginutils" "^3.0.8"
     magic-string "^0.25.5"
 
-"@rollup/pluginutils@^3.0.8":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.10.tgz#a659b9025920378494cd8f8c59fbf9b3a50d5f12"
-  integrity sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw==
+"@rollup/plugin-replace@^2.4.1":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a"
+  integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==
   dependencies:
-    "@types/estree" "0.0.39"
-    estree-walker "^1.0.1"
-    picomatch "^2.2.2"
+    "@rollup/pluginutils" "^3.1.0"
+    magic-string "^0.25.7"
 
-"@rollup/pluginutils@^3.1.0":
+"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
   integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
@@ -3464,10 +3396,10 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@surma/rollup-plugin-off-main-thread@^1.1.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.1.tgz#bf1343e5a926e5a1da55e3affd761dda4ce143ef"
-  integrity sha512-ZPBWYQDdO4JZiTmTP3DABsHhIPA7bEJk9Znk7tZsrbPGanoGo8YxMv//WLx5Cvb+lRgS42+6yiOIYYHCKDmkpQ==
+"@surma/rollup-plugin-off-main-thread@^1.4.1":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz#e6786b6af5799f82f7ab3a82e53f6182d2b91a58"
+  integrity sha512-yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A==
   dependencies:
     ejs "^2.6.1"
     magic-string "^0.25.0"
@@ -3524,13 +3456,6 @@
   dependencies:
     "@types/chrome" "*"
 
-"@types/codemirror@^0.0.97":
-  version "0.0.97"
-  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.97.tgz#6f2d8266b7f1b34aacfe8c77221fafe324c3d081"
-  integrity sha512-n5d7o9nWhC49DjfhsxANP7naWSeTzrjXASkUDQh7626sM4zK9XP2EVcHp1IcCf/IPV6c7ORzDUDF3Bkt231VKg==
-  dependencies:
-    "@types/tern" "*"
-
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -3584,7 +3509,12 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@0.0.39":
+"@types/estree@*":
+  version "0.0.47"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
+  integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
+
+"@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
@@ -3649,11 +3579,6 @@
   resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.4.tgz#3275842095abb60d14b47fa798cc9ff708dab6d4"
   integrity sha512-iUxzm1meBm3stxUMzRqgOVHjj4Kgpgu5w9fm4X7kPRfSgVRzythsucEN7/jtOo8SQzm+HfcxWWzJS0mJDH/3DQ==
 
-"@types/hls.js@^0.12.3":
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/@types/hls.js/-/hls.js-0.12.3.tgz#09d5d1dbcd78d7dd46deff6db02bd2af9721a4cf"
-  integrity sha512-1QbxVTp7v9bn8MjvbMXV4YbMntC9Dv8v9bI9LgWxfg9Mgib0/jI2XITUEKGgG5Cde48ktyA1UHTSWld7QKKNnQ==
-
 "@types/http-assert@*":
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b"
@@ -3762,9 +3687,9 @@
   integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==
 
 "@types/node@*":
-  version "11.12.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.12.1.tgz#d90123f6c61fdf2f7cddd286ddae891586dd3488"
-  integrity sha512-sKDlqv6COJrR7ar0+GqqhrXQDzQlMcqMnF2iEU6m9hLo8kxozoAGUazwPyELHlRVmjsbvlnGXjnzyptSXVmceA==
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
+  integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==
 
 "@types/node@^10.12.18":
   version "10.17.46"
@@ -3818,13 +3743,6 @@
   resolved "https://registry.yarnpkg.com/@types/sortablejs/-/sortablejs-1.10.6.tgz#98725ae08f1dfe28b8da0fdf302c417f5ff043c0"
   integrity sha512-QRz8Z+uw2Y4Gwrtxw8hD782zzuxxugdcq8X/FkPsXUa1kfslhGzy13+4HugO9FXNo+jlWVcE6DYmmegniIQ30A==
 
-"@types/tern@*":
-  version "0.23.3"
-  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.3.tgz#4b54538f04a88c9ff79de1f6f94f575a7f339460"
-  integrity sha512-imDtS4TAoTcXk0g7u4kkWqedB3E4qpjXzCpD2LU5M5NAXHzCDsypyvXSaG7mM8DKYkCRa7tFp4tS/lp/Wo7Q3w==
-  dependencies:
-    "@types/estree" "*"
-
 "@types/webspeechapi@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/webspeechapi/-/webspeechapi-0.0.29.tgz#8f3c6b31b779df7a9bbac7f89acfce0c3bcb1972"
@@ -4467,11 +4385,6 @@ acorn-jsx@^5.2.0:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
   integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
 
-acorn@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
-  integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
-
 acorn@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
@@ -4987,18 +4900,16 @@ async@^2.6.2:
   dependencies:
     lodash "^4.17.11"
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-babel-extract-comments@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz#0a2aedf81417ed391b85e18b4614e693a0351a21"
-  integrity sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==
-  dependencies:
-    babylon "^6.18.0"
-
 babel-loader@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3"
@@ -5017,20 +4928,31 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-syntax-object-rest-spread@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
-
-babel-plugin-transform-object-rest-spread@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
-  integrity sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=
+babel-plugin-polyfill-corejs2@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4"
+  integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==
   dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.26.0"
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.0"
+    semver "^6.1.1"
 
-babel-runtime@^6.26.0, babel-runtime@^6.9.2:
+babel-plugin-polyfill-corejs3@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2"
+  integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.0"
+    core-js-compat "^3.9.1"
+
+babel-plugin-polyfill-regenerator@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8"
+  integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.0"
+
+babel-runtime@^6.9.2:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -5038,11 +4960,6 @@ babel-runtime@^6.26.0, babel-runtime@^6.9.2:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
-
 bach@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
@@ -5059,9 +4976,9 @@ bach@^1.0.0:
     now-and-later "^2.0.0"
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-js@^1.0.2:
   version "1.3.1"
@@ -5286,16 +5203,6 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.11.1:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
-  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
-  dependencies:
-    caniuse-lite "^1.0.30001043"
-    electron-to-chromium "^1.3.413"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
-
 browserslist@^4.12.0:
   version "4.14.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
@@ -5317,14 +5224,16 @@ browserslist@^4.14.5:
     escalade "^3.1.1"
     node-releases "^1.1.70"
 
-browserslist@^4.8.3:
-  version "4.8.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz#ec8301ff415e6a42c949d0e66b405eb539c532d0"
-  integrity sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==
+browserslist@^4.16.5:
+  version "4.16.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
+  integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
   dependencies:
-    caniuse-lite "^1.0.30001027"
-    electron-to-chromium "^1.3.349"
-    node-releases "^1.1.49"
+    caniuse-lite "^1.0.30001214"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.719"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
@@ -5395,9 +5304,9 @@ buffer@^5.4.3:
     ieee754 "^1.1.4"
 
 builtin-modules@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
-  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887"
+  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
@@ -5437,6 +5346,14 @@ cache-content-type@^1.0.0:
     mime-types "^2.1.18"
     ylru "^1.2.0"
 
+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -5507,16 +5424,6 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001027:
-  version "1.0.30001027"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz#283e2ef17d94889cc216a22c6f85303d78ca852d"
-  integrity sha512-7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==
-
-caniuse-lite@^1.0.30001043:
-  version "1.0.30001055"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001055.tgz#7b52c3537f7a8c0408aca867e83d2b04268b54cd"
-  integrity sha512-MbwsBmKrBSKIWldfdIagO5OJWZclpJtS4h0Jrk/4HFrXJxTdVdH23Fd+xCiHriVGvYcWyW8mR/CPsYajlH8Iuw==
-
 caniuse-lite@^1.0.30001135:
   version "1.0.30001144"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001144.tgz#bca0fffde12f97e1127a351fec3bfc1971aa3b3d"
@@ -5527,6 +5434,11 @@ caniuse-lite@^1.0.30001181:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz#bacb432b6701f690c8c5f7c680166b9a9f0843d9"
   integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw==
 
+caniuse-lite@^1.0.30001214:
+  version "1.0.30001219"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b"
+  integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==
+
 chai@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
@@ -5887,11 +5799,6 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codemirror@^5.49.0:
-  version "5.49.0"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.49.0.tgz#adedbffcc81091e4a0334bcb96b1ae3b7ada5e3f"
-  integrity sha512-Hyzr0HToBdZpLBN9dYFO/KlJAsKH37/cXVHPAqa+imml0R92tb9AkmsvjnXL+SluEvjjdfkDgRjc65NG5jnMYA==
-
 collection-map@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c"
@@ -5948,6 +5855,11 @@ colorette@^1.2.1:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
   integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
 
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 comlink@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/comlink/-/comlink-4.3.0.tgz#80b3366baccd87897dab3638ebfcfae28b2f87c7"
@@ -5978,21 +5890,16 @@ commander@^2.14.1, commander@^2.19.0, commander@^2.9.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
-commander@^2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+commander@^2.20.0, commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
   integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
 
-commander@~2.20.3:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -6155,18 +6062,18 @@ copy-props@^2.0.1:
     each-props "^1.3.0"
     is-plain-object "^2.0.1"
 
-core-js-compat@^3.6.2:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
-  integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
+core-js-compat@^3.6.2, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.1.tgz#57a91e9b02d3bb8cf37f82eceaf44a3d646fa614"
+  integrity sha512-aZ0e4tmlG/aOBHj92/TuOuZwp6jFvn1WNabU5VOVixzhu5t5Ao+JZkQOPlgNXu6ynwLrwJxklT4Gw1G1VGEh+g==
   dependencies:
-    browserslist "^4.8.3"
+    browserslist "^4.16.5"
     semver "7.0.0"
 
 core-js@^2.4.0:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
-  integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.6.5:
   version "3.6.5"
@@ -6292,10 +6199,10 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
 cssfilter@0.0.10:
   version "0.0.10"
@@ -6355,13 +6262,20 @@ debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@^4.0.1, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -6687,16 +6601,6 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.349:
-  version "1.3.349"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.349.tgz#663f26a69d348a462df47b4d7ab162a2f29bbcb7"
-  integrity sha512-uEb2zs6EJ6OZIqaMsCSliYVgzE/f7/s1fLWqtvRtHg/v5KBF2xds974fUnyatfxIDgkqzQVwFtam5KExqywx0Q==
-
-electron-to-chromium@^1.3.413:
-  version "1.3.434"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.434.tgz#a67dcb268e93768e2169399999ccffa4783f048e"
-  integrity sha512-WjzGrE6appXvMyc2kH9Ide7OxsgTuRzag9sjQ5AcbOnbS9ut7P1HzOeEbJFLhr81IR7n2Hlr6qTTSGTXLIX5Pg==
-
 electron-to-chromium@^1.3.571:
   version "1.3.577"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.577.tgz#9885f3f72c6e3367010b461ff6f2d9624a929720"
@@ -6707,6 +6611,11 @@ electron-to-chromium@^1.3.649:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.673.tgz#b4f81c930b388f962b7eba20d0483299aaa40913"
   integrity sha512-ms+QR2ckfrrpEAjXweLx6kNCbpAl66DcW//3BZD4BV5KhUgr0RZRce1ON/9J3QyA3JO28nzgb5Xv8DnPr05ILg==
 
+electron-to-chromium@^1.3.719:
+  version "1.3.723"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz#52769a75635342a4db29af5f1e40bd3dad02c877"
+  integrity sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -7173,9 +7082,9 @@ estree-walker@^1.0.1:
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@^1.3.0, etag@~1.8.1:
   version "1.8.1"
@@ -7187,11 +7096,6 @@ event-target-shim@^5.0.1:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
-eventemitter3@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
-
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -7760,14 +7664,15 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+fs-extra@^9.0.1:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
   dependencies:
+    at-least-node "^1.0.0"
     graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
 
 fs-minipass@^1.2.5:
   version "1.2.5"
@@ -7807,6 +7712,11 @@ fsevents@~2.1.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
   integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
 
+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -7845,10 +7755,10 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
@@ -7865,10 +7775,19 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
+get-intrinsic@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-own-enumerable-property-symbols@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
-  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
+  integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
 get-stdin@^4.0.1:
   version "4.0.1"
@@ -8057,9 +7976,9 @@ global@~4.3.0:
     process "~0.5.1"
 
 globals@^11.1.0:
-  version "11.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
-  integrity sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^12.1.0:
   version "12.4.0"
@@ -8103,16 +8022,21 @@ google-timezones-json@^1.0.2:
   resolved "https://registry.yarnpkg.com/google-timezones-json/-/google-timezones-json-1.0.2.tgz#6800000d7ebc2dd660611aad8c1c68196db78cab"
   integrity sha512-UWXQ7BpSCW8erDespU2I4cri22xsKgwOCyhsJal0OJhi2tFpwJpsYNJt4vCiFPL1p2HzCGiS713LKpNR25n9Kg==
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.6:
+graceful-fs@^4.0.0, graceful-fs@^4.1.11:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
-graceful-fs@^4.1.2, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
+graceful-fs@^4.1.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -8254,9 +8178,9 @@ has-flag@^4.0.0:
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
 has-symbols@^1.0.1:
   version "1.0.1"
@@ -8328,13 +8252,10 @@ he@1.2.0, he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-hls.js@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-0.13.2.tgz#3e7dd28e3787c69c6aba42b64b11eb2c3c8c29f1"
-  integrity sha512-sIg2t4uGpWQLzuK1Iid9614WOKqxj4OYg+EbFbhhTDCsxpENBN+Du3yBFnoi+a83DuOOHdiQd1ydnti9loSGXw==
-  dependencies:
-    eventemitter3 "3.1.0"
-    url-toolkit "^2.1.6"
+hls.js@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hls.js/-/hls.js-1.0.1.tgz#d92bd0a9c78760f0f0e90d53c60192800ebc629f"
+  integrity sha512-ElPUW9VMY2uXdX07N872BSrVUcVd4jZGav4nqlY3vinpdMpW8esmdpUaeVA5vv3oIRSmiC/XtL9K+mSt6rlBpA==
 
 hmac-drbg@^1.0.1:
   version "1.0.1"
@@ -8802,6 +8723,13 @@ is-core-module@^2.1.0:
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
+  integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -9171,7 +9099,7 @@ jest-worker@^24.9.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
-jest-worker@^26.6.2:
+jest-worker@^26.2.1, jest-worker@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
@@ -9241,9 +9169,9 @@ json5@^1.0.1:
     minimist "^1.2.0"
 
 json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
@@ -9254,6 +9182,15 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -9443,14 +9380,7 @@ lezer-tree@^0.13.0, lezer-tree@^0.13.2:
   resolved "https://registry.yarnpkg.com/lezer-tree/-/lezer-tree-0.13.2.tgz#00f4671309b15c27b131f637e430ce2d4d5f7065"
   integrity sha512-15ZxW8TxVNAOkHIo43Iouv4zbSkQQ5chQHBpwXcD2bBFz46RB4jYLEEww5l1V0xyIx9U2clSyyrLes+hAUFrGQ==
 
-lezer@^0.13.0:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/lezer/-/lezer-0.13.3.tgz#520033a8f8be32872af1030e99ede6d9d3c6c023"
-  integrity sha512-DKYaqt52qx9wjxk+q+CqMMn5InqdwLrSCMqtNs+zYkl/VoTUgU8/BdmB6w/b/u7L5FCwdNybVvDS5t+1AvsD5g==
-  dependencies:
-    lezer-tree "^0.13.2"
-
-lezer@^0.13.4:
+lezer@^0.13.0, lezer@^0.13.4:
   version "0.13.4"
   resolved "https://registry.yarnpkg.com/lezer/-/lezer-0.13.4.tgz#f0396a3447c7a8f40391623f3f47a4d95559c42f"
   integrity sha512-cLQxUVY28VBBqKBt/R8CYeH57KQnIvscAnoahzvhlZTK8qxMkIyGExR6ecEpYYDX06ZhROZrEm1IiPvjLAsTig==
@@ -9721,6 +9651,11 @@ lodash.camelcase@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 lodash.deburr@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/lodash.deburr/-/lodash.deburr-4.1.0.tgz#ddb1bbb3ef07458c0177ba07de14422cb033ff9b"
@@ -9812,12 +9747,17 @@ lodash.values@~2.4.1:
   dependencies:
     lodash.keys "~2.4.1"
 
-lodash@^4.17.10, lodash@^4.17.11:
+lodash@^4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
+lodash@^4.17.11, lodash@^4.17.20:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+lodash@^4.17.14, lodash@^4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -10311,11 +10251,16 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@^2.1.1:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -10497,24 +10442,12 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.49:
-  version "1.1.49"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e"
-  integrity sha512-xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg==
-  dependencies:
-    semver "^6.3.0"
-
-node-releases@^1.1.53:
-  version "1.1.53"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
-  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
-
 node-releases@^1.1.61:
   version "1.1.61"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
   integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
 
-node-releases@^1.1.70:
+node-releases@^1.1.70, node-releases@^1.1.71:
   version "1.1.71"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
   integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
@@ -10651,12 +10584,7 @@ object-inspect@^1.7.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
-object-keys@^1.0.11, object-keys@^1.0.12:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
-
-object-keys@^1.1.1:
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -10668,7 +10596,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@4.1.0, object.assign@^4.0.4, object.assign@^4.1.0:
+object.assign@4.1.0, object.assign@^4.0.4:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
@@ -10678,6 +10606,16 @@ object.assign@4.1.0, object.assign@^4.0.4, object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
+object.assign@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
 object.defaults@^1.0.0, object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -11235,11 +11173,16 @@ phin@^2.9.1:
   resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c"
   integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
+picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+picomatch@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -11295,13 +11238,6 @@ pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
-  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
-  dependencies:
-    find-up "^2.1.0"
-
 please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -11365,21 +11301,16 @@ prettier@^2.0.4:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef"
   integrity sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==
 
-pretty-bytes@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
-  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
+pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
+  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
 pretty-hrtime@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
 process-nextick-args@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -11748,13 +11679,6 @@ reduce-flatten@^2.0.0:
   resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27"
   integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==
 
-regenerate-unicode-properties@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
-  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
-  dependencies:
-    regenerate "^1.4.0"
-
 regenerate-unicode-properties@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
@@ -11763,9 +11687,9 @@ regenerate-unicode-properties@^8.2.0:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
@@ -11788,12 +11712,11 @@ regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4:
   integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
 regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-cache@^0.4.2:
   version "0.4.4"
@@ -11820,22 +11743,10 @@ regexpp@^3.0.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
   integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
-regexpu-core@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
-  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.1.0"
-    regjsgen "^0.5.0"
-    regjsparser "^0.6.0"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.1.0"
-
-regexpu-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
-  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+regexpu-core@^4.7.0, regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^8.2.0"
@@ -11859,27 +11770,15 @@ registry-url@3.1.0:
   dependencies:
     rc "^1.0.1"
 
-regjsgen@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
-  integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
-
 regjsgen@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
-
-regjsparser@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
-  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
-  dependencies:
-    jsesc "~0.5.0"
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
-  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
+  integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -12033,7 +11932,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0, resolve@^1.5.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
   integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
@@ -12047,7 +11946,7 @@ resolve@^1.11.0:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.12.0, resolve@^1.14.2:
+resolve@^1.12.0:
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
   integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
@@ -12061,6 +11960,14 @@ resolve@^1.13.1, resolve@^1.9.0:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.14.2, resolve@^1.19.0, resolve@^1.3.2:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 resolve@^1.17.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
@@ -12127,14 +12034,6 @@ roboto-fontface@^0.10.0:
   resolved "https://registry.yarnpkg.com/roboto-fontface/-/roboto-fontface-0.10.0.tgz#7eee40cfa18b1f7e4e605eaf1a2740afb6fd71b0"
   integrity sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g==
 
-rollup-plugin-babel@^4.3.3:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz#d15bd259466a9d1accbdb2fe2fff17c52d030acb"
-  integrity sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    rollup-pluginutils "^2.8.1"
-
 rollup-plugin-string@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-string/-/rollup-plugin-string-3.0.0.tgz#fed2d6301fae1e59eb610957df757ef13fada3f0"
@@ -12142,7 +12041,7 @@ rollup-plugin-string@^3.0.0:
   dependencies:
     rollup-pluginutils "^2.4.1"
 
-rollup-plugin-terser@^5.2.0, rollup-plugin-terser@^5.3.0:
+rollup-plugin-terser@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-5.3.0.tgz#9c0dd33d5771df9630cd027d6a2559187f65885e"
   integrity sha512-XGMJihTIO3eIBsVGq7jiNYOdDMb3pVxuzY0uhOE/FM4x/u9nQgr3+McsjzqBn3QfHIpNSZmFnpoKAwHBEcsT7g==
@@ -12153,6 +12052,16 @@ rollup-plugin-terser@^5.2.0, rollup-plugin-terser@^5.3.0:
     serialize-javascript "^2.1.2"
     terser "^4.6.2"
 
+rollup-plugin-terser@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
+  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    jest-worker "^26.2.1"
+    serialize-javascript "^4.0.0"
+    terser "^5.0.0"
+
 rollup-plugin-visualizer@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-4.0.4.tgz#69b9140c6faf46328997ed2d08b974252bf9d683"
@@ -12164,22 +12073,13 @@ rollup-plugin-visualizer@^4.0.4:
     source-map "^0.7.3"
     yargs "^15.0.0"
 
-rollup-pluginutils@^2.4.1, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
+rollup-pluginutils@^2.4.1, rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
   integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@^1.31.1:
-  version "1.32.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.32.1.tgz#4480e52d9d9e2ae4b46ba0d9ddeaf3163940f9c4"
-  integrity sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==
-  dependencies:
-    "@types/estree" "*"
-    "@types/node" "*"
-    acorn "^7.1.0"
-
 rollup@^2.33.2:
   version "2.33.2"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.2.tgz#c4c76cd405a7605e6ebe90976398c46d4c2ea166"
@@ -12187,6 +12087,13 @@ rollup@^2.33.2:
   optionalDependencies:
     fsevents "~2.1.2"
 
+rollup@^2.43.1:
+  version "2.45.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48"
+  integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ==
+  optionalDependencies:
+    fsevents "~2.3.1"
+
 rollup@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.8.2.tgz#08427a8eb118e6e4ac8d80eba22774bc1d059c81"
@@ -12302,7 +12209,7 @@ semver-greatest-satisfied-range@^1.1.0:
   dependencies:
     sver-compat "^1.5.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.6.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -12312,12 +12219,12 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^5.7.0, semver@^5.7.1:
+semver@^5.4.1, semver@^5.5.0, semver@^5.7.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.1.2, semver@^6.3.0:
+semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -12351,6 +12258,13 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
 serialize-javascript@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
@@ -12604,7 +12518,7 @@ sortablejs@^1.10.2:
   resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.10.2.tgz#6e40364d913f98b85a14f6678f92b5c1221f5290"
   integrity sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==
 
-source-list-map@^2.0.1:
+source-list-map@^2.0.0, source-list-map@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
@@ -12628,15 +12542,7 @@ source-map-support@^0.5.6:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@~0.5.12:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.19:
+source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -12664,6 +12570,13 @@ source-map@^0.7.3, source-map@~0.7.2:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
+source-map@^0.8.0-beta.0:
+  version "0.8.0-beta.0"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
+  integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
+  dependencies:
+    whatwg-url "^7.0.0"
+
 sourcemap-codec@^1.4.4:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
@@ -12950,13 +12863,10 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-comments@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-1.0.2.tgz#82b9c45e7f05873bee53f37168af930aa368679d"
-  integrity sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==
-  dependencies:
-    babel-extract-comments "^1.0.0"
-    babel-plugin-transform-object-rest-spread "^6.26.0"
+strip-comments@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
+  integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
 
 strip-eof@^1.0.0:
   version "1.0.0"
@@ -13111,19 +13021,20 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-temp-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
-  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
+temp-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
+  integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
 
-tempy@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.3.0.tgz#6f6c5b295695a16130996ad5ab01a8bd726e8bf8"
-  integrity sha512-WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ==
+tempy@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz#65e2c35abc06f1124a97f387b08303442bde59f3"
+  integrity sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==
   dependencies:
-    temp-dir "^1.0.0"
-    type-fest "^0.3.1"
-    unique-string "^1.0.0"
+    is-stream "^2.0.0"
+    temp-dir "^2.0.0"
+    type-fest "^0.16.0"
+    unique-string "^2.0.0"
 
 term-size@^1.2.0:
   version "1.2.0"
@@ -13145,14 +13056,23 @@ terser-webpack-plugin@^5.1.1:
     terser "^5.5.1"
 
 terser@^4.6.2:
-  version "4.6.6"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.6.tgz#da2382e6cafbdf86205e82fb9a115bd664d54863"
-  integrity sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^5.0.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693"
+  integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.19"
+
 terser@^5.5.1:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2"
@@ -13331,6 +13251,13 @@ toposort@^2.0.2:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
   integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
 
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
 tr46@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
@@ -13445,10 +13372,10 @@ type-fest@^0.11.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
   integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
 
-type-fest@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
-  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+type-fest@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860"
+  integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==
 
 type-fest@^0.8.1:
   version "0.8.1"
@@ -13473,10 +13400,10 @@ typescript@^3.8.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
   integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
 
-typescript@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
-  integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==
+typescript@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
+  integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
 
 typical@^4.0.0:
   version "4.0.0"
@@ -13538,20 +13465,15 @@ unicode-match-property-ecmascript@^1.0.4:
     unicode-canonical-property-names-ecmascript "^1.0.4"
     unicode-property-aliases-ecmascript "^1.0.4"
 
-unicode-match-property-value-ecmascript@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
-  integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
-
 unicode-match-property-value-ecmascript@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
   integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
 
 unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
-  integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
+  integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
 
 union-value@^1.0.0:
   version "1.0.1"
@@ -13571,18 +13493,23 @@ unique-stream@^2.0.2:
     json-stable-stringify-without-jsonify "^1.0.1"
     through2-filter "^3.0.0"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
   dependencies:
-    crypto-random-string "^1.0.0"
+    crypto-random-string "^2.0.0"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -13647,11 +13574,6 @@ url-parse@^1.4.7:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-url-toolkit@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.6.tgz#6d03246499e519aad224c44044a4ae20544154f2"
-  integrity sha512-UaZ2+50am4HwrV2crR/JAf63Q4VvPYphe63WGeoJxeu8gmOm0qxPt+KsukfakPNrX9aymGNEkkaoICwn+OuvBw==
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -13925,6 +13847,11 @@ web-component-analyzer@~1.1.1:
     typescript "^3.8.3"
     yargs "^15.3.1"
 
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
 webidl-conversions@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
@@ -14024,6 +13951,14 @@ webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
+webpack-sources@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
 webpack-sources@^2.1.1, webpack-sources@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac"
@@ -14083,6 +14018,15 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
+whatwg-url@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
 whatwg-url@^8.1.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
@@ -14153,146 +14097,172 @@ wordwrapjs@^4.0.0:
     reduce-flatten "^2.0.0"
     typical "^5.0.0"
 
-workbox-background-sync@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-5.1.3.tgz#121c5cf439b627f6320ff490be65fd2bd440c6ea"
-  integrity sha512-V/R95aPxYjbKCaVzUTihrZ9ObGOnzoA5n60r0DQ747p8Pj15/dDTYixonKhhlvavTiNezUrp+wTQBvZvcd/ETA==
+workbox-background-sync@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.1.5.tgz#83904fc6487722db98ed9b19eaa39ab5f826c33e"
+  integrity sha512-VbUmPLsdz+sLzuNxHvMylzyRTiM4q+q7rwLBk3p2mtRL5NZozI8j/KgoGbno96vs84jx4b9zCZMEOIKEUTPf6w==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-core "^6.1.5"
 
-workbox-broadcast-update@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-5.1.3.tgz#312e0f065f06a6fb04a050143c84aa6ba0ed8add"
-  integrity sha512-HJ7FDmgweRcYp8fMiFbkmhaTjMYhMByURe5+TempnCi7cT5NNbyaG4T+rg8NWYxAeumSAB3JQF6XD/z34vRRHA==
+workbox-broadcast-update@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.1.5.tgz#49a2a4cc50c7b1cfe86bed6d8f15edf1891d1e79"
+  integrity sha512-zGrTTs+n4wHpYtqYMqBg6kl/x5j1UrczGCQnODSHTxIDV8GXLb/GtA1BCZdysNxpMmdVSeLmTcgIYAAqWFamrA==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-core "^6.1.5"
 
-workbox-build@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-5.1.3.tgz#ec0dbcb7e260ad792c49407d063f4bcc8a8f08b8"
-  integrity sha512-cssa2cKAi/FNp2P2m2DjF/UsXlVX6b1HgkXOjBTraFkIeyZEKxN1F1DnxOpGkdM/bPPRa7y5OmUvjOpgOd9apA==
+workbox-build@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.1.5.tgz#31c3034a38527f1f7697335c15af9c5593168841"
+  integrity sha512-P+fakR5QFVqJN9l9xHVXtmafga72gh9I+jM3A9HiB/6UNRmOAejXnDgD+RMegOHgQHPwnB44TalMToFaXKWIyA==
   dependencies:
-    "@babel/core" "^7.8.4"
-    "@babel/preset-env" "^7.8.4"
-    "@babel/runtime" "^7.8.4"
-    "@hapi/joi" "^15.1.0"
-    "@rollup/plugin-node-resolve" "^7.1.1"
-    "@rollup/plugin-replace" "^2.3.1"
-    "@surma/rollup-plugin-off-main-thread" "^1.1.1"
+    "@babel/core" "^7.11.1"
+    "@babel/preset-env" "^7.11.0"
+    "@babel/runtime" "^7.11.2"
+    "@hapi/joi" "^16.1.8"
+    "@rollup/plugin-babel" "^5.2.0"
+    "@rollup/plugin-node-resolve" "^11.2.1"
+    "@rollup/plugin-replace" "^2.4.1"
+    "@surma/rollup-plugin-off-main-thread" "^1.4.1"
     common-tags "^1.8.0"
     fast-json-stable-stringify "^2.1.0"
-    fs-extra "^8.1.0"
+    fs-extra "^9.0.1"
     glob "^7.1.6"
-    lodash.template "^4.5.0"
+    lodash "^4.17.20"
     pretty-bytes "^5.3.0"
-    rollup "^1.31.1"
-    rollup-plugin-babel "^4.3.3"
-    rollup-plugin-terser "^5.2.0"
-    source-map "^0.7.3"
+    rollup "^2.43.1"
+    rollup-plugin-terser "^7.0.0"
+    source-map "^0.8.0-beta.0"
     source-map-url "^0.4.0"
     stringify-object "^3.3.0"
-    strip-comments "^1.0.2"
-    tempy "^0.3.0"
+    strip-comments "^2.0.1"
+    tempy "^0.6.0"
     upath "^1.2.0"
-    workbox-background-sync "^5.1.3"
-    workbox-broadcast-update "^5.1.3"
-    workbox-cacheable-response "^5.1.3"
-    workbox-core "^5.1.3"
-    workbox-expiration "^5.1.3"
-    workbox-google-analytics "^5.1.3"
-    workbox-navigation-preload "^5.1.3"
-    workbox-precaching "^5.1.3"
-    workbox-range-requests "^5.1.3"
-    workbox-routing "^5.1.3"
-    workbox-strategies "^5.1.3"
-    workbox-streams "^5.1.3"
-    workbox-sw "^5.1.3"
-    workbox-window "^5.1.3"
+    workbox-background-sync "^6.1.5"
+    workbox-broadcast-update "^6.1.5"
+    workbox-cacheable-response "^6.1.5"
+    workbox-core "^6.1.5"
+    workbox-expiration "^6.1.5"
+    workbox-google-analytics "^6.1.5"
+    workbox-navigation-preload "^6.1.5"
+    workbox-precaching "^6.1.5"
+    workbox-range-requests "^6.1.5"
+    workbox-recipes "^6.1.5"
+    workbox-routing "^6.1.5"
+    workbox-strategies "^6.1.5"
+    workbox-streams "^6.1.5"
+    workbox-sw "^6.1.5"
+    workbox-window "^6.1.5"
 
-workbox-cacheable-response@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-5.1.3.tgz#79ec05c9f22796833d653e7cad43774a8f8bf7db"
-  integrity sha512-lOJEwK2T4KWFNdhRFUKxTPBIO5hIYm9E/nYgMq5h/IH3iHPHlBPuFwRMaQy+TTCGWWTA85NomQOjVw1bj65RLw==
+workbox-cacheable-response@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.1.5.tgz#2772e09a333cba47b0923ed91fd022416b69e75c"
+  integrity sha512-x8DC71lO/JCgiaJ194l9le8wc8lFPLgUpDkLhp2si7mXV6S/wZO+8Osvw1LLgYa8YYTWGbhbFhFTXIkEMknIIA==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-core "^6.1.5"
 
-workbox-core@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-5.1.3.tgz#0607acd0018c149162777fe4aae08553bd1559f5"
-  integrity sha512-TFSIPxxciX9sFaj0FDiohBeIKpwMcCyNduydi9i3LChItcndDS6TJpErxybv8aBWeCMraXt33TWtF6kKuIObNw==
+workbox-core@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.1.5.tgz#424ff600e2c5448b14ebd58b2f5ac8ed91b73fb9"
+  integrity sha512-9SOEle7YcJzg3njC0xMSmrPIiFjfsFm9WjwGd5enXmI8Lwk8wLdy63B0nzu5LXoibEmS9k+aWF8EzaKtOWjNSA==
 
-workbox-expiration@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-5.1.3.tgz#c793eef17513de86c9c1b8254eb2c9ba3ed17568"
-  integrity sha512-8YhpmIHqIx+xmtxONADc+di4a3zzCsvVHLiKq6T3vJZUPnqV2jzx+51+UHMUh3T5w5Z5SFC14l0V/jesRbuMKg==
+workbox-expiration@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.1.5.tgz#a62a4ac953bb654aa969ede13507ca5bd154adc2"
+  integrity sha512-6cN+FVbh8fNq56LFKPMchGNKCJeyboHsDuGBqmhDUPvD4uDjsegQpDQzn52VaE0cpywbSIsDF/BSq9E9Yjh5oQ==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-core "^6.1.5"
 
-workbox-google-analytics@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-5.1.3.tgz#dba0cadcf438d14389f2f2da0fd9c8cb605d35e6"
-  integrity sha512-ouK6xIJa+raFcO29TgwKFU/Hv1ejqSYzCzH9lI2B/4z/Wdnb8maL6mMIojQ8j5SohwKswMZmLDl0Az2PCmX11w==
+workbox-google-analytics@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.1.5.tgz#895fcc50e4976c176b5982e1a8fd08776f18d639"
+  integrity sha512-LYsJ/VxTkYVLxM1uJKXZLz4cJdemidY7kPyAYtKVZ6EiDG89noASqis75/5lhqM1m3HwQfp2DtoPrelKSpSDBA==
   dependencies:
-    workbox-background-sync "^5.1.3"
-    workbox-core "^5.1.3"
-    workbox-routing "^5.1.3"
-    workbox-strategies "^5.1.3"
+    workbox-background-sync "^6.1.5"
+    workbox-core "^6.1.5"
+    workbox-routing "^6.1.5"
+    workbox-strategies "^6.1.5"
 
-workbox-navigation-preload@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-5.1.3.tgz#8e49b935aaef16ac614d06db4a0677cbd59f9cae"
-  integrity sha512-29SPQMAccOgbq3BT9Gz7k+ydy0mcKKR0Rmkmd46tnujutiL4ooE57fBhwsA+c6OlLcYdisvilKlV2YWEtKWfgQ==
+workbox-navigation-preload@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.1.5.tgz#47a0d3a6d2e74bd3a52b58b72ca337cb5b654310"
+  integrity sha512-hDbNcWlffv0uvS21jCAC/mYk7NzaGRSWOQXv1p7bj2aONAX5l699D2ZK4D27G8TO0BaLHUmW/1A5CZcsvweQdg==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-core "^6.1.5"
 
-workbox-precaching@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-5.1.3.tgz#08f0b48f4a390872a994c4a6ce8e43d08c6cba57"
-  integrity sha512-9jjBiB00AOI0NnI320ddnhvlL3bjMrDoI3211kEaxcRWh0N2fX25uVn0O8N8u1gWY4tIfwZAn/DgtAU13cFhYA==
+workbox-precaching@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.1.5.tgz#9e0fecb5c567192f46783323fccea10bffc9f79e"
+  integrity sha512-yhm1kb6wgi141JeM5X7z42XJxCry53tbMLB3NgrxktrZbwbrJF8JILzYy+RFKC9tHC6u2bPmL789GPLT2NCDzw==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-core "^6.1.5"
+    workbox-routing "^6.1.5"
+    workbox-strategies "^6.1.5"
 
-workbox-range-requests@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-5.1.3.tgz#f0fc6370ea549d002af1fe902b4ee94bfef6e006"
-  integrity sha512-uUvEoyEUx86LJc7mtmy/6U8xuK0guXU2FnPimt17zDbsC8FSOaPxc92rxtD6xmDSYrI4FqIebypBCjgIe+sfxA==
+workbox-range-requests@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.1.5.tgz#047ccd12838bebe51a720256a4ca0cfa7197dfd3"
+  integrity sha512-iACChSapzB0yuIum3ascP/+cfBNuZi5DRrE+u4u5mCHigPlwfSWtlaY+y8p+a8EwcDTVTZVtnrGrRnF31SiLqQ==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-core "^6.1.5"
 
-workbox-routing@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-5.1.3.tgz#9946da0e9ace45af3db09cc0b4bdc4696723e1f7"
-  integrity sha512-F+sAp9Iy3lVl3BEG+pzXWVq4AftzjiFpHDaZ4Kf4vLoBoKQE0hIHet4zE5DpHqYdyw+Udhp4wrfHamX6PN6z1Q==
+workbox-recipes@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.1.5.tgz#bb1f8976bcdb202618d967596e9f248e6077e69a"
+  integrity sha512-MD1yabHca6O/oj1hrRdfj9cRwhKA5zqIE53rWOAg/dKMMzWQsf9nyRbXRgzK3a13iQvYKuQzURU4Cx58tdnR+Q==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-cacheable-response "^6.1.5"
+    workbox-core "^6.1.5"
+    workbox-expiration "^6.1.5"
+    workbox-precaching "^6.1.5"
+    workbox-routing "^6.1.5"
+    workbox-strategies "^6.1.5"
 
-workbox-strategies@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-5.1.3.tgz#220cc9f5519ed76f2452ccb9407a5fd967c37110"
-  integrity sha512-wiXHfmOKnWABeIVW+/ye0e00+2CcS5y7SIj2f9zcdy2ZLEbcOf7B+yOl5OrWpBGlTUwRjIYhV++ZqiKm3Dc+8w==
+workbox-routing@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.1.5.tgz#15884d6152dba03faef83f0b23331846d8b6ef8e"
+  integrity sha512-uC/Ctz+4GXGL42h1WxUNKxqKRik/38uS0NZ6VY/EHqL2F1ObLFqMHUZ4ZYvyQsKdyI82cxusvhJZHOrY0a2fIQ==
   dependencies:
-    workbox-core "^5.1.3"
-    workbox-routing "^5.1.3"
+    workbox-core "^6.1.5"
 
-workbox-streams@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-5.1.3.tgz#8f381d395ea2e57106b7b6542b9ffcd769a3047b"
-  integrity sha512-8kt70eBd1RXL0qenxEnch3Cd7VyW3O0CkeGBN4Bikt307nIV5Q0JciLA5o0CRteijawYOiTq0/px4GDBv1obgQ==
+workbox-strategies@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.1.5.tgz#2549a3e78f0eda371b760c4db21feb0d26143573"
+  integrity sha512-QhiOn9KT9YGBdbfWOmJT6pXZOIAxaVrs6J6AMYzRpkUegBTEcv36+ZhE/cfHoT0u2fxVtthHnskOQ/snEzaXQw==
   dependencies:
-    workbox-core "^5.1.3"
-    workbox-routing "^5.1.3"
+    workbox-core "^6.1.5"
 
-workbox-sw@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-5.1.3.tgz#7bffbf034f2f5b58e1734b5b86d240019a5332bb"
-  integrity sha512-Syk6RhYr/8VdFwXrxo5IpVz8Og2xapHTWJhqsZRF+TbxSvlaJs8hrvVPd7edn5ZiiVdPhE9NTeOTOg1+D+FGoA==
-
-workbox-window@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-5.1.3.tgz#24a2acb2903b0ff2789a4ce32f355621e769eb23"
-  integrity sha512-oYvfVtPLET7FUrhOzbk0R+aATVmpdQBkmDqwyFH4W2dfVqJXTvTXzuGP5Pn9oZ8jMTB3AYW43yhYBlLYM3mYyg==
+workbox-streams@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.1.5.tgz#bb7678677275fc23c9627565a1f238e4ca350290"
+  integrity sha512-OI1kLvRHGFXV+soDvs6aEwfBwdAkvPB0mRryqdh3/K17qUj/1gRXc8QtpgU+83xqx/I/ar2bTCIj0KPzI/ChCQ==
   dependencies:
-    workbox-core "^5.1.3"
+    workbox-core "^6.1.5"
+    workbox-routing "^6.1.5"
+
+workbox-sw@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.1.5.tgz#06eb0c91f22e207422175b3f815cd2181c7074a0"
+  integrity sha512-IMDiqxYbKzPorZLGMUMacLB6r76iVQbdTzYthIZoPfy+uFURJFUtqiWQJKg1L+RMyuYXwKXTahCIGkgFs4jBeg==
+
+workbox-webpack-plugin@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-webpack-plugin/-/workbox-webpack-plugin-6.1.5.tgz#d573f959417c3dae49e112dae9c6b82cc1679229"
+  integrity sha512-tsgeNAYiFP4STNPDxBVT58eiU8nGUmcv7Lq9FFJkQf5MMu6tPw1OLp+KpszhbCWP+R/nEdu85Gjexs6fY647Kg==
+  dependencies:
+    fast-json-stable-stringify "^2.1.0"
+    pretty-bytes "^5.4.1"
+    source-map-url "^0.4.0"
+    upath "^1.2.0"
+    webpack-sources "^1.4.3"
+    workbox-build "^6.1.5"
+
+workbox-window@^6.1.5:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.1.5.tgz#017b22342e10c6df6b9672326b575ec950b6cd80"
+  integrity sha512-akL0X6mAegai2yypnq78RgfazeqvKbsllRtEI4dnbhPcRINEY1NmecFmsQk8SD+zWLK1gw5OdwAOX+zHSRVmeA==
+  dependencies:
+    workbox-core "^6.1.5"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"