diff --git a/gallery/src/components/demo-card.js b/gallery/src/components/demo-card.js
index 04be1de04c..c6137fc9ed 100644
--- a/gallery/src/components/demo-card.js
+++ b/gallery/src/components/demo-card.js
@@ -15,6 +15,10 @@ class DemoCard extends PolymerElement {
           margin: 0 0 20px;
           color: var(--primary-color);
         }
+        h2 small {
+          font-size: 0.5em;
+          color: var(--primary-text-color);
+        }
         #card {
           max-width: 400px;
           width: 100vw;
@@ -34,7 +38,12 @@ class DemoCard extends PolymerElement {
           }
         }
       </style>
-      <h2>[[config.heading]]</h2>
+      <h2>
+        [[config.heading]]
+        <template is="dom-if" if="[[_size]]">
+          <small>(size [[_size]])</small>
+        </template>
+      </h2>
       <div class="root">
         <div id="card"></div>
         <template is="dom-if" if="[[showConfig]]">
@@ -55,6 +64,9 @@ class DemoCard extends PolymerElement {
         observer: "_configChanged",
       },
       showConfig: Boolean,
+      _size: {
+        type: Number,
+      },
     };
   }
 
@@ -70,6 +82,17 @@ class DemoCard extends PolymerElement {
 
     const el = this._createCardElement(safeLoad(config.config)[0]);
     card.appendChild(el);
+    this._getSize(el);
+  }
+
+  async _getSize(el) {
+    await customElements.whenDefined(el.localName);
+
+    if (!("getCardSize" in el)) {
+      this._size = undefined;
+      return;
+    }
+    this._size = await el.getCardSize();
   }
 
   _createCardElement(cardConfig) {
diff --git a/gallery/src/demos/demo-hui-stack-card.ts b/gallery/src/demos/demo-hui-grid-and-stack-card.ts
similarity index 75%
rename from gallery/src/demos/demo-hui-stack-card.ts
rename to gallery/src/demos/demo-hui-grid-and-stack-card.ts
index 26f03c4051..8beb16a20d 100644
--- a/gallery/src/demos/demo-hui-stack-card.ts
+++ b/gallery/src/demos/demo-hui-grid-and-stack-card.ts
@@ -49,6 +49,100 @@ const ENTITIES = [
 ];
 
 const CONFIGS = [
+  {
+    heading: "Default Grid",
+    config: `
+- type: grid
+  cards:
+    - type: entity
+      entity: light.kitchen_lights
+    - type: entity
+      entity: light.bed_light
+    - type: entity
+      entity: device_tracker.demo_paulus
+    - type: sensor
+      entity: sensor.illumination
+      graph: line
+    - type: entity
+      entity: device_tracker.demo_anne_therese
+    `,
+  },
+  {
+    heading: "Non-square Grid with 2 columns",
+    config: `
+- type: grid
+  columns: 2
+  square: false
+  cards:
+    - type: entity
+      entity: light.kitchen_lights
+    - type: entity
+      entity: light.bed_light
+    - type: entity
+      entity: device_tracker.demo_paulus
+    - type: sensor
+      entity: sensor.illumination
+      graph: line
+    `,
+  },
+  {
+    heading: "Default Grid with title",
+    config: `
+- type: grid
+  title: Kitchen
+  cards:
+    - type: entity
+      entity: light.kitchen_lights
+    - type: entity
+      entity: light.bed_light
+    - type: entity
+      entity: device_tracker.demo_paulus
+    - type: sensor
+      entity: sensor.illumination
+      graph: line
+    - type: entity
+      entity: device_tracker.demo_anne_therese
+    `,
+  },
+  {
+    heading: "Columns 4",
+    config: `
+- type: grid
+  cards:
+    - type: entity
+      entity: light.kitchen_lights
+    - type: entity
+      entity: light.bed_light
+    - type: entity
+      entity: device_tracker.demo_paulus
+    - type: sensor
+      entity: sensor.illumination
+      graph: line
+    `,
+  },
+  {
+    heading: "Columns 2",
+    config: `
+- type: grid
+  columns: 2
+  cards:
+    - type: entity
+      entity: light.kitchen_lights
+    - type: entity
+      entity: light.bed_light
+    `,
+  },
+  {
+    heading: "Columns 1",
+    config: `
+- type: grid
+  columns: 1
+  cards:
+  - type: entity
+    entity: light.kitchen_lights
+    `,
+  },
+
   {
     heading: "Vertical Stack",
     config: `
@@ -99,45 +193,9 @@ const CONFIGS = [
       entity: light.bed_light
     `,
   },
-  {
-    heading: "Default Grid",
-    config: `
-- type: grid
-  cards:
-    - type: entity
-      entity: light.kitchen_lights
-    - type: entity
-      entity: light.bed_light
-    - type: entity
-      entity: device_tracker.demo_paulus
-    - type: sensor
-      entity: sensor.illumination
-      graph: line
-    - type: entity
-      entity: device_tracker.demo_anne_therese
-    `,
-  },
-  {
-    heading: "Non-square Grid with 2 columns",
-    config: `
-- type: grid
-  columns: 2
-  square: false
-  cards:
-    - type: entity
-      entity: light.kitchen_lights
-    - type: entity
-      entity: light.bed_light
-    - type: entity
-      entity: device_tracker.demo_paulus
-    - type: sensor
-      entity: sensor.illumination
-      graph: line
-    `,
-  },
 ];
 
-@customElement("demo-hui-stack-card")
+@customElement("demo-hui-grid-and-stack-card")
 class DemoStack extends LitElement {
   @query("#demos") private _demoRoot!: HTMLElement;
 
@@ -155,4 +213,8 @@ class DemoStack extends LitElement {
   }
 }
 
-customElements.define("demo-hui-stack-card", DemoStack);
+declare global {
+  interface HTMLElementTagNameMap {
+    "demo-hui-grid-and-stack-card": DemoStack;
+  }
+}
diff --git a/setup.py b/setup.py
index 18d6b372e6..8919de636f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20210428.0",
+    version="20210429.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",
diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts
index 2fa735f5b6..46886fa909 100644
--- a/src/components/entity/state-badge.ts
+++ b/src/components/entity/state-badge.ts
@@ -15,7 +15,6 @@ 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";
 
@@ -100,14 +99,8 @@ export class StateBadge extends LitElement {
         hostStyle.backgroundImage = `url(${imageUrl})`;
         this._showIcon = false;
       } else if (stateObj.state === "on") {
-        if (
-          computeStateDomain(stateObj) === "light" &&
-          this.stateColor !== false
-        ) {
-          const rgb = getLightRgbColor(stateObj as LightEntity);
-          if (rgb) {
-            iconStyle.color = `rgb(${rgb.slice(0, 3).join(",")})`;
-          }
+        if (this.stateColor !== false && stateObj.attributes.rgb_color) {
+          iconStyle.color = `rgb(${stateObj.attributes.rgb_color.join(",")})`;
         }
         if (stateObj.attributes.brightness && this.stateColor !== false) {
           const brightness = stateObj.attributes.brightness;
diff --git a/src/components/trace/hat-script-graph.ts b/src/components/trace/hat-script-graph.ts
index ab10f0360b..cecb0feb28 100644
--- a/src/components/trace/hat-script-graph.ts
+++ b/src/components/trace/hat-script-graph.ts
@@ -143,7 +143,7 @@ class HatScriptGraph extends LitElement {
     const trace = this.trace.trace[path] as ChooseActionTraceStep[] | undefined;
     const trace_path = trace?.[0].result
       ? trace[0].result.choice === "default"
-        ? [config.choose?.length || 0]
+        ? [Array.isArray(config.choose) ? config.choose.length : 0]
         : [trace[0].result.choice]
       : [];
     return html`
@@ -167,31 +167,33 @@ class HatScriptGraph extends LitElement {
           nofocus
         ></hat-graph-node>
 
-        ${config.choose?.map((branch, i) => {
-          const branch_path = `${path}/choose/${i}`;
-          const track_this =
-            trace !== undefined && trace[0].result?.choice === i;
-          if (track_this) {
-            this.trackedNodes[branch_path] = { config, path: branch_path };
-          }
-          return html`
-            <hat-graph>
-              <hat-graph-node
-                .iconPath=${!trace || track_this
-                  ? mdiCheckBoxOutline
-                  : mdiCheckboxBlankOutline}
-                @focus=${this.selectNode(config, branch_path)}
-                class=${classMap({
-                  active: this.selected === branch_path,
-                  track: track_this,
-                })}
-              ></hat-graph-node>
-              ${ensureArray(branch.sequence).map((action, j) =>
-                this.render_node(action, `${branch_path}/sequence/${j}`)
-              )}
-            </hat-graph>
-          `;
-        })}
+        ${config.choose
+          ? ensureArray(config.choose)?.map((branch, i) => {
+              const branch_path = `${path}/choose/${i}`;
+              const track_this =
+                trace !== undefined && trace[0].result?.choice === i;
+              if (track_this) {
+                this.trackedNodes[branch_path] = { config, path: branch_path };
+              }
+              return html`
+                <hat-graph>
+                  <hat-graph-node
+                    .iconPath=${!trace || track_this
+                      ? mdiCheckBoxOutline
+                      : mdiCheckboxBlankOutline}
+                    @focus=${this.selectNode(config, branch_path)}
+                    class=${classMap({
+                      active: this.selected === branch_path,
+                      track: track_this,
+                    })}
+                  ></hat-graph-node>
+                  ${ensureArray(branch.sequence).map((action, j) =>
+                    this.render_node(action, `${branch_path}/sequence/${j}`)
+                  )}
+                </hat-graph>
+              `;
+            })
+          : ""}
         <hat-graph>
           <hat-graph-spacer
             class=${classMap({
diff --git a/src/data/light.ts b/src/data/light.ts
index 27f335709e..a0833cb081 100644
--- a/src/data/light.ts
+++ b/src/data/light.ts
@@ -56,7 +56,9 @@ export const lightSupportsDimming = (entity: LightEntity) => {
   );
 };
 
-export const getLightRgbColor = (entity: LightEntity): number[] | undefined =>
+export const getLightCurrentModeRgbColor = (
+  entity: LightEntity
+): number[] | undefined =>
   entity.attributes.color_mode === LightColorModes.RGBWW
     ? entity.attributes.rgbww_color
     : entity.attributes.color_mode === LightColorModes.RGBW
diff --git a/src/data/script.ts b/src/data/script.ts
index bb614696a2..dc7858768b 100644
--- a/src/data/script.ts
+++ b/src/data/script.ts
@@ -112,7 +112,7 @@ export interface ChooseActionChoice {
 
 export interface ChooseAction {
   alias?: string;
-  choose: ChooseActionChoice[] | null;
+  choose: ChooseActionChoice | ChooseActionChoice[] | null;
   default?: Action | Action[];
 }
 
diff --git a/src/dialogs/more-info/controls/more-info-light.ts b/src/dialogs/more-info/controls/more-info-light.ts
index 7bb67a8b77..783506a762 100644
--- a/src/dialogs/more-info/controls/more-info-light.ts
+++ b/src/dialogs/more-info/controls/more-info-light.ts
@@ -18,7 +18,7 @@ import "../../../components/ha-icon-button";
 import "../../../components/ha-labeled-slider";
 import "../../../components/ha-paper-dropdown-menu";
 import {
-  getLightRgbColor,
+  getLightCurrentModeRgbColor,
   LightColorModes,
   LightEntity,
   lightIsInColorMode,
@@ -34,6 +34,7 @@ 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;
@@ -155,7 +156,7 @@ class MoreInfoLight extends LitElement {
                             )}
                             icon="hass:brightness-7"
                             max="100"
-                            .value=${this._colorBrightnessSliderValue ?? 255}
+                            .value=${this._colorBrightnessSliderValue ?? 100}
                             @change=${this._colorBrightnessSliderChanged}
                             pin
                           ></ha-labeled-slider>`
@@ -302,9 +303,10 @@ class MoreInfoLight extends LitElement {
             )
           : undefined;
 
-      this._colorPickerColor = getLightRgbColor(stateObj)?.slice(0, 3) as
-        | [number, number, number]
-        | undefined;
+      this._colorPickerColor = getLightCurrentModeRgbColor(stateObj)?.slice(
+        0,
+        3
+      ) as [number, number, number] | undefined;
     } else {
       this._brightnessSliderValue = 0;
     }
@@ -379,9 +381,9 @@ class MoreInfoLight extends LitElement {
       return;
     }
 
-    wv = (wv * 255) / 100;
+    wv = Math.min(255, Math.round((wv * 255) / 100));
 
-    const rgb = getLightRgbColor(this.stateObj!);
+    const rgb = getLightCurrentModeRgbColor(this.stateObj!);
 
     if (name === "wv") {
       const rgbw_color = rgb || [0, 0, 0, 0];
@@ -406,9 +408,15 @@ class MoreInfoLight extends LitElement {
 
   private _colorBrightnessSliderChanged(ev: CustomEvent) {
     const target = ev.target as any;
-    const value = Number(target.value);
+    let value = Number(target.value);
 
-    const rgb = (getLightRgbColor(this.stateObj!)?.slice(0, 3) || [
+    if (isNaN(value)) {
+      return;
+    }
+
+    value = (value * 255) / 100;
+
+    const rgb = (getLightCurrentModeRgbColor(this.stateObj!)?.slice(0, 3) || [
       255,
       255,
       255,
@@ -420,7 +428,7 @@ class MoreInfoLight extends LitElement {
         this._colorBrightnessSliderValue
           ? this._adjustColorBrightness(
               rgb,
-              this._colorBrightnessSliderValue,
+              (this._colorBrightnessSliderValue * 255) / 100,
               true
             )
           : rgb,
@@ -449,9 +457,9 @@ class MoreInfoLight extends LitElement {
       if (invert) {
         ratio = 1 / ratio;
       }
-      rgbColor[0] *= ratio;
-      rgbColor[1] *= ratio;
-      rgbColor[2] *= ratio;
+      rgbColor[0] = Math.min(255, Math.round(rgbColor[0] * ratio));
+      rgbColor[1] = Math.min(255, Math.round(rgbColor[1] * ratio));
+      rgbColor[2] = Math.min(255, Math.round(rgbColor[2] * ratio));
     }
     return rgbColor;
   }
@@ -491,7 +499,7 @@ class MoreInfoLight extends LitElement {
         this._colorBrightnessSliderValue
           ? this._adjustColorBrightness(
               [ev.detail.rgb.r, ev.detail.rgb.g, ev.detail.rgb.b],
-              this._colorBrightnessSliderValue
+              (this._colorBrightnessSliderValue * 255) / 100
             )
           : [ev.detail.rgb.r, ev.detail.rgb.g, ev.detail.rgb.b]
       );
diff --git a/src/html/onboarding.html.template b/src/html/onboarding.html.template
index 8ab6264be1..cce2b81e57 100644
--- a/src/html/onboarding.html.template
+++ b/src/html/onboarding.html.template
@@ -2,7 +2,11 @@
 <html>
   <head>
     <title>Home Assistant</title>
-    <link rel="modulepreload" href="<%= latestPageJS %>" crossorigin="use-credentials" />
+    <link
+      rel="modulepreload"
+      href="<%= latestPageJS %>"
+      crossorigin="use-credentials"
+    />
     <%= renderTemplate('_header') %>
     <style>
       html {
@@ -15,8 +19,19 @@
         border-radius: 4px;
         max-width: 432px;
         margin: 64px auto 0;
-        box-shadow: rgba(0, 0, 0, 0.25) 0px 54px 55px, rgba(0, 0, 0, 0.12) 0px -12px 30px, rgba(0, 0, 0, 0.12) 0px 4px 6px, rgba(0, 0, 0, 0.17) 0px 12px 13px, rgba(0, 0, 0, 0.09) 0px -3px 5px;
-        background-color: #fff;
+        box-shadow: var(
+          --ha-card-box-shadow,
+          rgba(0, 0, 0, 0.25) 0px 54px 55px,
+          rgba(0, 0, 0, 0.12) 0px -12px 30px,
+          rgba(0, 0, 0, 0.12) 0px 4px 6px,
+          rgba(0, 0, 0, 0.17) 0px 12px 13px,
+          rgba(0, 0, 0, 0.09) 0px -3px 5px
+        );
+        background: var(
+          --ha-card-background,
+          var(--card-background-color, white)
+        );
+        color: var(--primary-text-color, #212121);
       }
 
       .header {
@@ -34,7 +49,6 @@
 
       @media (prefers-color-scheme: dark) {
         html {
-          background-color: #111111;
           color: #e1e1e1;
         }
       }
@@ -45,10 +59,9 @@
           margin: 0;
         }
       }
-
     </style>
   </head>
-  <body id='particles'>
+  <body id="particles">
     <div class="content">
       <div class="header">
         <img src="/static/icons/favicon-192x192.png" height="52" width="52" />
diff --git a/src/panels/config/automation/action/types/ha-automation-action-choose.ts b/src/panels/config/automation/action/types/ha-automation-action-choose.ts
index 2c356bca70..2a04f9e022 100644
--- a/src/panels/config/automation/action/types/ha-automation-action-choose.ts
+++ b/src/panels/config/automation/action/types/ha-automation-action-choose.ts
@@ -10,6 +10,7 @@ import {
 } from "lit-element";
 import { html } from "lit-html";
 import { fireEvent } from "../../../../../common/dom/fire_event";
+import { ensureArray } from "../../../../../common/ensure-array";
 import { Condition } from "../../../../../data/automation";
 import { Action, ChooseAction } from "../../../../../data/script";
 import { haStyle } from "../../../../../resources/styles";
@@ -31,7 +32,7 @@ export class HaChooseAction extends LitElement implements ActionElement {
     const action = this.action;
 
     return html`
-      ${(action.choose || []).map(
+      ${(action.choose ? ensureArray(action.choose) : []).map(
         (option, idx) => html`<ha-card>
           <mwc-icon-button
             .idx=${idx}
@@ -101,7 +102,9 @@ export class HaChooseAction extends LitElement implements ActionElement {
     ev.stopPropagation();
     const value = ev.detail.value as Condition[];
     const index = (ev.target as any).idx;
-    const choose = this.action.choose ? [...this.action.choose] : [];
+    const choose = this.action.choose
+      ? [...ensureArray(this.action.choose)]
+      : [];
     choose[index].conditions = value;
     fireEvent(this, "value-changed", {
       value: { ...this.action, choose },
@@ -112,7 +115,9 @@ export class HaChooseAction extends LitElement implements ActionElement {
     ev.stopPropagation();
     const value = ev.detail.value as Action[];
     const index = (ev.target as any).idx;
-    const choose = this.action.choose ? [...this.action.choose] : [];
+    const choose = this.action.choose
+      ? [...ensureArray(this.action.choose)]
+      : [];
     choose[index].sequence = value;
     fireEvent(this, "value-changed", {
       value: { ...this.action, choose },
@@ -120,7 +125,9 @@ export class HaChooseAction extends LitElement implements ActionElement {
   }
 
   private _addOption() {
-    const choose = this.action.choose ? [...this.action.choose] : [];
+    const choose = this.action.choose
+      ? [...ensureArray(this.action.choose)]
+      : [];
     choose.push({ conditions: [], sequence: [] });
     fireEvent(this, "value-changed", {
       value: { ...this.action, choose },
@@ -129,7 +136,9 @@ export class HaChooseAction extends LitElement implements ActionElement {
 
   private _removeOption(ev: CustomEvent) {
     const index = (ev.currentTarget as any).idx;
-    const choose = this.action.choose ? [...this.action.choose] : [];
+    const choose = this.action.choose
+      ? [...ensureArray(this.action.choose)]
+      : [];
     choose.splice(index, 1);
     fireEvent(this, "value-changed", {
       value: { ...this.action, choose },
diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts
index 44a4b8cc83..557c029d54 100644
--- a/src/panels/config/integrations/ha-integration-card.ts
+++ b/src/panels/config/integrations/ha-integration-card.ts
@@ -640,6 +640,7 @@ export class HaIntegrationCard extends LitElement {
           flex: 1;
           margin-left: 8px;
           padding-top: 2px;
+          padding-right: 2px;
         }
 
         .content {
diff --git a/src/panels/config/integrations/ha-integration-header.ts b/src/panels/config/integrations/ha-integration-header.ts
index 6ace567a6d..02ee9eb208 100644
--- a/src/panels/config/integrations/ha-integration-header.ts
+++ b/src/panels/config/integrations/ha-integration-header.ts
@@ -1,3 +1,4 @@
+import "../../../components/ha-svg-icon";
 import { mdiPackageVariant, mdiCloud } from "@mdi/js";
 import "@polymer/paper-tooltip/paper-tooltip";
 import {
@@ -24,7 +25,7 @@ export class HaIntegrationHeader extends LitElement {
 
   @property() public label!: string;
 
-  @property() public manifest?: IntegrationManifest;
+  @property({ attribute: false }) public manifest?: IntegrationManifest;
 
   protected render(): TemplateResult {
     let primary: string;
@@ -84,6 +85,7 @@ export class HaIntegrationHeader extends LitElement {
           <div class="primary">${primary}</div>
           ${secondary ? html`<div class="secondary">${secondary}</div>` : ""}
         </div>
+
         ${icons.length === 0
           ? ""
           : html`
@@ -118,14 +120,17 @@ export class HaIntegrationHeader extends LitElement {
       color: var(--text-on-state-color);
       text-align: center;
       padding: 2px;
+      border-top-left-radius: var(--ha-card-border-radius, 4px);
+      border-top-right-radius: var(--ha-card-border-radius, 4px);
     }
     .header {
       display: flex;
       position: relative;
-      padding: 16px 8px 8px 16px;
+      padding: 0 8px 8px 16px;
     }
     .header img {
       margin-right: 16px;
+      margin-top: 16px;
       width: 40px;
       height: 40px;
     }
@@ -142,6 +147,8 @@ export class HaIntegrationHeader extends LitElement {
     }
     .primary {
       font-size: 16px;
+      margin-top: 16px;
+      margin-right: 2px;
       font-weight: 400;
       color: var(--primary-text-color);
     }
@@ -150,18 +157,20 @@ export class HaIntegrationHeader extends LitElement {
       color: var(--secondary-text-color);
     }
     .icons {
-      position: absolute;
-      top: 0px;
-      right: 16px;
+      margin-right: 8px;
+      margin-left: auto;
+      height: 28px;
       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;
+      display: flex;
+      float: right;
     }
     .icons ha-svg-icon {
       width: 20px;
       height: 20px;
+      margin: 4px;
     }
     paper-tooltip {
       white-space: nowrap;
diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts
index 2c535a8bba..f8ed4453a7 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 { getLightRgbColor, LightEntity } from "../../../data/light";
+import { LightEntity } from "../../../data/light";
 import { ActionHandlerEvent } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { actionHandler } from "../common/directives/action-handler-directive";
@@ -301,14 +301,10 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
   }
 
   private _computeColor(stateObj: HassEntity | LightEntity): string {
-    if (
-      !this._config?.state_color ||
-      computeStateDomain(stateObj) !== "light"
-    ) {
-      return "";
+    if (this._config?.state_color && stateObj.attributes.rgb_color) {
+      return `rgb(${stateObj.attributes.rgb_color.join(",")})`;
     }
-    const rgb = getLightRgbColor(stateObj as LightEntity);
-    return rgb ? `rgb(${rgb.slice(0, 3).join(",")})` : "";
+    return "";
   }
 
   private _handleAction(ev: ActionHandlerEvent) {
diff --git a/src/panels/lovelace/cards/hui-grid-card.ts b/src/panels/lovelace/cards/hui-grid-card.ts
index bffbf1eada..256d889a12 100644
--- a/src/panels/lovelace/cards/hui-grid-card.ts
+++ b/src/panels/lovelace/cards/hui-grid-card.ts
@@ -5,6 +5,11 @@ import { GridCardConfig } from "./types";
 import { LovelaceCardEditor } from "../types";
 
 const DEFAULT_COLUMNS = 3;
+const SQUARE_ROW_HEIGHTS_BY_COLUMNS = {
+  1: 5,
+  2: 3,
+  3: 2,
+};
 
 class HuiGridCard extends HuiStackCard<GridCardConfig> {
   public static async getConfigElement(): Promise<LovelaceCardEditor> {
@@ -18,8 +23,11 @@ class HuiGridCard extends HuiStackCard<GridCardConfig> {
     }
 
     if (this.square) {
-      // When we're square, each row is size 2.
-      return (this._cards.length / this.columns) * 2;
+      const rowHeight = SQUARE_ROW_HEIGHTS_BY_COLUMNS[this.columns] || 1;
+      return (
+        (this._cards.length / this.columns) * rowHeight +
+        (this._config.title ? 1 : 0)
+      );
     }
 
     const promises: Array<Promise<number> | number> = [];
@@ -28,11 +36,16 @@ class HuiGridCard extends HuiStackCard<GridCardConfig> {
       promises.push(computeCardSize(element));
     }
 
-    const results = await Promise.all(promises);
+    const cardSizes = await Promise.all(promises);
 
-    const maxCardSize = Math.max(...results);
+    let totalHeight = this._config.title ? 1 : 0;
 
-    return maxCardSize * (this._cards.length / this.columns);
+    // Each column will adjust to max card size of it's row
+    for (let start = 0; start < cardSizes.length; start += this.columns) {
+      totalHeight += Math.max(...cardSizes.slice(start, start + this.columns));
+    }
+
+    return totalHeight;
   }
 
   get columns() {
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index c92d6dbbca..9c27fa7f0a 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -21,11 +21,7 @@ import { stateIcon } from "../../../common/entity/state_icon";
 import "../../../components/ha-card";
 import "../../../components/ha-icon-button";
 import { UNAVAILABLE, UNAVAILABLE_STATES } from "../../../data/entity";
-import {
-  getLightRgbColor,
-  LightEntity,
-  lightSupportsDimming,
-} from "../../../data/light";
+import { LightEntity, lightSupportsDimming } from "../../../data/light";
 import { ActionHandlerEvent } from "../../../data/lovelace";
 import { HomeAssistant } from "../../../types";
 import { actionHandler } from "../common/directives/action-handler-directive";
@@ -247,8 +243,9 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
     if (stateObj.state === "off") {
       return "";
     }
-    const rgb = getLightRgbColor(stateObj);
-    return rgb ? `rgb(${rgb.slice(0, 3).join(",")})` : "";
+    return stateObj.attributes.rgb_color
+      ? `rgb(${stateObj.attributes.rgb_color.join(",")})`
+      : "";
   }
 
   private _handleAction(ev: ActionHandlerEvent) {
diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts
index a499aa54e0..43aa5c8d45 100644
--- a/src/panels/lovelace/ha-panel-lovelace.ts
+++ b/src/panels/lovelace/ha-panel-lovelace.ts
@@ -363,11 +363,22 @@ class LovelacePanel extends LitElement {
           mode: previousMode,
         } = this.lovelace!;
         newConfig = this._checkLovelaceConfig(newConfig);
+        let conf: LovelaceConfig;
+        // If strategy defined, apply it here.
+        if (newConfig.strategy) {
+          conf = await generateLovelaceDashboardStrategy({
+            config: newConfig,
+            hass: this.hass!,
+            narrow: this.narrow,
+          });
+        } else {
+          conf = newConfig;
+        }
         try {
           // Optimistic update
           this._updateLovelace({
-            config: newConfig,
-            rawConfig: undefined,
+            config: conf,
+            rawConfig: newConfig,
             mode: "storage",
           });
           this._ignoreNextUpdateEvent = true;
diff --git a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
index f13f90b9f6..c5e028379d 100644
--- a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
+++ b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts
@@ -104,7 +104,7 @@ export class HuiGraphHeaderFooter extends LitElement
     if (!this._coordinates) {
       return html`
         <div class="container">
-          <ha-circular-progress active></ha-circular-progress>
+          <ha-circular-progress active size="small"></ha-circular-progress>
         </div>
       `;
     }
@@ -210,7 +210,7 @@ export class HuiGraphHeaderFooter extends LitElement
     return css`
       ha-circular-progress {
         position: absolute;
-        top: calc(50% - 28px);
+        top: calc(50% - 14px);
       }
       .container {
         display: flex;
diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts
index eb0a8805e7..6e86102452 100644
--- a/src/panels/lovelace/hui-editor.ts
+++ b/src/panels/lovelace/hui-editor.ts
@@ -115,8 +115,8 @@ class LovelaceFullConfigEditor extends LitElement {
       !this._saving &&
       oldLovelace &&
       this.lovelace &&
-      oldLovelace.config !== this.lovelace.config &&
-      !deepEqual(oldLovelace.config, this.lovelace.config)
+      oldLovelace.rawConfig !== this.lovelace.rawConfig &&
+      !deepEqual(oldLovelace.rawConfig, this.lovelace.rawConfig)
     ) {
       showToast(this, {
         message: this.hass!.localize(
@@ -124,7 +124,7 @@ class LovelaceFullConfigEditor extends LitElement {
         ),
         action: {
           action: () => {
-            this.yamlEditor.value = safeDump(this.lovelace!.config);
+            this.yamlEditor.value = safeDump(this.lovelace!.rawConfig);
           },
           text: this.hass!.localize(
             "ui.panel.lovelace.editor.raw_editor.reload"
diff --git a/src/state/themes-mixin.ts b/src/state/themes-mixin.ts
index 0c9e64e7ce..8555391b88 100644
--- a/src/state/themes-mixin.ts
+++ b/src/state/themes-mixin.ts
@@ -22,6 +22,8 @@ const mql = matchMedia("(prefers-color-scheme: dark)");
 
 export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
   class extends superClass {
+    private _themeApplied = false;
+
     protected firstUpdated(changedProps) {
       super.firstUpdated(changedProps);
       this.addEventListener("settheme", (ev) => {
@@ -32,7 +34,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
         storeState(this.hass!);
       });
       mql.addListener((ev) => this._applyTheme(ev.matches));
-      if (mql.matches) {
+      if (!this._themeApplied && mql.matches) {
         applyThemesOnElement(
           document.documentElement,
           {
@@ -51,6 +53,7 @@ export default <T extends Constructor<HassBaseEl>>(superClass: T) =>
       super.hassConnected();
 
       subscribeThemes(this.hass!.connection, (themes) => {
+        this._themeApplied = true;
         this._updateHass({ themes });
         invalidateThemeCache();
         this._applyTheme(mql.matches);
diff --git a/src/util/hass-attributes-util.ts b/src/util/hass-attributes-util.ts
index 95bfee3e96..0db6b5e0d5 100644
--- a/src/util/hass-attributes-util.ts
+++ b/src/util/hass-attributes-util.ts
@@ -122,6 +122,10 @@ export default hassAttributeUtil;
 
 // Convert from internal snake_case format to user-friendly format
 export function formatAttributeName(value: string): string {
-  value = value.replace(/_/g, " ").replace(/\bid\b/g, "ID");
+  value = value
+    .replace(/_/g, " ")
+    .replace(/\bid\b/g, "ID")
+    .replace(/\bip\b/g, "IP")
+    .replace(/\bmac\b/g, "MAC");
   return value.charAt(0).toUpperCase() + value.slice(1);
 }
diff --git a/translations/frontend/bg.json b/translations/frontend/bg.json
index 01e57e34d7..743edccdd2 100644
--- a/translations/frontend/bg.json
+++ b/translations/frontend/bg.json
@@ -1079,7 +1079,7 @@
                 "buttons": {
                     "add": "Добавете устройства чрез това устройство",
                     "clusters": "Управление на клъстери",
-                    "device_children": "Преглед на дъщерни ",
+                    "device_children": "Преглед на дъщерни",
                     "reconfigure": "Преконфигуриране на устройство",
                     "remove": "Премахване на устройство",
                     "zigbee_information": "Подпис на Zigbee устройството"
@@ -1129,7 +1129,7 @@
                 "observer": "Проверете Надзорника",
                 "reboot": "Опитайте да рестартирате хоста",
                 "system_health": "Проверете здравето на системата",
-                "title": "Не може да се зареди Супервайзър-панела!",
+                "title": "Не може да се зареди Supervisor панела!",
                 "wait": "Ако току-що сте стартирали, дайте достатъчно време за старт на Супервайзъра."
             }
         },
@@ -1149,6 +1149,7 @@
             "intergration_starting": "Стартиране на {integration}, не всичко ще бъде налично, докато процесът не приключи.",
             "service_call_failed": "Неуспешно повикване на услуга {service}.",
             "started": "Home Assistant стартира успешно!",
+            "starting": "Home Assistant стартира, не всичко ще е на разположение, докато не приключи.",
             "triggered": "Задействане {name}",
             "wrapping_up_startup": "Финализиране на стартирането, не всичко ще бъде налично, докато процесът не приключи."
         },
@@ -1596,7 +1597,7 @@
                             "title": "Google Assistant"
                         },
                         "integrations": "Интеграции",
-                        "integrations_introduction": "Интеграциите за облака Assistant Cloud позволяват свързването облачни услуги, като се избягва публичното излагане на инсталацията Home Assistant в интернет.",
+                        "integrations_introduction": "Интеграциите за Home Assistant Cloud ви позволяват свързването с услуги в облака, без да се налага да излагате публично своя Home Assistant в интернет.",
                         "integrations_introduction2": "Проверете уебсайта за",
                         "integrations_link_all_features": "всички налични функции",
                         "manage_account": "Управление на акаунта",
@@ -1605,14 +1606,14 @@
                         "remote": {
                             "access_is_being_prepared": "Подготвя се отдалечен достъп. Ще ви уведомим, когато е готов.",
                             "certificate_info": "Информация за сертификата",
-                            "info": "Облакът Home Assistant осигурява защитена отдалечена връзка с вашата инсталация, докато сте далеч от дома. ",
+                            "info": "Home Assistant Cloud осигурява сигурна отдалечена връзка с вашата инсталация, докато сте извън дома.",
                             "instance_is_available": "Вашата инсталация е налична на",
                             "instance_will_be_available": "Вашата инсталация ще е налична на",
                             "link_learn_how_it_works": "Научете как работи",
                             "title": "Дистанционен контрол"
                         },
                         "sign_out": "Отписване",
-                        "thank_you_note": "Благодарим Ви, че сте част от Home Assistant Cloud. Именно заради хора като вас ние сме в състояние да направим страхотно изживяване при автоматизацията на дома за всички. Благодарим Ви!",
+                        "thank_you_note": "Благодарим Ви, че сте част от Home Assistant Cloud. Именно заради хора като вас ние сме в състояние да направим страхотно изживяване за всички при автоматизацията на дома. Благодарим Ви!",
                         "tts": {
                             "default_language": "Език по подразбиране за използване",
                             "dialog": {
@@ -1653,6 +1654,7 @@
                         "certificate_expiration_date": "Дата на изтичане на сертификата:",
                         "certificate_information": "Информация за сертификата",
                         "close": "Затвори",
+                        "fingerprint": "Отпечатък на сертификата:",
                         "will_be_auto_renewed": "ще бъде автоматично подновен"
                     },
                     "dialog_cloudhook": {
@@ -2418,6 +2420,7 @@
                     "editor": {
                         "activate_user": "Активиране на потребител",
                         "active": "Активен",
+                        "active_tooltip": "Контролира дали потребителят може да влиза",
                         "admin": "Администратор",
                         "caption": "Преглед на потребителя",
                         "change_password": "Смяна на парола",
@@ -3008,6 +3011,8 @@
                         "edit": "Редактиране на изгледа",
                         "header": "Конфигурация на изглед",
                         "header_name": "Конфигурация на изглед {name}",
+                        "move_left": "Преместване на изгледа наляво",
+                        "move_right": "Преместване на изгледа надясно",
                         "tab_badges": "Значки",
                         "tab_settings": "Настройки",
                         "tab_visibility": "Видимост",
diff --git a/translations/frontend/ca.json b/translations/frontend/ca.json
index a064f67ba2..cf74480e6d 100644
--- a/translations/frontend/ca.json
+++ b/translations/frontend/ca.json
@@ -1197,7 +1197,19 @@
                 }
             },
             "zha_reconfigure_device": {
-                "heading": "S'està reconfigurant el dispositiu"
+                "attribute": "Atribut",
+                "bind_header": "Vinculació",
+                "button_hide": "Amaga els detalls",
+                "button_show": "Mostra els detalls",
+                "cluster_header": "Clúster",
+                "configuration_complete": "Reconfiguració de dispositiu completada.",
+                "configuration_failed": "Ha fallat la reconfiguració del dispositiu. Pots trobar informació addicional als registres.",
+                "configuring_alt": "Configurant",
+                "heading": "S'està reconfigurant el dispositiu",
+                "in_progress": "El dispositiu s'està reconfigurant. Això pot trigar una estona.",
+                "min_max_change": "min/max/canvi",
+                "run_in_background": "Pots tancar aquest diàleg, la reconfiguració continuarà en segon pla.",
+                "start_reconfiguration": "Inicia la reconfiguració"
             }
         },
         "duration": {
@@ -1260,7 +1272,8 @@
                     "caption": "Àrees",
                     "data_table": {
                         "area": "Àrea",
-                        "devices": "Dispositius"
+                        "devices": "Dispositius",
+                        "entities": "Entitats"
                     },
                     "delete": {
                         "confirmation_text": "Tots els dispositius d'aquesta àrea quedaran sense assignar.",
@@ -1272,8 +1285,10 @@
                         "create": "Crea",
                         "default_name": "Nova àrea",
                         "delete": "Elimina",
+                        "linked_entities_caption": "Entitats",
                         "name": "Nom",
                         "name_required": "Nom obligatori",
+                        "no_linked_entities": "No hi ha entitats vinculades amb aquesta àrea.",
                         "unknown_error": "Error desconegut",
                         "update": "Actualitza"
                     },
@@ -2924,7 +2939,12 @@
                         "node_status": "Estat del node",
                         "zwave_info": "Informació Z-Wave"
                     },
+                    "logs": {
+                        "log_level": "Nivell dels registres",
+                        "title": "Registres de Z-Wave JS"
+                    },
                     "navigation": {
+                        "logs": "Registres",
                         "network": "Xarxa"
                     },
                     "network_status": {
@@ -2951,6 +2971,13 @@
                         "dead": "Mort",
                         "unknown": "Desconegut"
                     },
+                    "reinterview_node": {
+                        "in_progress": "S'està consultant el dispositiu. Això pot trigar una estona.",
+                        "interview_complete": "Consulta del dispositiu completada.",
+                        "interview_failed": "Ha fallat la consulta del dispositiu. Pots trobar informació addicional als registres.",
+                        "start_reinterview": "Torna a iniciar consulta",
+                        "title": "Torna a consultar un dispositiu Z-Wave"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "Cancel·la l'exclusió",
                         "controller_in_exclusion_mode": "El controlador Z-Wave ara està en mode d'exclusió.",
diff --git a/translations/frontend/cs.json b/translations/frontend/cs.json
index 99acb6c2e0..22b6381344 100644
--- a/translations/frontend/cs.json
+++ b/translations/frontend/cs.json
@@ -1256,7 +1256,8 @@
                     "caption": "Oblasti",
                     "data_table": {
                         "area": "Oblast",
-                        "devices": "Zařízení"
+                        "devices": "Zařízení",
+                        "entities": "Entity"
                     },
                     "delete": {
                         "confirmation_text": "Všechna zařízení v této oblasti budou nastavena jako nepřiřazena.",
@@ -1268,8 +1269,10 @@
                         "create": "VYTVOŘIT",
                         "default_name": "Nová oblast",
                         "delete": "Odstranit",
+                        "linked_entities_caption": "Entity",
                         "name": "Název",
                         "name_required": "Název je povinný",
+                        "no_linked_entities": "S touto oblastí nejsou spojeny žádné entity.",
                         "unknown_error": "Neznámá chyba",
                         "update": "Aktualizovat"
                     },
diff --git a/translations/frontend/en.json b/translations/frontend/en.json
index ea48a46930..2986af1fc8 100644
--- a/translations/frontend/en.json
+++ b/translations/frontend/en.json
@@ -1197,7 +1197,22 @@
                 }
             },
             "zha_reconfigure_device": {
-                "heading": "Reconfiguring device"
+                "attribute": "Attribute",
+                "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.",
+                "bind_header": "Binding",
+                "button_hide": "Hide Details",
+                "button_show": "Show Details",
+                "cluster_header": "Cluster",
+                "configuration_complete": "Device reconfiguration complete.",
+                "configuration_failed": "The device reconfiguration failed. Additional information may be available in the logs.",
+                "configuring_alt": "Configuring",
+                "heading": "Reconfiguring device",
+                "in_progress": "The device is being reconfigured. This may take some time.",
+                "introduction": "Reconfigure a device on your Zigbee network. Use this feature if your device is not functioning correctly.",
+                "min_max_change": "min/max/change",
+                "reporting_header": "Reporting",
+                "run_in_background": "You can close this dialog and the reconfiguration will continue in the background.",
+                "start_reconfiguration": "Start Reconfiguration"
             }
         },
         "duration": {
@@ -1260,7 +1275,8 @@
                     "caption": "Areas",
                     "data_table": {
                         "area": "Area",
-                        "devices": "Devices"
+                        "devices": "Devices",
+                        "entities": "Entities"
                     },
                     "delete": {
                         "confirmation_text": "All devices in this area will become unassigned.",
@@ -1272,8 +1288,10 @@
                         "create": "Create",
                         "default_name": "New Area",
                         "delete": "Delete",
+                        "linked_entities_caption": "Entities",
                         "name": "Name",
                         "name_required": "Name is required",
+                        "no_linked_entities": "There are no entities linked to this area.",
                         "unknown_error": "Unknown error",
                         "update": "Update"
                     },
@@ -2924,7 +2942,12 @@
                         "node_status": "Node Status",
                         "zwave_info": "Z-Wave Info"
                     },
+                    "logs": {
+                        "log_level": "Log Level",
+                        "title": "Z-Wave JS Logs"
+                    },
                     "navigation": {
+                        "logs": "Logs",
                         "network": "Network"
                     },
                     "network_status": {
diff --git a/translations/frontend/et.json b/translations/frontend/et.json
index 65f4658937..8f900572ef 100644
--- a/translations/frontend/et.json
+++ b/translations/frontend/et.json
@@ -1197,7 +1197,22 @@
                 }
             },
             "zha_reconfigure_device": {
-                "heading": "Seadme sätete muutmine"
+                "attribute": "Atribuut",
+                "battery_device_warning": "Patareitoitel seadmed peavad olema ärkvel, et neid taasseadistada. Seadme äratamiseks vaata oma seadme kasutusjuhendit.",
+                "bind_header": "Sidumine",
+                "button_hide": "Peida üksikasjad",
+                "button_show": "Kuva üksikasjad",
+                "cluster_header": "Kobar",
+                "configuration_complete": "Seadme ümberseadistamine on lõpule viidud.",
+                "configuration_failed": "Seadme ümberseadistamine nurjus. Lisateavet võib saada logidest.",
+                "configuring_alt": "Seadistan",
+                "heading": "Seadme sätete muutmine",
+                "in_progress": "Seadet muudetakse ümber. See võib võtta aega.",
+                "introduction": "Seadista uuesti seadet  Zigbee võrgus. Kasuta seda funktsiooni kui seadmel on puuduv või vale funktsionaalsus.",
+                "min_max_change": "min/max/muutus",
+                "reporting_header": "Aruandlus",
+                "run_in_background": "Saad selle dialoogi sulgeda ja ümberseadistamine jätkub taustal.",
+                "start_reconfiguration": "Alusta ümberseadistamist"
             }
         },
         "duration": {
@@ -1260,7 +1275,8 @@
                     "caption": "Alade register",
                     "data_table": {
                         "area": "Ala",
-                        "devices": "Seadmed"
+                        "devices": "Seadmed",
+                        "entities": "Olemid"
                     },
                     "delete": {
                         "confirmation_text": "Kõik sellele ala seadmed jäävad peremehetuks.",
@@ -1272,8 +1288,10 @@
                         "create": "LOO",
                         "default_name": "Uus ala",
                         "delete": "KUSTUTA",
+                        "linked_entities_caption": "Olemid",
                         "name": "Nimi",
                         "name_required": "Nimi on kohustuslik",
+                        "no_linked_entities": "Selle alaga pole seotud ühtegi olemit.",
                         "unknown_error": "Tundmatu viga",
                         "update": "UUENDA"
                     },
@@ -2924,7 +2942,12 @@
                         "node_status": "Sõlme olek",
                         "zwave_info": "Z-Wave teave"
                     },
+                    "logs": {
+                        "log_level": "Logimise tase",
+                        "title": "Z-Wave JS logid"
+                    },
                     "navigation": {
+                        "logs": "Logid",
                         "network": "Võrk"
                     },
                     "network_status": {
@@ -2951,6 +2974,16 @@
                         "dead": "Kadunud",
                         "unknown": "Teadmata"
                     },
+                    "reinterview_node": {
+                        "battery_device_warning": "Patareitoitel seadmed peavad olema ärkvel, et neid küsitleda. Seadme äratamiseks vaata oma seadme kasutusjuhendit.",
+                        "in_progress": "Seadet küsitletakse. See võib võtta aega.",
+                        "interview_complete": "Seadme küsitlemine on lõpetatud.",
+                        "interview_failed": "Seadme küsitlemine nurjus. Lisateave võib olla kättesaadav logides.",
+                        "introduction": "Küsitle uuesti seadet  Z-Wave-võrgus. Kasuta seda funktsiooni kui seadmel on puuduv või vale funktsionaalsus.",
+                        "run_in_background": "Saad selle dialoogi sulgeda ja küsitlus jätkub taustal.",
+                        "start_reinterview": "Alusta küsitlust uuesti",
+                        "title": "Z-Wave seadme taasküsitlemine"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "Tühista välistamine",
                         "controller_in_exclusion_mode": "Z-Wave kontroller on nüüd välistamisrežiimis.",
diff --git a/translations/frontend/it.json b/translations/frontend/it.json
index 5c10d7d9f8..881eac9ebe 100644
--- a/translations/frontend/it.json
+++ b/translations/frontend/it.json
@@ -561,9 +561,12 @@
             },
             "light": {
                 "brightness": "Luminosità",
+                "cold_white_value": "Luminosità bianca fredda",
+                "color_brightness": "Luminosità del colore",
                 "color_temperature": "Temperatura colore",
                 "effect": "Effetto",
-                "white_value": "Valore bianco"
+                "warm_white_value": "Luminosità bianca calda",
+                "white_value": "Luminosità del bianco"
             },
             "lock": {
                 "code": "Codice",
@@ -1194,7 +1197,22 @@
                 }
             },
             "zha_reconfigure_device": {
-                "heading": "Riconfigurazione del dispositivo"
+                "attribute": "Attributo",
+                "battery_device_warning": "Sarà necessario riattivare i dispositivi alimentati a batteria prima di avviare il processo di riconfigurazione. Fare riferimento al manuale del dispositivo per istruzioni su come riattivare il dispositivo.",
+                "bind_header": "Collegamento",
+                "button_hide": "Nascondi dettagli",
+                "button_show": "Mostra dettagli",
+                "cluster_header": "Grappolo",
+                "configuration_complete": "Riconfigurazione del dispositivo completata.",
+                "configuration_failed": "La riconfigurazione del dispositivo non è riuscita. Ulteriori informazioni potrebbero essere disponibili nei registri.",
+                "configuring_alt": "Configurazione",
+                "heading": "Riconfigurazione del dispositivo",
+                "in_progress": "Il dispositivo è in fase di riconfigurazione. Potrebbe volerci un po' di tempo.",
+                "introduction": "Riconfigura un dispositivo sulla tua rete Zigbee. Usa questa funzione se il tuo dispositivo non funziona correttamente.",
+                "min_max_change": "min/max/cambio",
+                "reporting_header": "Segnalazione",
+                "run_in_background": "È possibile chiudere questa finestra di dialogo e la riconfigurazione continuerà in background.",
+                "start_reconfiguration": "Avvia la riconfigurazione"
             }
         },
         "duration": {
@@ -1257,7 +1275,8 @@
                     "caption": "Aree",
                     "data_table": {
                         "area": "Area",
-                        "devices": "Dispositivi"
+                        "devices": "Dispositivi",
+                        "entities": "Entità"
                     },
                     "delete": {
                         "confirmation_text": "Tutti i dispositivi in quest'area non saranno assegnati.",
@@ -1269,8 +1288,10 @@
                         "create": "Crea",
                         "default_name": "Nuova area",
                         "delete": "Elimina",
+                        "linked_entities_caption": "Entità",
                         "name": "Nome",
                         "name_required": "Il nome è obbligatorio",
+                        "no_linked_entities": "Non ci sono entità collegate a quest'area.",
                         "unknown_error": "Errore sconosciuto",
                         "update": "Aggiorna"
                     },
@@ -2936,6 +2957,9 @@
                         "header": "Configurazione del dispositivo Z-Wave",
                         "introduction": "Gestire e regolare i parametri di configurazione specifici del dispositivo (nodo) per il dispositivo selezionato",
                         "parameter_is_read_only": "Questo parametro è di sola lettura.",
+                        "set_param_accepted": "Il parametro è stato aggiornato.",
+                        "set_param_error": "Si è verificato un errore.",
+                        "set_param_queued": "La modifica del parametro è stata messa in coda e verrà aggiornata quando il dispositivo si riattiva.",
                         "zwave_js_device_database": "Database dei dispositivi Z-Wave JS"
                     },
                     "node_status": {
@@ -2945,6 +2969,16 @@
                         "dead": "Disattivo",
                         "unknown": "Sconosciuto"
                     },
+                    "reinterview_node": {
+                        "battery_device_warning": "Sarà necessario riattivare i dispositivi alimentati a batteria prima di iniziare la nuova interrogazione. Fare riferimento al manuale del dispositivo per istruzioni su come riattivare il dispositivo.",
+                        "in_progress": "Il dispositivo viene interrogato. Potrebbe volerci un po' di tempo.",
+                        "interview_complete": "Interrogazione del dispositivo completata.",
+                        "interview_failed": "L'interrogazione al dispositivo non è riuscita. Ulteriori informazioni potrebbero essere disponibili nei registri.",
+                        "introduction": "Interroga nuovamente un dispositivo sulla tua rete Z-Wave. Usa questa funzione se il tuo dispositivo ha funzionalità mancanti o errate.",
+                        "run_in_background": "Puoi chiudere questa finestra di dialogo e l'interrogazione continuerà in background.",
+                        "start_reinterview": "Inizia una nuova interrogazione",
+                        "title": "Re-interroga un dispositivo Z-Wave"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "Annulla esclusione",
                         "controller_in_exclusion_mode": "Il tuo controller Z-Wave è ora in modalità di esclusione.",
diff --git a/translations/frontend/ko.json b/translations/frontend/ko.json
index eb9912cc82..61fc63c695 100644
--- a/translations/frontend/ko.json
+++ b/translations/frontend/ko.json
@@ -561,8 +561,11 @@
             },
             "light": {
                 "brightness": "밝기",
+                "cold_white_value": "주광색 밝기",
+                "color_brightness": "색상 밝기",
                 "color_temperature": "색온도",
                 "effect": "효과",
+                "warm_white_value": "전구색 밝기",
                 "white_value": "흰색 값"
             },
             "lock": {
@@ -1194,7 +1197,22 @@
                 }
             },
             "zha_reconfigure_device": {
-                "heading": "기기 재구성 중"
+                "attribute": "속성",
+                "battery_device_warning": "재구성하기 전에 배터리 전원 장치의 절전 모드를 해제해야 합니다. 절전 모드를 해제하는 방법은 기기 설명서를 참조하십시오.",
+                "bind_header": "묶기",
+                "button_hide": "세부 정보 숨기기",
+                "button_show": "세부 정보 표시",
+                "cluster_header": "클러스터",
+                "configuration_complete": "장치 재구성이 완료되었습니다.",
+                "configuration_failed": "장치 재구성에 실패했습니다. 로그에서 정보를 확인할 수 있습니다.",
+                "configuring_alt": "구성",
+                "heading": "기기 재구성 중",
+                "in_progress": "장치가 재구성 중입니다. 시간이 좀 걸릴 수 있습니다.",
+                "introduction": "Zigbee 네트워크에서 장치를 재구성합니다. 장치가 올바르게 작동하지 않는 경우에 이 기능을 사용하십시오.",
+                "min_max_change": "최소/최대/변경",
+                "reporting_header": "보고",
+                "run_in_background": "이 대화 상자를 닫을 수 있으며 재구성은 백그라운드에서 계속됩니다.",
+                "start_reconfiguration": "재구성 시작"
             }
         },
         "duration": {
@@ -2944,6 +2962,16 @@
                         "dead": "사용불가",
                         "unknown": "알 수 없음"
                     },
+                    "reinterview_node": {
+                        "battery_device_warning": "재인터뷰를 시작하기 전에 배터리 전원 장치의 절전 모드를 해제해야 합니다. 절전 모드를 해제하는 방법은 기기 설명서를 참조하십시오.",
+                        "in_progress": "장치가 인터뷰중입니다. 시간이 좀 걸릴 수 있습니다.",
+                        "interview_complete": "장치 인터뷰가 완료되었습니다.",
+                        "interview_failed": "장치 인터뷰에 실패했습니다. 로그에서 정보를 확인할 수 있습니다.",
+                        "introduction": "Z-Wave 네트워크 상의 장치를 다시 인터뷰합니다. 장치가 사라지거나 오동작할 경우에 이 기능을 사용하십시오.",
+                        "run_in_background": "이 대화 상자를 닫을 수 있으며 인터뷰는 백그라운드에서 계속됩니다.",
+                        "start_reinterview": "재인터뷰 시작",
+                        "title": "Z-Wave 장치 재인터뷰"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "제외 취소하기",
                         "controller_in_exclusion_mode": "Z-Wave 컨트롤러가 이제 제외 모드에 있습니다",
diff --git a/translations/frontend/nb.json b/translations/frontend/nb.json
index 87f3dfe880..8be096c657 100644
--- a/translations/frontend/nb.json
+++ b/translations/frontend/nb.json
@@ -561,9 +561,12 @@
             },
             "light": {
                 "brightness": "Lysstyrke",
+                "cold_white_value": "Kald hvit lysstyrke",
+                "color_brightness": "Farge lysstyrke",
                 "color_temperature": "Fargetemperatur",
                 "effect": "Effekt",
-                "white_value": "Hvit verdi"
+                "warm_white_value": "Varm hvit lysstyrke",
+                "white_value": "Hvit lysstyrke"
             },
             "lock": {
                 "code": "Kode",
@@ -2948,6 +2951,16 @@
                         "dead": "Død",
                         "unknown": "Ukjent"
                     },
+                    "reinterview_node": {
+                        "battery_device_warning": "Du må vekke batteridrevne enheter før du begynner på nytt intervju. Se enhetens håndbok for instruksjoner om hvordan du vekker enheten.",
+                        "in_progress": "Enheten blir intervjuet. Dette kan ta litt tid.",
+                        "interview_complete": "Enhetsintervjuet er fullført.",
+                        "interview_failed": "Enhetsintervjuet mislyktes. Ytterligere informasjon kan være tilgjengelig i loggene.",
+                        "introduction": "Intervju en enhet på nytt på Z-Wave-nettverket. Bruk denne funksjonen hvis enheten mangler eller ikke har feil funksjonalitet.",
+                        "run_in_background": "Du kan lukke denne dialogen, og intervjuet fortsetter i bakgrunnen.",
+                        "start_reinterview": "Start Re-intervju",
+                        "title": "Intervju en Z-Wave-enhet på nytt"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "Avbryt ekskludering",
                         "controller_in_exclusion_mode": "Z-Wave-kontrolleren er nå i ekskluderingsmodus",
diff --git a/translations/frontend/nl.json b/translations/frontend/nl.json
index deaa8deb46..28b2420907 100644
--- a/translations/frontend/nl.json
+++ b/translations/frontend/nl.json
@@ -561,8 +561,11 @@
             },
             "light": {
                 "brightness": "Helderheid",
+                "cold_white_value": "Koud wit helderheid",
+                "color_brightness": "Kleurhelderheid",
                 "color_temperature": "Kleurtemperatuur",
                 "effect": "Effect",
+                "warm_white_value": "Warm wit helderheid",
                 "white_value": "Witwaarde"
             },
             "lock": {
@@ -1194,7 +1197,22 @@
                 }
             },
             "zha_reconfigure_device": {
-                "heading": "Apparaat opnieuw configureren"
+                "attribute": "Attribuut",
+                "battery_device_warning": "U moet apparaten met een batterij wekken voordat u het herconfiguratieproces start. Raadpleeg de handleiding van uw toestel voor instructies over hoe u het toestel kunt wekken.",
+                "bind_header": "Binding",
+                "button_hide": "Details verbergen",
+                "button_show": "Details weergeven",
+                "cluster_header": "Cluster",
+                "configuration_complete": "Herconfiguratie van apparaat voltooid.",
+                "configuration_failed": "De herconfiguratie van het apparaat is mislukt. Mogelijk is er aanvullende informatie beschikbaar in de logboeken.",
+                "configuring_alt": "Configureren",
+                "heading": "Apparaat opnieuw configureren",
+                "in_progress": "Het apparaat wordt opnieuw geconfigureerd. Dit kan wat tijd kosten.",
+                "introduction": "Herconfigureer een apparaat op je Zigbee netwerk. Gebruik deze functie als uw apparaat niet correct functioneert.",
+                "min_max_change": "mix/max/verander",
+                "reporting_header": "Rapporteren",
+                "run_in_background": "U kunt dit dialoogvenster sluiten en de herconfiguratie wordt op de achtergrond voortgezet.",
+                "start_reconfiguration": "Start herconfiguratie"
             }
         },
         "duration": {
@@ -1257,7 +1275,8 @@
                     "caption": "Gebieden",
                     "data_table": {
                         "area": "Gebied",
-                        "devices": "Apparaten"
+                        "devices": "Apparaten",
+                        "entities": "Entiteiten"
                     },
                     "delete": {
                         "confirmation_text": "Alle apparaten in dit gebied zullen niet meer toegewezen zijn.",
@@ -1269,8 +1288,10 @@
                         "create": "Aanmaken",
                         "default_name": "Nieuw Gebied",
                         "delete": "Verwijderen",
+                        "linked_entities_caption": "Entiteiten",
                         "name": "Naam",
                         "name_required": "Naam is vereist",
+                        "no_linked_entities": "Er zijn geen entiteiten gekoppeld aan dit gebied.",
                         "unknown_error": "Onbekende fout",
                         "update": "Bijwerken"
                     },
diff --git a/translations/frontend/ru.json b/translations/frontend/ru.json
index ec43f9f5f8..39202e1bcb 100644
--- a/translations/frontend/ru.json
+++ b/translations/frontend/ru.json
@@ -1197,7 +1197,22 @@
                 }
             },
             "zha_reconfigure_device": {
-                "heading": "Перенастройка устройства"
+                "attribute": "Атрибут",
+                "battery_device_warning": "Перед повторной настройкой устройства с батарейным питанием необходимо вывести из спящего режима. О том, как это сделать, Вы можете узнать из инструкций к Вашему устройству.",
+                "bind_header": "Привязка",
+                "button_hide": "Скрыть подробности",
+                "button_show": "Подробнее",
+                "cluster_header": "Кластер",
+                "configuration_complete": "Настройка устройства завершена",
+                "configuration_failed": "Не удалось перенастроить устройство. Дополнительная информация может быть получена в журналах.",
+                "configuring_alt": "Настройка",
+                "heading": "Перенастройка устройства",
+                "in_progress": "Устройство настраивается, это может занять некоторое время.",
+                "introduction": "Повторная настройка устройства в Вашей сети Zigbee. Используйте эту функцию, если устройство работает некорректно.",
+                "min_max_change": "мин/макс/изменение",
+                "reporting_header": "Получение отчёта",
+                "run_in_background": "Вы можете закрыть это диалоговое окно, настройка продолжится в фоновом режиме.",
+                "start_reconfiguration": "Начать повторную настройку"
             }
         },
         "duration": {
@@ -1260,7 +1275,8 @@
                     "caption": "Помещения",
                     "data_table": {
                         "area": "Помещение",
-                        "devices": "Устройства"
+                        "devices": "Устройства",
+                        "entities": "Объекты"
                     },
                     "delete": {
                         "confirmation_text": "Связанные устройства потеряют привязку к помещению.",
@@ -1272,8 +1288,10 @@
                         "create": "Добавить",
                         "default_name": "Новое помещение",
                         "delete": "Удалить",
+                        "linked_entities_caption": "Объекты",
                         "name": "Название",
                         "name_required": "Укажите название помещения",
+                        "no_linked_entities": "С этим помещением не связаны никакие объекты.",
                         "unknown_error": "Неизвестная ошибка.",
                         "update": "Обновить"
                     },
@@ -2924,7 +2942,12 @@
                         "node_status": "Статус узла",
                         "zwave_info": "Информация о Z-Wave"
                     },
+                    "logs": {
+                        "log_level": "Уровень",
+                        "title": "Журналы Z-Wave JS"
+                    },
                     "navigation": {
+                        "logs": "Журналы",
                         "network": "Сеть"
                     },
                     "network_status": {
@@ -2951,6 +2974,16 @@
                         "dead": "Мертвый",
                         "unknown": "Неизвестно"
                     },
+                    "reinterview_node": {
+                        "battery_device_warning": "Перед повторным опросом устройства с батарейным питанием необходимо вывести из спящего режима. О том, как это сделать, Вы можете узнать из инструкций к Вашему устройству.",
+                        "in_progress": "Устройство опрашивается, это может занять некоторое время.",
+                        "interview_complete": "Опрос устройства завершен.",
+                        "interview_failed": "Опрос устройства не удался. Дополнительная информация может быть получена в журналах.",
+                        "introduction": "Повторный опрос устройства в Вашей сети Z-Wave. Используйте эту функцию, если это устройство не работает или работает неправильно.",
+                        "run_in_background": "Вы можете закрыть это диалоговое окно, опрос продолжится в фоновом режиме.",
+                        "start_reinterview": "Начать повторный опрос",
+                        "title": "Повторный опрос устройства Z-Wave"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "Отменить отключение",
                         "controller_in_exclusion_mode": "Ваш контроллер Z-Wave находится в режиме отключения.",
diff --git a/translations/frontend/th.json b/translations/frontend/th.json
index 50e8733d0a..6863cfdcab 100644
--- a/translations/frontend/th.json
+++ b/translations/frontend/th.json
@@ -1103,7 +1103,7 @@
                 "force_narrow": {
                     "header": "ซ่อนแถบด้านข้างเสมอ"
                 },
-                "is_owner": "ในฐานะ \"เจ้าของ\"",
+                "is_owner": "คุณเป็นเจ้าของ",
                 "language": {
                     "dropdown_label": "ภาษา",
                     "header": "ภาษา",
diff --git a/translations/frontend/zh-Hant.json b/translations/frontend/zh-Hant.json
index fa26265bb7..fdcf31fdbd 100644
--- a/translations/frontend/zh-Hant.json
+++ b/translations/frontend/zh-Hant.json
@@ -561,9 +561,12 @@
             },
             "light": {
                 "brightness": "亮度",
+                "cold_white_value": "冷白亮度",
+                "color_brightness": "色彩亮度",
                 "color_temperature": "色溫",
                 "effect": "場景",
-                "white_value": "白色值"
+                "warm_white_value": "暖白亮度",
+                "white_value": "白亮度"
             },
             "lock": {
                 "code": "密碼",
@@ -2948,6 +2951,16 @@
                         "dead": "失效",
                         "unknown": "未知"
                     },
+                    "reinterview_node": {
+                        "battery_device_warning": "電池供電裝置必須先喚醒以重新探訪。請參考您的裝置手冊以了解如何喚醒裝置。",
+                        "in_progress": "正在探訪裝置，可能需要一點時間。",
+                        "interview_complete": "裝置探訪完成。",
+                        "interview_failed": "裝置探訪失敗。日誌中可能包含其他相關資訊。",
+                        "introduction": "重新探訪 Z-Wave 網路中的裝置。假如裝置缺少、或者功能不正確時，請使用此選項。",
+                        "run_in_background": "可以關閉此對話框、探訪將於背景繼續執行。",
+                        "start_reinterview": "開始重新探訪",
+                        "title": "重新探訪 Z-Wave 裝置"
+                    },
                     "remove_node": {
                         "cancel_exclusion": "取消排除",
                         "controller_in_exclusion_mode": "Z-Wave 控制器目前處於排除模式。",