diff --git a/build-scripts/gulp/demo.js b/build-scripts/gulp/demo.js
index b2d40e17ae..2c8070962d 100644
--- a/build-scripts/gulp/demo.js
+++ b/build-scripts/gulp/demo.js
@@ -1,4 +1,4 @@
-// Run HA develop mode
+// Run demo develop mode
 const gulp = require("gulp");
 
 require("./clean.js");
diff --git a/build-scripts/gulp/webpack.js b/build-scripts/gulp/webpack.js
index 2a21a14011..b1675ad076 100644
--- a/build-scripts/gulp/webpack.js
+++ b/build-scripts/gulp/webpack.js
@@ -84,12 +84,12 @@ gulp.task("webpack-dev-server-demo", () => {
     open: true,
     watchContentBase: true,
     contentBase: path.resolve(paths.demo_dir, "dist"),
-  }).listen(8080, "localhost", function(err) {
+  }).listen(8090, "localhost", function(err) {
     if (err) {
       throw err;
     }
     // Server listening
-    log("[webpack-dev-server]", "http://localhost:8080");
+    log("[webpack-dev-server]", "http://localhost:8090");
   });
 });
 
diff --git a/build-scripts/webpack.js b/build-scripts/webpack.js
index 031c72433d..7ee1a03714 100644
--- a/build-scripts/webpack.js
+++ b/build-scripts/webpack.js
@@ -96,7 +96,7 @@ const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
   // Create an object mapping browser urls to their paths during build
   const translationMetadata = require("../build-translations/translationMetadata.json");
   const workBoxTranslationsTemplatedURLs = {};
-  const englishFP = translationMetadata["translations"]["en"]["fingerprints"];
+  const englishFP = translationMetadata.translations.en.fingerprints;
   Object.keys(englishFP).forEach((key) => {
     workBoxTranslationsTemplatedURLs[
       `/static/translations/${englishFP[key]}`
@@ -192,7 +192,7 @@ const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
       new webpack.DefinePlugin({
         __DEV__: !isProdBuild,
         __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
-        __VERSION__: JSON.stringify("DEMO"),
+        __VERSION__: JSON.stringify(`DEMO-${version}`),
         __DEMO__: true,
         __STATIC_PATH__: "/static/",
         "process.env.NODE_ENV": JSON.stringify(
diff --git a/demo/src/configs/arsaboo/entities.ts b/demo/src/configs/arsaboo/entities.ts
index 703b9751f0..9bbc753451 100644
--- a/demo/src/configs/arsaboo/entities.ts
+++ b/demo/src/configs/arsaboo/entities.ts
@@ -245,16 +245,7 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         homebridge_cover_type: "garage_door",
       },
     },
-    "light.master_lights": {
-      entity_id: "light.master_lights",
-      state: "off",
-      attributes: {
-        min_mireds: 153,
-        max_mireds: 500,
-        friendly_name: "Master Lights",
-        supported_features: 63,
-      },
-    },
+
     "light.living_room_lights": {
       entity_id: "light.living_room_lights",
       state: "off",
@@ -280,40 +271,7 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         supported_features: 1,
       },
     },
-    "light.hue_color_lamp_1": {
-      entity_id: "light.hue_color_lamp_1",
-      state: "on",
-      attributes: {
-        min_mireds: 153,
-        max_mireds: 500,
-        friendly_name: localize("ui.panel.page-demo.config.arsaboo.names.left"),
-        supported_features: 63,
-      },
-    },
-    "light.hue_color_lamp_2": {
-      entity_id: "light.hue_color_lamp_2",
-      state: "off",
-      attributes: {
-        min_mireds: 153,
-        max_mireds: 500,
-        friendly_name: localize(
-          "ui.panel.page-demo.config.arsaboo.names.right"
-        ),
-        supported_features: 63,
-      },
-    },
-    "light.hue_color_lamp_3": {
-      entity_id: "light.hue_color_lamp_3",
-      state: "on",
-      attributes: {
-        min_mireds: 153,
-        max_mireds: 500,
-        friendly_name: localize(
-          "ui.panel.page-demo.config.arsaboo.names.mirror"
-        ),
-        supported_features: 63,
-      },
-    },
+
     "sensor.plexspy": {
       entity_id: "sensor.plexspy",
       state: "0",
@@ -405,16 +363,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         supported_features: 0,
       },
     },
-    "light.gateway_light_34ce00813670": {
-      entity_id: "light.gateway_light_34ce00813670",
-      state: "off",
-      attributes: {
-        friendly_name: localize(
-          "ui.panel.page-demo.config.arsaboo.names.hallway"
-        ),
-        supported_features: 17,
-      },
-    },
     "alarm_control_panel.abode_alarm": {
       entity_id: "alarm_control_panel.abode_alarm",
       state: "disarmed",
@@ -472,35 +420,7 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         device_class: "motion",
       },
     },
-    "binary_sensor.water_leak_sensor_158d0001d77800": {
-      entity_id: "binary_sensor.water_leak_sensor_158d0001d77800",
-      state: "off",
-      attributes: {
-        battery_level: 41,
-        friendly_name: "Laundry Water Leak",
-        device_class: "moisture",
-      },
-    },
-    "binary_sensor.motion_sensor_158d00016c53bf": {
-      entity_id: "binary_sensor.motion_sensor_158d00016c53bf",
-      state: "off",
-      attributes: {
-        "No motion since": 0,
-        battery_level: 43,
-        friendly_name: "Master Occupancy",
-        device_class: "motion",
-      },
-    },
-    "binary_sensor.motion_sensor_158d00016612af": {
-      entity_id: "binary_sensor.motion_sensor_158d00016612af",
-      state: "off",
-      attributes: {
-        "No motion since": 0,
-        battery_level: 41,
-        friendly_name: "Upstairs Occupancy",
-        device_class: "motion",
-      },
-    },
+
     "binary_sensor.front_door": {
       entity_id: "binary_sensor.front_door",
       state: "off",
@@ -587,16 +507,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         icon: "hademo:history",
       },
     },
-    "light.lifxnrkitchen": {
-      entity_id: "light.lifxnrkitchen",
-      state: "off",
-      attributes: {
-        min_mireds: 111,
-        max_mireds: 400,
-        friendly_name: "LifxnrKitchen",
-        supported_features: 55,
-      },
-    },
     "light.lifx5": {
       entity_id: "light.lifx5",
       state: "on",
@@ -607,41 +517,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         supported_features: 55,
       },
     },
-    "light.lifxnrguest": {
-      entity_id: "light.lifxnrguest",
-      state: "off",
-      attributes: {
-        min_mireds: 111,
-        max_mireds: 400,
-        friendly_name: localize(
-          "ui.panel.page-demo.config.arsaboo.names.patio"
-        ),
-        supported_features: 55,
-      },
-    },
-    "light.lifx3": {
-      entity_id: "light.lifx3",
-      state: "off",
-      attributes: {
-        min_mireds: 111,
-        max_mireds: 400,
-        friendly_name: localize(
-          "ui.panel.page-demo.config.arsaboo.names.kitchen"
-        ),
-        supported_features: 55,
-      },
-    },
-    "sensor.illumination_158d00016c53bf": {
-      entity_id: "sensor.illumination_158d00016c53bf",
-      state: "10",
-      attributes: {
-        battery_level: 43,
-        unit_of_measurement: "lx",
-        friendly_name: "Master Brightness",
-        device_class: "illuminance",
-        icon: "hademo:brightness-7",
-      },
-    },
     "sensor.alok_to_home": {
       entity_id: "sensor.alok_to_home",
       state: "41",
@@ -680,13 +555,6 @@ export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
         icon: "hademo:car",
       },
     },
-    "switch.wemoswitch": {
-      entity_id: "switch.wemoswitch",
-      state: "on",
-      attributes: {
-        friendly_name: localize("ui.panel.page-demo.config.arsaboo.labels.air"),
-      },
-    },
     "switch.driveway": {
       entity_id: "switch.driveway",
       state: "off",
diff --git a/demo/src/configs/arsaboo/lovelace.ts b/demo/src/configs/arsaboo/lovelace.ts
index 7039f4bdbb..752b665111 100644
--- a/demo/src/configs/arsaboo/lovelace.ts
+++ b/demo/src/configs/arsaboo/lovelace.ts
@@ -9,6 +9,27 @@ export const demoLovelaceArsaboo: DemoConfig["lovelace"] = (localize) => ({
       title: "Home",
       cards: [
         { type: "custom:ha-demo-card" },
+        {
+          type: "entities",
+          title: localize("ui.panel.page-demo.config.arsaboo.labels.lights"),
+          entities: [
+            {
+              entity: "light.kitchen_lights",
+            },
+            {
+              entity: "light.living_room_lights",
+            },
+            {
+              entity: "switch.wemoporch",
+            },
+            "light.lifx5",
+          ],
+        },
+        {
+          type: "thermostat",
+          entity: "climate.upstairs",
+        },
+
         {
           type: "picture-elements",
           image: "/assets/arsaboo/floorplans/main.png",
@@ -381,104 +402,7 @@ export const demoLovelaceArsaboo: DemoConfig["lovelace"] = (localize) => ({
             },
           ],
         },
-        {
-          type: "picture-elements",
-          image: "/assets/arsaboo/floorplans/second.png",
-          elements: [
-            {
-              type: "state-icon",
-              entity: "binary_sensor.motion_sensor_158d00016612af",
-              style: {
-                top: "40%",
-                left: "35%",
-              },
-            },
-            // {
-            //   type: "custom:thermostat-card",
-            //   entity: "climate.bedroom",
-            //   no_card: true,
-            //   hvac: {
-            //     attribute: "operation",
-            //   },
-            //   style: {
-            //     top: "79%",
-            //     left: "92%",
-            //     width: "50px",
-            //     height: "50px",
-            //   },
-            // },
-            {
-              type: "state-icon",
-              entity: "binary_sensor.motion_sensor_158d00016c53bf",
-              style: {
-                top: "55%",
-                left: "80%",
-              },
-            },
-            {
-              type: "state-label",
-              entity: "sensor.illumination_158d00016c53bf",
-              style: {
-                top: "78%",
-                left: "80%",
-                "text-align": "center",
-                "font-size": "12px",
-                color: "black",
-              },
-            },
-            {
-              type: "image",
-              entity: "light.master_lights",
-              tap_action: {
-                action: "toggle",
-              },
-              hold_action: {
-                action: "more-info",
-              },
-              image: "/assets/arsaboo/icons/light_bulb_off.png",
-              state_image: {
-                on: "/assets/arsaboo/icons/light_bulb_on.png",
-              },
-              state_filter: {
-                on:
-                  "brightness(130%) saturate(1.5) drop-shadow(0px 0px 10px gold)",
-                off: "brightness(80%) saturate(0.8)",
-              },
-              style: {
-                top: "70%",
-                left: "80%",
-                width: "7%",
-                padding: "10px",
-              },
-            },
-            {
-              type: "state-icon",
-              entity: "binary_sensor.water_leak_sensor_158d0001d77800",
-              style: {
-                top: "25%",
-                left: "66%",
-              },
-            },
-            // {
-            //   type: "custom:thermostat-card",
-            //   entity: "climate.upstairs",
-            //   no_card: true,
-            //   hvac: {
-            //     attribute: "operation",
-            //   },
-            //   style: {
-            //     top: "18%",
-            //     left: "15%",
-            //     width: "50px",
-            //     height: "50px",
-            //   },
-            // },
-          ],
-        },
-        {
-          type: "thermostat",
-          entity: "climate.upstairs",
-        },
+
         {
           type: "media-control",
           entity: "media_player.family_room_2",
@@ -496,44 +420,11 @@ export const demoLovelaceArsaboo: DemoConfig["lovelace"] = (localize) => ({
             "sensor.usdinr",
           ],
         },
-        {
-          type: "entities",
-          title: localize("ui.panel.page-demo.config.arsaboo.labels.lights"),
-          entities: [
-            {
-              entity: "light.gateway_light_34ce00813670",
-            },
-            {
-              entity: "light.lifx3",
-            },
-            {
-              entity: "light.lifxnrguest",
-            },
-            {
-              type: "section",
-              label: localize(
-                "ui.panel.page-demo.config.arsaboo.names.master_bedroom"
-              ),
-            },
-            {
-              entity: "light.hue_color_lamp_1",
-            },
-            {
-              entity: "light.hue_color_lamp_2",
-            },
-            {
-              entity: "light.hue_color_lamp_3",
-            },
-            {
-              entity: "switch.wemoswitch",
-            },
-          ],
-        },
 
         {
           type: "alarm-panel",
           entity: "alarm_control_panel.abode_alarm",
-          name: "Abode",
+          name: "Security",
           states: ["arm_home", "arm_away"],
         },
         {
@@ -554,7 +445,7 @@ export const demoLovelaceArsaboo: DemoConfig["lovelace"] = (localize) => ({
         },
         {
           type: "entities",
-          title: "Ring Doorbell",
+          title: "Doorbell",
           show_header_toggle: false,
           entities: [
             "binary_sensor.ring_front_door_ding",
diff --git a/demo/src/ha-demo.ts b/demo/src/ha-demo.ts
index 0391b4df6d..6eb383eb22 100644
--- a/demo/src/ha-demo.ts
+++ b/demo/src/ha-demo.ts
@@ -16,6 +16,8 @@ import { mockEvents } from "./stubs/events";
 import { mockMediaPlayer } from "./stubs/media_player";
 import { HomeAssistant } from "../../src/types";
 import { mockFrontend } from "./stubs/frontend";
+import { mockPersistentNotification } from "./stubs/persistent_notification";
+import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
 
 class HaDemo extends HomeAssistantAppEl {
   protected async _initialize() {
@@ -43,6 +45,7 @@ class HaDemo extends HomeAssistantAppEl {
     mockEvents(hass);
     mockMediaPlayer(hass);
     mockFrontend(hass);
+    mockPersistentNotification(hass);
 
     // Once config is loaded AND localize, set entities and apply theme.
     Promise.all([selectedDemoConfig, localizePromise]).then(
@@ -58,49 +61,14 @@ class HaDemo extends HomeAssistantAppEl {
     document.body.addEventListener(
       "click",
       (e) => {
-        if (
-          e.defaultPrevented ||
-          e.button !== 0 ||
-          e.metaKey ||
-          e.ctrlKey ||
-          e.shiftKey
-        ) {
-          return;
-        }
+        const href = isNavigationClick(e);
 
-        const anchor = e
-          .composedPath()
-          .filter((n) => (n as HTMLElement).tagName === "A")[0] as
-          | HTMLAnchorElement
-          | undefined;
-        if (
-          !anchor ||
-          anchor.target ||
-          anchor.hasAttribute("download") ||
-          anchor.getAttribute("rel") === "external"
-        ) {
-          return;
-        }
-
-        let href = anchor.href;
-        if (!href || href.indexOf("mailto:") !== -1) {
-          return;
-        }
-
-        const location = window.location;
-        const origin =
-          location.origin || location.protocol + "//" + location.host;
-        if (href.indexOf(origin) !== 0) {
-          return;
-        }
-        href = href.substr(origin.length);
-
-        if (href === "#") {
+        if (!href) {
           return;
         }
 
         e.preventDefault();
-        navigate(this as any, href);
+        navigate(this, href);
       },
       { capture: true }
     );
diff --git a/demo/src/stubs/persistent_notification.ts b/demo/src/stubs/persistent_notification.ts
new file mode 100644
index 0000000000..2dcd4f61bd
--- /dev/null
+++ b/demo/src/stubs/persistent_notification.ts
@@ -0,0 +1,16 @@
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { PersistentNotification } from "../../../src/data/persistent_notification";
+
+export const mockPersistentNotification = (hass: MockHomeAssistant) => {
+  hass.mockWS("persistent_notification/get", () =>
+    Promise.resolve([
+      {
+        created_at: new Date().toISOString(),
+        message: "There was motion detected in the backyard.",
+        notification_id: "demo-1",
+        title: "Motion Detected!",
+        status: "unread",
+      },
+    ] as PersistentNotification[])
+  );
+};
diff --git a/package.json b/package.json
index 150504ac51..97757ab7f4 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "fuse.js": "^3.4.4",
     "google-timezones-json": "^1.0.2",
     "hls.js": "^0.12.4",
-    "home-assistant-js-websocket": "^4.2.2",
+    "home-assistant-js-websocket": "4.3.1",
     "intl-messageformat": "^2.2.0",
     "jquery": "^3.3.1",
     "js-yaml": "^3.13.0",
@@ -112,6 +112,8 @@
     "@babel/preset-typescript": "^7.3.3",
     "@gfx/zopfli": "^1.0.11",
     "@types/chai": "^4.1.7",
+    "@types/chromecast-caf-receiver": "^3.0.12",
+    "@types/chromecast-caf-sender": "^1.0.1",
     "@types/hls.js": "^0.12.3",
     "@types/leaflet": "^1.4.3",
     "@types/memoize-one": "4.1.0",
diff --git a/setup.py b/setup.py
index af40db5999..5173765e0a 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20190721.1",
+    version="20190731.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",
diff --git a/src/common/dom/is-navigation-click.ts b/src/common/dom/is-navigation-click.ts
new file mode 100644
index 0000000000..3ab515b778
--- /dev/null
+++ b/src/common/dom/is-navigation-click.ts
@@ -0,0 +1,45 @@
+export const isNavigationClick = (e: MouseEvent) => {
+  // Taken from polymer/pwa-helpers. BSD-3 licensed
+  if (
+    e.defaultPrevented ||
+    e.button !== 0 ||
+    e.metaKey ||
+    e.ctrlKey ||
+    e.shiftKey
+  ) {
+    return;
+  }
+
+  const anchor = e
+    .composedPath()
+    .filter((n) => (n as HTMLElement).tagName === "A")[0] as
+    | HTMLAnchorElement
+    | undefined;
+  if (
+    !anchor ||
+    anchor.target ||
+    anchor.hasAttribute("download") ||
+    anchor.getAttribute("rel") === "external"
+  ) {
+    return;
+  }
+
+  let href = anchor.href;
+  if (!href || href.indexOf("mailto:") !== -1) {
+    return;
+  }
+
+  const location = window.location;
+  const origin = location.origin || location.protocol + "//" + location.host;
+  if (href.indexOf(origin) !== 0) {
+    return;
+  }
+  href = href.substr(origin.length);
+
+  if (href === "#") {
+    return;
+  }
+
+  e.preventDefault();
+  return href;
+};
diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts
index 53f0b74db2..cc6945be6d 100644
--- a/src/components/entity/ha-entity-picker.ts
+++ b/src/components/entity/ha-entity-picker.ts
@@ -139,6 +139,7 @@ class HaEntityPicker extends LitElement {
           ${this.value
             ? html`
                 <paper-icon-button
+                  aria-label="Clear"
                   slot="suffix"
                   class="clear-button"
                   icon="hass:close"
@@ -151,6 +152,7 @@ class HaEntityPicker extends LitElement {
           ${states.length > 0
             ? html`
                 <paper-icon-button
+                  aria-label="Show entities"
                   slot="suffix"
                   class="toggle-button"
                   .icon=${this._opened ? "hass:menu-up" : "hass:menu-down"}
@@ -199,3 +201,9 @@ class HaEntityPicker extends LitElement {
 }
 
 customElements.define("ha-entity-picker", HaEntityPicker);
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-entity-picker": HaEntityPicker;
+  }
+}
diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts
index 0d73d6fcd0..211331ae98 100644
--- a/src/components/entity/state-badge.ts
+++ b/src/components/entity/state-badge.ts
@@ -15,8 +15,10 @@ import { HassEntity } from "home-assistant-js-websocket";
 // Not duplicate, this is for typing.
 // tslint:disable-next-line
 import { HaIcon } from "../ha-icon";
+import { HomeAssistant } from "../../types";
 
 class StateBadge extends LitElement {
+  public hass?: HomeAssistant;
   @property() public stateObj?: HassEntity;
   @property() public overrideIcon?: string;
   @query("ha-icon") private _icon!: HaIcon;
@@ -54,8 +56,11 @@ class StateBadge extends LitElement {
     if (stateObj) {
       // hide icon if we have entity picture
       if (stateObj.attributes.entity_picture && !this.overrideIcon) {
-        hostStyle.backgroundImage =
-          "url(" + stateObj.attributes.entity_picture + ")";
+        let imageUrl = stateObj.attributes.entity_picture;
+        if (this.hass) {
+          imageUrl = this.hass.hassUrl(imageUrl);
+        }
+        hostStyle.backgroundImage = `url(${imageUrl})`;
         iconStyle.display = "none";
       } else {
         if (stateObj.attributes.hs_color) {
diff --git a/src/components/ha-climate-state.js b/src/components/ha-climate-state.js
index e000a27650..569014fcc8 100644
--- a/src/components/ha-climate-state.js
+++ b/src/components/ha-climate-state.js
@@ -2,6 +2,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
 import { PolymerElement } from "@polymer/polymer/polymer-element";
 
 import LocalizeMixin from "../mixins/localize-mixin";
+import { CLIMATE_PRESET_NONE } from "../data/climate";
 
 /*
  * @appliesMixin LocalizeMixin
@@ -40,7 +41,7 @@ class HaClimateState extends LocalizeMixin(PolymerElement) {
         <template is="dom-if" if="[[_hasKnownState(stateObj.state)]]">
           <span class="state-label">
             [[_localizeState(localize, stateObj)]]
-            <template is="dom-if" if="[[stateObj.attributes.preset_mode]]">
+            <template is="dom-if" if="[[_renderPreset(stateObj.attributes)]]">
               - [[_localizePreset(localize, stateObj.attributes.preset_mode)]]
             </template>
           </span>
@@ -130,5 +131,11 @@ class HaClimateState extends LocalizeMixin(PolymerElement) {
   _localizePreset(localize, preset) {
     return localize(`state_attributes.climate.preset_mode.${preset}`) || preset;
   }
+
+  _renderPreset(attributes) {
+    return (
+      attributes.preset_mode && attributes.preset_mode !== CLIMATE_PRESET_NONE
+    );
+  }
 }
 customElements.define("ha-climate-state", HaClimateState);
diff --git a/src/components/ha-cover-controls.js b/src/components/ha-cover-controls.js
index 2c35960fe5..76aa911755 100644
--- a/src/components/ha-cover-controls.js
+++ b/src/components/ha-cover-controls.js
@@ -18,17 +18,20 @@ class HaCoverControls extends PolymerElement {
 
       <div class="state">
         <paper-icon-button
+          aria-label="Open cover"
           icon="hass:arrow-up"
           on-click="onOpenTap"
           invisible$="[[!entityObj.supportsOpen]]"
           disabled="[[computeOpenDisabled(stateObj, entityObj)]]"
         ></paper-icon-button>
         <paper-icon-button
+          aria-label="Stop the cover from moving"
           icon="hass:stop"
           on-click="onStopTap"
           invisible$="[[!entityObj.supportsStop]]"
         ></paper-icon-button>
         <paper-icon-button
+          aria-label="Close cover"
           icon="hass:arrow-down"
           on-click="onCloseTap"
           invisible$="[[!entityObj.supportsClose]]"
diff --git a/src/components/ha-cover-tilt-controls.js b/src/components/ha-cover-tilt-controls.js
index 720d263872..1852973d2d 100644
--- a/src/components/ha-cover-tilt-controls.js
+++ b/src/components/ha-cover-tilt-controls.js
@@ -18,6 +18,7 @@ class HaCoverTiltControls extends PolymerElement {
         }
       </style>
       <paper-icon-button
+        aria-label="Open cover tilt"
         icon="hass:arrow-top-right"
         on-click="onOpenTiltTap"
         title="Open tilt"
@@ -25,12 +26,14 @@ class HaCoverTiltControls extends PolymerElement {
         disabled="[[computeOpenDisabled(stateObj, entityObj)]]"
       ></paper-icon-button>
       <paper-icon-button
+        aria-label="Stop cover from moving"
         icon="hass:stop"
         on-click="onStopTiltTap"
         invisible$="[[!entityObj.supportsStopTilt]]"
         title="Stop tilt"
       ></paper-icon-button>
       <paper-icon-button
+        aria-label="Close cover tilt"
         icon="hass:arrow-bottom-left"
         on-click="onCloseTiltTap"
         title="Close tilt"
diff --git a/src/components/ha-menu-button.ts b/src/components/ha-menu-button.ts
index 8a99bafea9..291e48eadb 100644
--- a/src/components/ha-menu-button.ts
+++ b/src/components/ha-menu-button.ts
@@ -44,7 +44,7 @@ class HaMenuButton extends LitElement {
 
   protected render(): TemplateResult | void {
     const hasNotifications =
-      this.narrow &&
+      (this.narrow || this.hass.dockedSidebar === "always_hidden") &&
       (this._hasNotifications ||
         Object.keys(this.hass.states).some(
           (entityId) => computeDomain(entityId) === "configurator"
@@ -131,9 +131,10 @@ class HaMenuButton extends LitElement {
         background-color: var(--accent-color);
         width: 12px;
         height: 12px;
-        top: 8px;
-        right: 5px;
+        top: 5px;
+        right: 2px;
         border-radius: 50%;
+        border: 2px solid var(--primary-color);
       }
     `;
   }
diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts
index b5466196f8..fb315ed235 100644
--- a/src/components/ha-sidebar.ts
+++ b/src/components/ha-sidebar.ts
@@ -597,7 +597,7 @@ class HaSidebar extends LitElement {
         box-sizing: border-box;
         border-radius: 50%;
         font-weight: 400;
-        background-color: var(--primary-color);
+        background-color: var(--accent-color);
         line-height: 20px;
         text-align: center;
         padding: 0px 6px;
diff --git a/src/data/camera.ts b/src/data/camera.ts
index ab40da3dd8..94c5853ee5 100644
--- a/src/data/camera.ts
+++ b/src/data/camera.ts
@@ -35,8 +35,13 @@ export const fetchThumbnailUrlWithCache = (
     entityId
   );
 
-export const fetchThumbnailUrl = (hass: HomeAssistant, entityId: string) =>
-  getSignedPath(hass, `/api/camera_proxy/${entityId}`).then(({ path }) => path);
+export const fetchThumbnailUrl = async (
+  hass: HomeAssistant,
+  entityId: string
+) => {
+  const path = await getSignedPath(hass, `/api/camera_proxy/${entityId}`);
+  return hass.hassUrl(path.path);
+};
 
 export const fetchThumbnail = (hass: HomeAssistant, entityId: string) => {
   // tslint:disable-next-line: no-console
@@ -47,7 +52,7 @@ export const fetchThumbnail = (hass: HomeAssistant, entityId: string) => {
   });
 };
 
-export const fetchStreamUrl = (
+export const fetchStreamUrl = async (
   hass: HomeAssistant,
   entityId: string,
   format?: "hls"
@@ -60,7 +65,9 @@ export const fetchStreamUrl = (
     // @ts-ignore
     data.format = format;
   }
-  return hass.callWS<Stream>(data);
+  const stream = await hass.callWS<Stream>(data);
+  stream.url = hass.hassUrl(stream.url);
+  return stream;
 };
 
 export const fetchCameraPrefs = (hass: HomeAssistant, entityId: string) =>
diff --git a/src/data/climate.ts b/src/data/climate.ts
index 7d063939f5..f61c98f8d0 100644
--- a/src/data/climate.ts
+++ b/src/data/climate.ts
@@ -12,6 +12,8 @@ export type HvacMode =
   | "dry"
   | "fan_only";
 
+export const CLIMATE_PRESET_NONE = "none";
+
 export type HvacAction = "off" | "heating" | "cooling" | "drying" | "idle";
 
 export type ClimateEntity = HassEntityBase & {
diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index 246dadb038..8b30d83ad1 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -1,5 +1,5 @@
 import { HomeAssistant } from "../types";
-import { Connection } from "home-assistant-js-websocket";
+import { Connection, getCollection } from "home-assistant-js-websocket";
 
 export interface LovelaceConfig {
   title?: string;
@@ -83,6 +83,17 @@ export const subscribeLovelaceUpdates = (
   onChange: () => void
 ) => conn.subscribeEvents(onChange, "lovelace_updated");
 
+export const getLovelaceCollection = (conn: Connection) =>
+  getCollection(
+    conn,
+    "_lovelace",
+    (conn2) => fetchConfig(conn2, false),
+    (_conn, store) =>
+      subscribeLovelaceUpdates(conn, () =>
+        fetchConfig(conn, false).then((config) => store.setState(config, true))
+      )
+  );
+
 export interface WindowWithLovelaceProm extends Window {
   llConfProm?: Promise<LovelaceConfig>;
 }
diff --git a/src/dialogs/more-info/more-info-controls.js b/src/dialogs/more-info/more-info-controls.js
index 0410fa6107..849a4a1452 100644
--- a/src/dialogs/more-info/more-info-controls.js
+++ b/src/dialogs/more-info/more-info-controls.js
@@ -68,8 +68,9 @@ class MoreInfoControls extends EventsMixin(PolymerElement) {
 
       <app-toolbar>
         <paper-icon-button
+          aria-label="Dismiss dialog"
           icon="hass:close"
-          dialog-dismiss=""
+          dialog-dismiss
         ></paper-icon-button>
         <div class="main-title" main-title="" on-click="enlarge">
           [[_computeStateName(stateObj)]]
diff --git a/src/fake_data/entity.ts b/src/fake_data/entity.ts
index 857222781e..a386355eb6 100644
--- a/src/fake_data/entity.ts
+++ b/src/fake_data/entity.ts
@@ -203,6 +203,25 @@ class CoverEntity extends Entity {
   }
 }
 
+class InputNumberEntity extends Entity {
+  public async handleService(
+    domain,
+    service,
+    // @ts-ignore
+    data
+  ) {
+    if (domain !== this.domain) {
+      return;
+    }
+
+    if (service === "set_value") {
+      this.update("" + data.value);
+    } else {
+      super.handleService(domain, service, data);
+    }
+  }
+}
+
 class ClimateEntity extends Entity {
   public async handleService(domain, service, data) {
     if (domain !== this.domain) {
@@ -256,6 +275,7 @@ const TYPES = {
   cover: CoverEntity,
   group: GroupEntity,
   input_boolean: ToggleEntity,
+  input_number: InputNumberEntity,
   light: LightEntity,
   lock: LockEntity,
   media_player: MediaPlayerEntity,
diff --git a/src/fake_data/provide_hass.ts b/src/fake_data/provide_hass.ts
index c14b03111d..7d27a5d1ca 100644
--- a/src/fake_data/provide_hass.ts
+++ b/src/fake_data/provide_hass.ts
@@ -90,7 +90,11 @@ export const provideHass = (
 
   const hassObj: MockHomeAssistant = {
     // Home Assistant properties
-    auth: {} as any,
+    auth: {
+      data: {
+        hassUrl: "",
+      },
+    } as any,
     connection: {
       addEventListener: () => undefined,
       removeEventListener: () => undefined,
@@ -182,6 +186,7 @@ export const provideHass = (
         ? response[1](hass(), method, path, parameters)
         : Promise.reject(`API Mock for ${path} is not implemented`);
     },
+    hassUrl: (path?) => path,
     fetchWithAuth: () => Promise.reject("Not implemented"),
     sendWS: (msg) => hassObj.connection.sendMessage(msg),
     callWS: (msg) => hassObj.connection.sendMessagePromise(msg),
diff --git a/src/html/_header.html.template b/src/html/_header.html.template
index 5a6868678f..95e1dc9c6b 100644
--- a/src/html/_header.html.template
+++ b/src/html/_header.html.template
@@ -1,15 +1,4 @@
 <meta charset="utf-8">
 <link rel='manifest' href='/manifest.json' crossorigin="use-credentials">
 <link rel='icon' href='/static/icons/favicon.ico'>
-<meta name='viewport' content='width=device-width, user-scalable=no'>
-<style>
-  body {
-    font-family: Roboto, sans-serif;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-    font-weight: 400;
-    margin: 0;
-    padding: 0;
-    height: 100vh;
-  }
-</style>
+<%= renderTemplate('_style_base') %>
diff --git a/src/html/_style_base.html.template b/src/html/_style_base.html.template
new file mode 100644
index 0000000000..1c9fd3851e
--- /dev/null
+++ b/src/html/_style_base.html.template
@@ -0,0 +1,12 @@
+<meta name='viewport' content='width=device-width, user-scalable=no'>
+<style>
+  body {
+    font-family: Roboto, sans-serif;
+    -moz-osx-font-smoothing: grayscale;
+    -webkit-font-smoothing: antialiased;
+    font-weight: 400;
+    margin: 0;
+    padding: 0;
+    height: 100vh;
+  }
+</style>
diff --git a/src/layouts/hass-subpage.ts b/src/layouts/hass-subpage.ts
index be0ec53370..2e0befb405 100644
--- a/src/layouts/hass-subpage.ts
+++ b/src/layouts/hass-subpage.ts
@@ -22,6 +22,7 @@ class HassSubpage extends LitElement {
     return html`
       <div class="toolbar">
         <ha-paper-icon-button-arrow-prev
+          aria-label="Back"
           .hassio=${this.hassio}
           @click=${this._backTapped}
         ></ha-paper-icon-button-arrow-prev>
diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts
index 894a90f107..09c762e675 100644
--- a/src/layouts/home-assistant.ts
+++ b/src/layouts/home-assistant.ts
@@ -1,9 +1,10 @@
 import "@polymer/app-route/app-location";
-import { html, LitElement, PropertyValues, css, property } from "lit-element";
+import { html, PropertyValues, property } from "lit-element";
 
 import "./home-assistant-main";
 import "./ha-init-page";
 import "../resources/ha-style";
+import "../resources/custom-card-support";
 import { registerServiceWorker } from "../util/register-service-worker";
 import { DEFAULT_PANEL } from "../common/const";
 
@@ -11,9 +12,6 @@ import { Route, HomeAssistant } from "../types";
 import { navigate } from "../common/navigate";
 import { HassElement } from "../state/hass-element";
 
-(LitElement.prototype as any).html = html;
-(LitElement.prototype as any).css = css;
-
 export class HomeAssistantAppEl extends HassElement {
   @property() private _route?: Route;
   @property() private _error?: boolean;
diff --git a/src/panels/config/core/ha-config-section-core.js b/src/panels/config/core/ha-config-section-core.js
index 74cb573073..8112846cdb 100644
--- a/src/panels/config/core/ha-config-section-core.js
+++ b/src/panels/config/core/ha-config-section-core.js
@@ -62,104 +62,6 @@ class HaConfigSectionCore extends LocalizeMixin(PolymerElement) {
 
         <ha-config-name-form hass="[[hass]]"></ha-config-name-form>
         <ha-config-core-form hass="[[hass]]"></ha-config-core-form>
-
-        <template is="dom-if" if="[[showAdvanced]]">
-          <ha-card
-            header="[[localize('ui.panel.config.core.section.core.validation.heading')]]"
-          >
-            <div class="card-content">
-              [[localize('ui.panel.config.core.section.core.validation.introduction')]]
-              <template is="dom-if" if="[[!validateLog]]">
-                <div class="validate-container">
-                  <template is="dom-if" if="[[!validating]]">
-                    <template is="dom-if" if="[[isValid]]">
-                      <div class="validate-result" id="result">
-                        [[localize('ui.panel.config.core.section.core.validation.valid')]]
-                      </div>
-                    </template>
-                    <mwc-button raised="" on-click="validateConfig">
-                      [[localize('ui.panel.config.core.section.core.validation.check_config')]]
-                    </mwc-button>
-                  </template>
-                  <template is="dom-if" if="[[validating]]">
-                    <paper-spinner active=""></paper-spinner>
-                  </template>
-                </div>
-              </template>
-              <template is="dom-if" if="[[validateLog]]">
-                <div class="config-invalid">
-                  <span class="text">
-                    [[localize('ui.panel.config.core.section.core.validation.invalid')]]
-                  </span>
-                  <mwc-button raised="" on-click="validateConfig">
-                    [[localize('ui.panel.config.core.section.core.validation.check_config')]]
-                  </mwc-button>
-                </div>
-                <div id="configLog" class="validate-log">[[validateLog]]</div>
-              </template>
-            </div>
-          </ha-card>
-
-          <ha-card
-            header="[[localize('ui.panel.config.core.section.core.reloading.heading')]]"
-          >
-            <div class="card-content">
-              [[localize('ui.panel.config.core.section.core.reloading.introduction')]]
-            </div>
-            <div class="card-actions">
-              <ha-call-service-button
-                hass="[[hass]]"
-                domain="homeassistant"
-                service="reload_core_config"
-                >[[localize('ui.panel.config.core.section.core.reloading.core')]]
-              </ha-call-service-button>
-              <ha-call-service-button
-                hass="[[hass]]"
-                domain="group"
-                service="reload"
-                hidden$="[[!groupLoaded(hass)]]"
-                >[[localize('ui.panel.config.core.section.core.reloading.group')]]
-              </ha-call-service-button>
-              <ha-call-service-button
-                hass="[[hass]]"
-                domain="automation"
-                service="reload"
-                hidden$="[[!automationLoaded(hass)]]"
-                >[[localize('ui.panel.config.core.section.core.reloading.automation')]]
-              </ha-call-service-button>
-              <ha-call-service-button
-                hass="[[hass]]"
-                domain="script"
-                service="reload"
-                hidden$="[[!scriptLoaded(hass)]]"
-                >[[localize('ui.panel.config.core.section.core.reloading.script')]]
-              </ha-call-service-button>
-            </div>
-          </ha-card>
-        </template>
-        <ha-card
-          header="[[localize('ui.panel.config.core.section.core.server_management.heading')]]"
-        >
-          <div class="card-content">
-            [[localize('ui.panel.config.core.section.core.server_management.introduction')]]
-          </div>
-          <div class="card-actions warning">
-            <ha-call-service-button
-              class="warning"
-              hass="[[hass]]"
-              domain="homeassistant"
-              service="restart"
-              >[[localize('ui.panel.config.core.section.core.server_management.restart')]]
-            </ha-call-service-button>
-            <ha-call-service-button
-              class="warning"
-              hass="[[hass]]"
-              domain="homeassistant"
-              service="stop"
-              >[[localize('ui.panel.config.core.section.core.server_management.stop')]]
-            </ha-call-service-button>
-          </div>
-        </ha-card>
       </ha-config-section>
     `;
   }
diff --git a/src/panels/config/dashboard/ha-config-navigation.ts b/src/panels/config/dashboard/ha-config-navigation.ts
index fe10e7c473..09fd1770dc 100644
--- a/src/panels/config/dashboard/ha-config-navigation.ts
+++ b/src/panels/config/dashboard/ha-config-navigation.ts
@@ -23,6 +23,7 @@ const PAGES: Array<{
   advanced?: boolean;
 }> = [
   { page: "core", core: true },
+  { page: "server_control", core: true },
   { page: "person" },
   { page: "entity_registry", core: true },
   { page: "area_registry", core: true },
diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts
index 9cd3d10155..1c249c39ea 100644
--- a/src/panels/config/ha-panel-config.ts
+++ b/src/panels/config/ha-panel-config.ts
@@ -48,6 +48,11 @@ class HaPanelConfig extends HassRouterPage {
         load: () =>
           import(/* webpackChunkName: "panel-config-core" */ "./core/ha-config-core"),
       },
+      server_control: {
+        tag: "ha-config-server-control",
+        load: () =>
+          import(/* webpackChunkName: "panel-config-server-control" */ "./server_control/ha-config-server-control"),
+      },
       customize: {
         tag: "ha-config-customize",
         load: () =>
diff --git a/src/panels/config/server_control/ha-config-section-server-control.js b/src/panels/config/server_control/ha-config-section-server-control.js
new file mode 100644
index 0000000000..20d130498f
--- /dev/null
+++ b/src/panels/config/server_control/ha-config-section-server-control.js
@@ -0,0 +1,222 @@
+import "@material/mwc-button";
+import "@polymer/paper-input/paper-input";
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+import { PolymerElement } from "@polymer/polymer/polymer-element";
+
+import "../../../components/ha-card";
+import "../../../components/buttons/ha-call-service-button";
+import "../../../resources/ha-style";
+
+import "../ha-config-section";
+
+import isComponentLoaded from "../../../common/config/is_component_loaded";
+import LocalizeMixin from "../../../mixins/localize-mixin";
+
+/*
+ * @appliesMixin LocalizeMixin
+ */
+class HaConfigSectionServerControl extends LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+      <style include="iron-flex ha-style">
+        .validate-container {
+          @apply --layout-vertical;
+          @apply --layout-center-center;
+          height: 140px;
+        }
+
+        .validate-result {
+          color: var(--google-green-500);
+          font-weight: 500;
+          margin-bottom: 1em;
+        }
+
+        .config-invalid {
+          margin: 1em 0;
+        }
+
+        .config-invalid .text {
+          color: var(--google-red-500);
+          font-weight: 500;
+        }
+
+        .config-invalid mwc-button {
+          float: right;
+        }
+
+        .validate-log {
+          white-space: pre-wrap;
+          direction: ltr;
+        }
+      </style>
+      <ha-config-section is-wide="[[isWide]]">
+        <span slot="header"
+          >[[localize('ui.panel.config.server_control.caption')]]</span
+        >
+        <span slot="introduction"
+          >[[localize('ui.panel.config.server_control.description')]]</span
+        >
+
+        <template is="dom-if" if="[[showAdvanced]]">
+          <ha-card
+            header="[[localize('ui.panel.config.server_control.section.validation.heading')]]"
+          >
+            <div class="card-content">
+              [[localize('ui.panel.config.server_control.section.validation.introduction')]]
+              <template is="dom-if" if="[[!validateLog]]">
+                <div class="validate-container">
+                  <template is="dom-if" if="[[!validating]]">
+                    <template is="dom-if" if="[[isValid]]">
+                      <div class="validate-result" id="result">
+                        [[localize('ui.panel.config.server_control.section.validation.valid')]]
+                      </div>
+                    </template>
+                    <mwc-button raised="" on-click="validateConfig">
+                      [[localize('ui.panel.config.server_control.section.validation.check_config')]]
+                    </mwc-button>
+                  </template>
+                  <template is="dom-if" if="[[validating]]">
+                    <paper-spinner active=""></paper-spinner>
+                  </template>
+                </div>
+              </template>
+              <template is="dom-if" if="[[validateLog]]">
+                <div class="config-invalid">
+                  <span class="text">
+                    [[localize('ui.panel.config.server_control.section.validation.invalid')]]
+                  </span>
+                  <mwc-button raised="" on-click="validateConfig">
+                    [[localize('ui.panel.config.server_control.section.validation.check_config')]]
+                  </mwc-button>
+                </div>
+                <div id="configLog" class="validate-log">[[validateLog]]</div>
+              </template>
+            </div>
+          </ha-card>
+
+          <ha-card
+            header="[[localize('ui.panel.config.server_control.section.reloading.heading')]]"
+          >
+            <div class="card-content">
+              [[localize('ui.panel.config.server_control.section.reloading.introduction')]]
+            </div>
+            <div class="card-actions">
+              <ha-call-service-button
+                hass="[[hass]]"
+                domain="homeassistant"
+                service="reload_core_config"
+                >[[localize('ui.panel.config.server_control.section.reloading.core')]]
+              </ha-call-service-button>
+              <ha-call-service-button
+                hass="[[hass]]"
+                domain="group"
+                service="reload"
+                hidden$="[[!groupLoaded(hass)]]"
+                >[[localize('ui.panel.config.server_control.section.reloading.group')]]
+              </ha-call-service-button>
+              <ha-call-service-button
+                hass="[[hass]]"
+                domain="automation"
+                service="reload"
+                hidden$="[[!automationLoaded(hass)]]"
+                >[[localize('ui.panel.config.server_control.section.reloading.automation')]]
+              </ha-call-service-button>
+              <ha-call-service-button
+                hass="[[hass]]"
+                domain="script"
+                service="reload"
+                hidden$="[[!scriptLoaded(hass)]]"
+                >[[localize('ui.panel.config.server_control.section.reloading.script')]]
+              </ha-call-service-button>
+            </div>
+          </ha-card>
+        </template>
+        <ha-card
+          header="[[localize('ui.panel.config.server_control.section.server_management.heading')]]"
+        >
+          <div class="card-content">
+            [[localize('ui.panel.config.server_control.section.server_management.introduction')]]
+          </div>
+          <div class="card-actions warning">
+            <ha-call-service-button
+              class="warning"
+              hass="[[hass]]"
+              domain="homeassistant"
+              service="restart"
+              >[[localize('ui.panel.config.server_control.section.server_management.restart')]]
+            </ha-call-service-button>
+            <ha-call-service-button
+              class="warning"
+              hass="[[hass]]"
+              domain="homeassistant"
+              service="stop"
+              >[[localize('ui.panel.config.server_control.section.server_management.stop')]]
+            </ha-call-service-button>
+          </div>
+        </ha-card>
+      </ha-config-section>
+    `;
+  }
+
+  static get properties() {
+    return {
+      hass: {
+        type: Object,
+      },
+
+      isWide: {
+        type: Boolean,
+        value: false,
+      },
+
+      validating: {
+        type: Boolean,
+        value: false,
+      },
+
+      isValid: {
+        type: Boolean,
+        value: null,
+      },
+
+      validateLog: {
+        type: String,
+        value: "",
+      },
+
+      showAdvanced: Boolean,
+    };
+  }
+
+  groupLoaded(hass) {
+    return isComponentLoaded(hass, "group");
+  }
+
+  automationLoaded(hass) {
+    return isComponentLoaded(hass, "automation");
+  }
+
+  scriptLoaded(hass) {
+    return isComponentLoaded(hass, "script");
+  }
+
+  validateConfig() {
+    this.validating = true;
+    this.validateLog = "";
+    this.isValid = null;
+
+    this.hass.callApi("POST", "config/core/check_config").then((result) => {
+      this.validating = false;
+      this.isValid = result.result === "valid";
+
+      if (!this.isValid) {
+        this.validateLog = result.errors;
+      }
+    });
+  }
+}
+
+customElements.define(
+  "ha-config-section-server-control",
+  HaConfigSectionServerControl
+);
diff --git a/src/panels/config/server_control/ha-config-server-control.js b/src/panels/config/server_control/ha-config-server-control.js
new file mode 100644
index 0000000000..cebf5243bd
--- /dev/null
+++ b/src/panels/config/server_control/ha-config-server-control.js
@@ -0,0 +1,63 @@
+import "@polymer/app-layout/app-header/app-header";
+import "@polymer/app-layout/app-toolbar/app-toolbar";
+import "@polymer/paper-icon-button/paper-icon-button";
+import { html } from "@polymer/polymer/lib/utils/html-tag";
+import { PolymerElement } from "@polymer/polymer/polymer-element";
+
+import "../../../layouts/hass-subpage";
+import "../../../resources/ha-style";
+
+import "./ha-config-section-server-control";
+
+import LocalizeMixin from "../../../mixins/localize-mixin";
+
+/*
+ * @appliesMixin LocalizeMixin
+ */
+class HaConfigServerControl extends LocalizeMixin(PolymerElement) {
+  static get template() {
+    return html`
+      <style include="iron-flex ha-style">
+        .content {
+          padding-bottom: 32px;
+        }
+
+        .border {
+          margin: 32px auto 0;
+          border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+          max-width: 1040px;
+        }
+
+        .narrow .border {
+          max-width: 640px;
+        }
+      </style>
+
+      <hass-subpage
+        header="[[localize('ui.panel.config.server_control.caption')]]"
+      >
+        <div class$="[[computeClasses(isWide)]]">
+          <ha-config-section-server-control
+            is-wide="[[isWide]]"
+            show-advanced="[[showAdvanced]]"
+            hass="[[hass]]"
+          ></ha-config-section-server-control>
+        </div>
+      </hass-subpage>
+    `;
+  }
+
+  static get properties() {
+    return {
+      hass: Object,
+      isWide: Boolean,
+      showAdvanced: Boolean,
+    };
+  }
+
+  computeClasses(isWide) {
+    return isWide ? "content" : "content narrow";
+  }
+}
+
+customElements.define("ha-config-server-control", HaConfigServerControl);
diff --git a/src/panels/config/zha/zha-device-card.ts b/src/panels/config/zha/zha-device-card.ts
index 19d0e94b77..b34a720bff 100644
--- a/src/panels/config/zha/zha-device-card.ts
+++ b/src/panels/config/zha/zha-device-card.ts
@@ -30,13 +30,18 @@ import {
   DeviceRegistryEntryMutableParams,
   updateDeviceRegistryEntry,
 } from "../../../data/device_registry";
-import { reconfigureNode, ZHADevice } from "../../../data/zha";
+import {
+  reconfigureNode,
+  ZHADevice,
+  ZHAEntityReference,
+} from "../../../data/zha";
 import { haStyle } from "../../../resources/styles";
 import { HomeAssistant } from "../../../types";
 import { ItemSelectedEvent, NodeServiceData } from "./types";
 import { navigate } from "../../../common/navigate";
-import { UnsubscribeFunc } from "home-assistant-js-websocket";
+import { UnsubscribeFunc, HassEvent } from "home-assistant-js-websocket";
 import { formatAsPaddedHex } from "./functions";
+import computeStateName from "../../../common/entity/compute_state_name";
 
 declare global {
   // for fire event
@@ -60,12 +65,34 @@ class ZHADeviceCard extends LitElement {
   @property() private _selectedAreaIndex: number = -1;
   @property() private _userGivenName?: string;
   private _unsubAreas?: UnsubscribeFunc;
+  private _unsubEntities?: UnsubscribeFunc;
 
   public disconnectedCallback() {
     super.disconnectedCallback();
     if (this._unsubAreas) {
       this._unsubAreas();
     }
+    if (this._unsubEntities) {
+      this._unsubEntities();
+    }
+  }
+
+  public connectedCallback() {
+    super.connectedCallback();
+    this._unsubAreas = subscribeAreaRegistry(this.hass.connection, (areas) => {
+      this._areas = areas;
+    });
+    this.hass.connection
+      .subscribeEvents((event: HassEvent) => {
+        if (this.device) {
+          this.device!.entities.forEach((deviceEntity) => {
+            if (event.data.old_entity_id === deviceEntity.entity_id) {
+              deviceEntity.entity_id = event.data.entity_id;
+            }
+          });
+        }
+      }, "entity_registry_updated")
+      .then((unsub) => (this._unsubEntities = unsub));
   }
 
   protected firstUpdated(changedProperties: PropertyValues): void {
@@ -90,14 +117,6 @@ class ZHADeviceCard extends LitElement {
       }
       this._userGivenName = this.device!.user_given_name;
     }
-    if (!this._unsubAreas) {
-      this._unsubAreas = subscribeAreaRegistry(
-        this.hass.connection,
-        (areas) => {
-          this._areas = areas;
-        }
-      );
-    }
     super.update(changedProperties);
   }
 
@@ -168,7 +187,9 @@ class ZHADeviceCard extends LitElement {
                 ${!this.isJoinPage
                   ? html`
                       <paper-item-body>
-                        <div class="name">${entity.name}</div>
+                        <div class="name">
+                          ${this._computeEntityName(entity)}
+                        </div>
                         <div class="secondary entity-id">
                           ${entity.entity_id}
                         </div>
@@ -280,6 +301,13 @@ class ZHADeviceCard extends LitElement {
     }
   }
 
+  private _computeEntityName(entity: ZHAEntityReference): string {
+    if (this.hass.states[entity.entity_id]) {
+      return computeStateName(this.hass.states[entity.entity_id]);
+    }
+    return entity.name;
+  }
+
   private async _saveCustomName(event): Promise<void> {
     if (this.hass) {
       const values: DeviceRegistryEntryMutableParams = {
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index f62730ffaa..69dd4a3199 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -198,8 +198,9 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
         ${this._config!.show_icon !== false
           ? html`
               <state-badge
-                .stateObj="${stateObj}"
-                .overrideIcon="${entityConf.icon}"
+                .hass=${this.hass}
+                .stateObj=${stateObj}
+                .overrideIcon=${entityConf.icon}
               ></state-badge>
             `
           : ""}
diff --git a/src/panels/lovelace/cards/hui-history-graph-card.js b/src/panels/lovelace/cards/hui-history-graph-card.js
index 737eaa8891..453ffe22ab 100644
--- a/src/panels/lovelace/cards/hui-history-graph-card.js
+++ b/src/panels/lovelace/cards/hui-history-graph-card.js
@@ -75,7 +75,7 @@ class HuiHistoryGraphCard extends PolymerElement {
 
     this.setProperties({
       _cacheConfig: {
-        cacheKey: _entities.sort().join(),
+        cacheKey: _entities.join(),
         hoursToShow: config.hours_to_show || 24,
         refresh: config.refresh_interval || 0,
       },
diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts
index e3de8190b8..21541f48c8 100644
--- a/src/panels/lovelace/cards/hui-map-card.ts
+++ b/src/panels/lovelace/cards/hui-map-card.ts
@@ -148,6 +148,27 @@ class HuiMapCard extends LitElement implements LovelaceCard {
     `;
   }
 
+  protected shouldUpdate(changedProps) {
+    if (!changedProps.has("hass") || changedProps.size > 1) {
+      return true;
+    }
+
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
+
+    if (!oldHass || !this._configEntities) {
+      return true;
+    }
+
+    // Check if any state has changed
+    for (const entity of this._configEntities) {
+      if (oldHass.states[entity.entity] !== this.hass!.states[entity.entity]) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   protected firstUpdated(changedProps: PropertyValues): void {
     super.firstUpdated(changedProps);
     this.loadMap();
diff --git a/src/panels/lovelace/cards/hui-markdown-card.ts b/src/panels/lovelace/cards/hui-markdown-card.ts
index 35a92d9231..b41bd5455e 100644
--- a/src/panels/lovelace/cards/hui-markdown-card.ts
+++ b/src/panels/lovelace/cards/hui-markdown-card.ts
@@ -29,7 +29,9 @@ export class HuiMarkdownCard extends LitElement implements LovelaceCard {
   @property() private _config?: MarkdownCardConfig;
 
   public getCardSize(): number {
-    return this._config!.content.split("\n").length;
+    return (
+      this._config!.content.split("\n").length + (this._config!.title ? 1 : 0)
+    );
   }
 
   public setConfig(config: MarkdownCardConfig): void {
@@ -59,15 +61,6 @@ export class HuiMarkdownCard extends LitElement implements LovelaceCard {
 
   static get styles(): CSSResult {
     return css`
-      :host {
-        /* start paper-font-body1 style */
-        font-family: "Roboto", "Noto", sans-serif;
-        -webkit-font-smoothing: antialiased; /* OS X subpixel AA bleed bug */
-        font-size: 14px;
-        font-weight: 400;
-        line-height: 20px;
-        /* end paper-font-body1 style */
-      }
       ha-markdown {
         display: block;
         padding: 0 16px 16px;
diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts
index 4d6c4fda48..df98aba342 100644
--- a/src/panels/lovelace/cards/hui-picture-card.ts
+++ b/src/panels/lovelace/cards/hui-picture-card.ts
@@ -64,7 +64,7 @@ export class HuiPictureCard extends LitElement implements LovelaceCard {
           ),
         })}"
       >
-        <img src="${this._config.image}" />
+        <img src="${this.hass.hassUrl(this._config.image)}" />
       </ha-card>
     `;
   }
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index 650cff2ee7..73b1d853f0 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -27,6 +27,7 @@ import {
   ClimateEntity,
   HvacMode,
   compareClimateHvacModes,
+  CLIMATE_PRESET_NONE,
 } from "../../../data/climate";
 
 const thermostatConfig = {
@@ -155,7 +156,8 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
                       }`
                     )
                   : this.hass!.localize(`state.climate.${stateObj.state}`)}
-                ${stateObj.attributes.preset_mode
+                ${stateObj.attributes.preset_mode &&
+                stateObj.attributes.preset_mode !== CLIMATE_PRESET_NONE
                   ? html`
                       -
                       ${this.hass!.localize(
@@ -490,7 +492,8 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
         }
         #thermostat .rs-handle {
           background-color: var(--paper-card-background-color, white);
-          padding: 7px;
+          padding: 10px;
+          margin: -10px 0 0 -8px !important;
           border: 2px solid var(--disabled-text-color);
         }
         #thermostat .rs-handle.rs-focus {
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts
index 06bd48569a..1ad9f31c53 100644
--- a/src/panels/lovelace/cards/types.ts
+++ b/src/panels/lovelace/cards/types.ts
@@ -30,6 +30,7 @@ export interface EntitiesCardEntityConfig extends EntityConfig {
 }
 
 export interface EntitiesCardConfig extends LovelaceCardConfig {
+  type: "entities";
   show_header_toggle?: boolean;
   title?: string;
   entities: EntitiesCardEntityConfig[];
@@ -104,6 +105,7 @@ export interface LightCardConfig extends LovelaceCardConfig {
 }
 
 export interface MapCardConfig extends LovelaceCardConfig {
+  type: "map";
   title: string;
   aspect_ratio: string;
   default_zoom?: number;
@@ -113,6 +115,7 @@ export interface MapCardConfig extends LovelaceCardConfig {
 }
 
 export interface MarkdownCardConfig extends LovelaceCardConfig {
+  type: "markdown";
   content: string;
   title?: string;
 }
diff --git a/src/panels/lovelace/common/create-row-element.ts b/src/panels/lovelace/common/create-row-element.ts
index 7269247bb6..f4ee67a922 100644
--- a/src/panels/lovelace/common/create-row-element.ts
+++ b/src/panels/lovelace/common/create-row-element.ts
@@ -129,6 +129,10 @@ export const createRowElement = (
     return element;
   }
 
+  if (!config.entity) {
+    return _createErrorElement("Invalid config given.", config);
+  }
+
   const domain = config.entity.split(".", 1)[0];
   tag = `hui-${DOMAIN_TO_ELEMENT_TYPE[domain] || "text"}-entity-row`;
 
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index bd8b91821c..fbd053bae8 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -4,7 +4,11 @@ import {
   LovelaceCardConfig,
   LovelaceViewConfig,
 } from "../../../data/lovelace";
-import { HassEntity, HassEntities } from "home-assistant-js-websocket";
+import {
+  HassEntity,
+  HassEntities,
+  HassConfig,
+} from "home-assistant-js-websocket";
 
 import extractViews from "../../../common/entity/extract_views";
 import getViewEntities from "../../../common/entity/get_view_entities";
@@ -47,12 +51,6 @@ const HIDE_DOMAIN = new Set([
   "geo_location",
 ]);
 
-interface Registries {
-  areas: AreaRegistryEntry[];
-  devices: DeviceRegistryEntry[];
-  entities: EntityRegistryEntry[];
-}
-
 let subscribedRegistries = false;
 
 interface SplittedByAreas {
@@ -61,20 +59,22 @@ interface SplittedByAreas {
 }
 
 const splitByAreas = (
-  registries: Registries,
+  areaEntries: AreaRegistryEntry[],
+  deviceEntries: DeviceRegistryEntry[],
+  entityEntries: EntityRegistryEntry[],
   entities: HassEntities
 ): SplittedByAreas => {
   const allEntities = { ...entities };
   const areasWithEntities: SplittedByAreas["areasWithEntities"] = [];
 
-  for (const area of registries.areas) {
+  for (const area of areaEntries) {
     const areaEntities: HassEntity[] = [];
     const areaDevices = new Set(
-      registries.devices
+      deviceEntries
         .filter((device) => device.area_id === area.area_id)
         .map((device) => device.id)
     );
-    for (const entity of registries.entities) {
+    for (const entity of entityEntries) {
       if (
         areaDevices.has(
           // @ts-ignore
@@ -172,25 +172,28 @@ const computeCards = (
   return cards;
 };
 
-const computeDefaultViewStates = (hass: HomeAssistant): HassEntities => {
+const computeDefaultViewStates = (entities: HassEntities): HassEntities => {
   const states = {};
-  Object.keys(hass.states).forEach((entityId) => {
-    const stateObj = hass.states[entityId];
+  Object.keys(entities).forEach((entityId) => {
+    const stateObj = entities[entityId];
     if (
       !stateObj.attributes.hidden &&
       !HIDE_DOMAIN.has(computeStateDomain(stateObj))
     ) {
-      states[entityId] = hass.states[entityId];
+      states[entityId] = entities[entityId];
     }
   });
   return states;
 };
 
-const generateDefaultViewConfig = (
-  hass: HomeAssistant,
-  registries: Registries
+export const generateDefaultViewConfig = (
+  areaEntries: AreaRegistryEntry[],
+  deviceEntries: DeviceRegistryEntry[],
+  entityEntries: EntityRegistryEntry[],
+  entities: HassEntities,
+  localize: LocalizeFunc
 ): LovelaceViewConfig => {
-  const states = computeDefaultViewStates(hass);
+  const states = computeDefaultViewStates(entities);
   const path = "default_view";
   const title = "Home";
   const icon = undefined;
@@ -204,10 +207,15 @@ const generateDefaultViewConfig = (
     }
   });
 
-  const splittedByAreas = splitByAreas(registries, states);
+  const splittedByAreas = splitByAreas(
+    areaEntries,
+    deviceEntries,
+    entityEntries,
+    states
+  );
 
   const config = generateViewConfig(
-    hass.localize,
+    localize,
     path,
     title,
     icon,
@@ -217,12 +225,15 @@ const generateDefaultViewConfig = (
 
   const areaCards: LovelaceCardConfig[] = [];
 
-  splittedByAreas.areasWithEntities.forEach(([area, entities]) => {
+  splittedByAreas.areasWithEntities.forEach(([area, areaEntities]) => {
     areaCards.push(
-      ...computeCards(entities.map((entity) => [entity.entity_id, entity]), {
-        title: area.name,
-        show_header_toggle: true,
-      })
+      ...computeCards(
+        areaEntities.map((entity) => [entity.entity_id, entity]),
+        {
+          title: area.name,
+          show_header_toggle: true,
+        }
+      )
     );
   });
 
@@ -315,14 +326,44 @@ const generateViewConfig = (
   return view;
 };
 
-export const generateLovelaceConfig = async (
-  hass: HomeAssistant,
+export const generateLovelaceConfigFromHass = async (hass: HomeAssistant) => {
+  // 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.config,
+    areaEntries,
+    deviceEntries,
+    entityEntries,
+    hass.states,
+    hass.localize
+  );
+};
+
+export const generateLovelaceConfigFromData = async (
+  config: HassConfig,
+  areaEntries: AreaRegistryEntry[],
+  deviceEntries: DeviceRegistryEntry[],
+  entityEntries: EntityRegistryEntry[],
+  entities: HassEntities,
   localize: LocalizeFunc
 ): Promise<LovelaceConfig> => {
-  const viewEntities = extractViews(hass.states);
+  const viewEntities = extractViews(entities);
 
   const views = viewEntities.map((viewEntity: GroupEntity) => {
-    const states = getViewEntities(hass.states, viewEntity);
+    const states = getViewEntities(entities, viewEntity);
 
     // In the case of a normal view, we use group order as specified in view
     const groupOrders = {};
@@ -340,7 +381,7 @@ export const generateLovelaceConfig = async (
     );
   });
 
-  let title = hass.config.location_name;
+  let title = config.location_name;
 
   // User can override default view. If they didn't, we will add one
   // that contains all entities.
@@ -348,26 +389,18 @@ export const generateLovelaceConfig = async (
     viewEntities.length === 0 ||
     viewEntities[0].entity_id !== DEFAULT_VIEW_ENTITY_ID
   ) {
-    // 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 [areas, devices, entities] = await Promise.all([
-      subscribeOne(hass.connection, subscribeAreaRegistry),
-      subscribeOne(hass.connection, subscribeDeviceRegistry),
-      subscribeOne(hass.connection, subscribeEntityRegistry),
-    ]);
-    const registries = { areas, devices, entities };
-
-    views.unshift(generateDefaultViewConfig(hass, registries));
+    views.unshift(
+      generateDefaultViewConfig(
+        areaEntries,
+        deviceEntries,
+        entityEntries,
+        entities,
+        localize
+      )
+    );
 
     // Add map of geo locations to default view if loaded
-    if (hass.config.components.includes("geo_location")) {
+    if (config.components.includes("geo_location")) {
       if (views[0] && views[0].cards) {
         views[0].cards.push({
           type: "map",
@@ -382,12 +415,6 @@ export const generateLovelaceConfig = async (
     }
   }
 
-  if (__DEMO__) {
-    views[0].cards!.unshift({
-      type: "custom:ha-demo-card",
-    });
-  }
-
   // User has no entities
   if (views.length === 1 && views[0].cards!.length === 0) {
     import(/* webpackChunkName: "hui-empty-state-card" */ "../cards/hui-empty-state-card");
diff --git a/src/panels/lovelace/common/load-resources.ts b/src/panels/lovelace/common/load-resources.ts
new file mode 100644
index 0000000000..c318a2dff2
--- /dev/null
+++ b/src/panels/lovelace/common/load-resources.ts
@@ -0,0 +1,44 @@
+import { loadModule, loadCSS, loadJS } from "../../../common/dom/load_resource";
+
+import { LovelaceConfig } from "../../../data/lovelace";
+
+// CSS and JS should only be imported once. Modules and HTML are safe.
+const CSS_CACHE = {};
+const JS_CACHE = {};
+
+export const loadLovelaceResources = (
+  resources: NonNullable<LovelaceConfig["resources"]>,
+  hassUrl: string
+) =>
+  resources.forEach((resource) => {
+    const normalizedUrl = new URL(resource.url, hassUrl).toString();
+    switch (resource.type) {
+      case "css":
+        if (normalizedUrl in CSS_CACHE) {
+          break;
+        }
+        CSS_CACHE[normalizedUrl] = loadCSS(normalizedUrl);
+        break;
+
+      case "js":
+        if (normalizedUrl in JS_CACHE) {
+          break;
+        }
+        JS_CACHE[normalizedUrl] = loadJS(normalizedUrl);
+        break;
+
+      case "module":
+        loadModule(normalizedUrl);
+        break;
+
+      case "html":
+        import(/* webpackChunkName: "import-href-polyfill" */ "../../../resources/html-import/import-href").then(
+          ({ importHref }) => importHref(normalizedUrl)
+        );
+        break;
+
+      default:
+        // tslint:disable-next-line
+        console.warn(`Unknown resource type specified: ${resource.type}`);
+    }
+  });
diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts
index 515eafdd6b..fa37f98076 100644
--- a/src/panels/lovelace/components/hui-generic-entity-row.ts
+++ b/src/panels/lovelace/components/hui-generic-entity-row.ts
@@ -47,8 +47,9 @@ class HuiGenericEntityRow extends LitElement {
 
     return html`
       <state-badge
-        .stateObj="${stateObj}"
-        .overrideIcon="${this.config.icon}"
+        .hass=${this.hass}
+        .stateObj=${stateObj}
+        .overrideIcon=${this.config.icon}
       ></state-badge>
       <div class="flex">
         <div class="info">
@@ -63,8 +64,8 @@ class HuiGenericEntityRow extends LitElement {
               : this.config.secondary_info === "last-changed"
               ? html`
                   <ha-relative-time
-                    .hass="${this.hass}"
-                    .datetime="${stateObj.last_changed}"
+                    .hass=${this.hass}
+                    .datetime=${stateObj.last_changed}
                   ></ha-relative-time>
                 `
               : ""}
diff --git a/src/panels/lovelace/components/hui-image.ts b/src/panels/lovelace/components/hui-image.ts
index 870ff7b51c..35be160e27 100644
--- a/src/panels/lovelace/components/hui-image.ts
+++ b/src/panels/lovelace/components/hui-image.ts
@@ -104,6 +104,10 @@ export class HuiImage extends LitElement {
       imageSrc = this.image;
     }
 
+    if (imageSrc) {
+      imageSrc = this.hass!.hassUrl(imageSrc);
+    }
+
     // Figure out filter to use
     let filter = this.filter || "";
 
diff --git a/src/panels/lovelace/entity-rows/types.ts b/src/panels/lovelace/entity-rows/types.ts
index 48e9363a14..35b733e330 100644
--- a/src/panels/lovelace/entity-rows/types.ts
+++ b/src/panels/lovelace/entity-rows/types.ts
@@ -7,20 +7,21 @@ export interface EntityConfig {
   icon?: string;
 }
 export interface DividerConfig {
-  type: string;
+  type: "divider";
   style: string;
 }
 export interface SectionConfig {
-  type: string;
+  type: "section";
   label: string;
 }
 export interface WeblinkConfig {
-  type: string;
+  type: "weblink";
   name?: string;
   icon?: string;
   url: string;
 }
 export interface CallServiceConfig extends EntityConfig {
+  type: "call-service";
   action_name?: string;
   service: string;
   service_data?: { [key: string]: any };
diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts
index bdb5da8399..0a22d634fd 100644
--- a/src/panels/lovelace/ha-panel-lovelace.ts
+++ b/src/panels/lovelace/ha-panel-lovelace.ts
@@ -20,7 +20,7 @@ import {
   property,
 } from "lit-element";
 import { showSaveDialog } from "./editor/show-save-config-dialog";
-import { generateLovelaceConfig } from "./common/generate-lovelace-config";
+import { generateLovelaceConfigFromHass } from "./common/generate-lovelace-config";
 import { showToast } from "../../util/toast";
 
 interface LovelacePanelConfig {
@@ -49,7 +49,8 @@ class LovelacePanel extends LitElement {
 
   private mqls?: MediaQueryList[];
 
-  private _saving: boolean = false;
+  private _ignoreNextUpdateEventBecauseOfSave = false;
+  private _ignoreUpdateUntilTime: number | undefined;
 
   constructor() {
     super();
@@ -161,7 +162,7 @@ class LovelacePanel extends LitElement {
   }
 
   private async _regenerateConfig() {
-    const conf = await generateLovelaceConfig(this.hass!, this.hass!.localize);
+    const conf = await generateLovelaceConfigFromHass(this.hass!);
     this._setLovelaceConfig(conf, "generated");
     this._state = "loaded";
   }
@@ -184,19 +185,25 @@ class LovelacePanel extends LitElement {
   }
 
   private _lovelaceChanged() {
-    if (this._saving) {
-      this._saving = false;
-    } else {
-      showToast(this, {
-        message: this.hass!.localize("ui.panel.lovelace.changed_toast.message"),
-        action: {
-          action: () => this._fetchConfig(false),
-          text: this.hass!.localize("ui.panel.lovelace.changed_toast.refresh"),
-        },
-        duration: 0,
-        dismissable: false,
-      });
+    if (
+      this._ignoreUpdateUntilTime &&
+      new Date().getTime() < this._ignoreUpdateUntilTime
+    ) {
+      return;
     }
+    if (this._ignoreNextUpdateEventBecauseOfSave) {
+      this._ignoreNextUpdateEventBecauseOfSave = false;
+      return;
+    }
+    showToast(this, {
+      message: this.hass!.localize("ui.panel.lovelace.changed_toast.message"),
+      action: {
+        action: () => this._fetchConfig(false),
+        text: this.hass!.localize("ui.panel.lovelace.changed_toast.refresh"),
+      },
+      duration: 0,
+      dismissable: false,
+    });
   }
 
   private _forceFetchConfig() {
@@ -214,6 +221,13 @@ class LovelacePanel extends LitElement {
       confProm = llWindow.llConfProm;
       llWindow.llConfProm = undefined;
     } else {
+      // Refreshing a YAML config can trigger an update event. We will ignore
+      // all update events for a second after we refresh, as we already have
+      // the latest config in that case.
+      if (this.lovelace && this.lovelace.mode === "yaml") {
+        this._ignoreUpdateUntilTime = new Date().getTime() + 1000;
+      }
+
       confProm = fetchConfig(this.hass!.connection, forceDiskRefresh);
     }
 
@@ -227,7 +241,7 @@ class LovelacePanel extends LitElement {
         this._errorMsg = err.message;
         return;
       }
-      conf = await generateLovelaceConfig(this.hass!, this.hass!.localize);
+      conf = await generateLovelaceConfigFromHass(this.hass!);
       confMode = "generated";
     }
 
@@ -265,7 +279,7 @@ class LovelacePanel extends LitElement {
             config: newConfig,
             mode: "storage",
           });
-          this._saving = true;
+          this._ignoreNextUpdateEventBecauseOfSave = true;
           await saveConfig(this.hass!, newConfig);
         } catch (err) {
           // tslint:disable-next-line
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 9c959ade8f..cba56cb59b 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -28,7 +28,6 @@ import "../../components/ha-start-voice-button";
 import "../../components/ha-paper-icon-button-arrow-next";
 import "../../components/ha-paper-icon-button-arrow-prev";
 import "../../components/ha-icon";
-import { loadModule, loadCSS, loadJS } from "../../common/dom/load_resource";
 import { debounce } from "../../common/util/debounce";
 import { HomeAssistant } from "../../types";
 import { LovelaceConfig } from "../../data/lovelace";
@@ -47,10 +46,7 @@ import { Lovelace } from "./types";
 import { afterNextRender } from "../../common/util/render-status";
 import { haStyle } from "../../resources/styles";
 import { computeRTLDirection } from "../../common/util/compute_rtl";
-
-// CSS and JS should only be imported once. Modules and HTML are safe.
-const CSS_CACHE = {};
-const JS_CACHE = {};
+import { loadLovelaceResources } from "./common/load-resources";
 
 class HUIRoot extends LitElement {
   @property() public hass?: HomeAssistant;
@@ -154,28 +150,46 @@ class HUIRoot extends LitElement {
                     >
                       ${this._yamlMode
                         ? html`
-                            <paper-item @click="${this._handleRefresh}"
-                              >${this.hass!.localize(
+                            <paper-item
+                              aria-label=${this.hass!.localize(
                                 "ui.panel.lovelace.menu.refresh"
-                              )}</paper-item
+                              )}
+                              @click="${this._handleRefresh}"
                             >
+                              ${this.hass!.localize(
+                                "ui.panel.lovelace.menu.refresh"
+                              )}
+                            </paper-item>
                           `
                         : ""}
                       ${__DEMO__ /* No unused entities available in the demo */
                         ? ""
                         : html`
-                            <paper-item @click="${this._handleUnusedEntities}">
+                            <paper-item
+                              aria-label=${this.hass!.localize(
+                                "ui.panel.lovelace.menu.unused_entities"
+                              )}
+                              @click="${this._handleUnusedEntities}"
+                            >
                               ${this.hass!.localize(
                                 "ui.panel.lovelace.menu.unused_entities"
                               )}
                             </paper-item>
                           `}
-                      <paper-item @click="${this._editModeEnable}"
+                      <paper-item
+                        aria-label=${this.hass!.localize(
+                          "ui.panel.lovelace.menu.configure_ui"
+                        )}
+                        @click="${this._editModeEnable}"
                         >${this.hass!.localize(
                           "ui.panel.lovelace.menu.configure_ui"
                         )}</paper-item
                       >
-                      <paper-item @click="${this._handleHelp}"
+                      <paper-item
+                        aria-label=${this.hass!.localize(
+                          "ui.panel.lovelace.menu.help"
+                        )}
+                        @click="${this._handleHelp}"
                         >${this.hass!.localize(
                           "ui.panel.lovelace.menu.help"
                         )}</paper-item
@@ -331,10 +345,15 @@ class HUIRoot extends LitElement {
          * https://www.w3.org/TR/CSS2/visudet.html#the-height-property
          */
           position: relative;
+          display: flex;
         }
         #view.tabs-hidden {
           min-height: calc(100vh - 64px);
         }
+        #view > * {
+          flex: 1;
+          width: 100%;
+        }
         paper-item {
           cursor: pointer;
         }
@@ -390,7 +409,12 @@ class HUIRoot extends LitElement {
         | undefined;
 
       if (!oldLovelace || oldLovelace.config !== this.lovelace!.config) {
-        this._loadResources(this.lovelace!.config.resources || []);
+        if (this.lovelace!.config.resources) {
+          loadLovelaceResources(
+            this.lovelace!.config.resources,
+            this.hass!.auth.data.hassUrl
+          );
+        }
         // On config change, recreate the current view from scratch.
         force = true;
         // Recalculate to see if we need to adjust content area for tab bar
@@ -577,40 +601,6 @@ class HUIRoot extends LitElement {
       viewConfig.background || this.config.background || "";
     root.append(view);
   }
-
-  private _loadResources(resources) {
-    resources.forEach((resource) => {
-      switch (resource.type) {
-        case "css":
-          if (resource.url in CSS_CACHE) {
-            break;
-          }
-          CSS_CACHE[resource.url] = loadCSS(resource.url);
-          break;
-
-        case "js":
-          if (resource.url in JS_CACHE) {
-            break;
-          }
-          JS_CACHE[resource.url] = loadJS(resource.url);
-          break;
-
-        case "module":
-          loadModule(resource.url);
-          break;
-
-        case "html":
-          import(/* webpackChunkName: "import-href-polyfill" */ "../../resources/html-import/import-href").then(
-            ({ importHref }) => importHref(resource.url)
-          );
-          break;
-
-        default:
-          // tslint:disable-next-line
-          console.warn(`Unknown resource type specified: ${resource.type}`);
-      }
-    });
-  }
 }
 
 declare global {
diff --git a/src/panels/lovelace/hui-view.ts b/src/panels/lovelace/hui-view.ts
index bb70b8be06..f70fec8818 100644
--- a/src/panels/lovelace/hui-view.ts
+++ b/src/panels/lovelace/hui-view.ts
@@ -57,8 +57,8 @@ export class HUIView extends LitElement {
     return {
       hass: {},
       lovelace: {},
-      columns: {},
-      index: {},
+      columns: { type: Number },
+      index: { type: Number },
       _cards: {},
       _badges: {},
     };
@@ -116,10 +116,10 @@ export class HUIView extends LitElement {
       <style>
         :host {
           display: block;
+          box-sizing: border-box;
           padding: 4px 4px 0;
           transform: translateZ(0);
           position: relative;
-          min-height: calc(100vh - 155px);
         }
 
         #badges {
@@ -194,7 +194,9 @@ export class HUIView extends LitElement {
     let editModeChanged = false;
     let configChanged = false;
 
-    if (changedProperties.has("lovelace")) {
+    if (changedProperties.has("index")) {
+      configChanged = true;
+    } else if (changedProperties.has("lovelace")) {
       const oldLovelace = changedProperties.get("lovelace") as Lovelace;
       editModeChanged =
         !oldLovelace || lovelace.editMode !== oldLovelace.editMode;
@@ -310,9 +312,7 @@ export class HUIView extends LitElement {
 
     this._cards = elements;
 
-    if ("theme" in config) {
-      applyThemesOnElement(root, this.hass!.themes, config.theme);
-    }
+    applyThemesOnElement(root, this.hass!.themes, config.theme);
   }
 
   private _rebuildCard(
diff --git a/src/panels/lovelace/special-rows/hui-weblink-row.ts b/src/panels/lovelace/special-rows/hui-weblink-row.ts
index 0655564c2c..247ba45aea 100644
--- a/src/panels/lovelace/special-rows/hui-weblink-row.ts
+++ b/src/panels/lovelace/special-rows/hui-weblink-row.ts
@@ -37,7 +37,10 @@ class HuiWeblinkRow extends LitElement implements EntityRow {
     }
 
     return html`
-      <a href="${this._config.url}" target="_blank">
+      <a
+        href=${this._config.url}
+        target=${this._config.url.indexOf("://") !== -1 ? "_blank" : ""}
+      >
         <ha-icon .icon="${this._config.icon}"></ha-icon>
         <div>${this._config.name}</div>
       </a>
diff --git a/src/resources/custom-card-support.ts b/src/resources/custom-card-support.ts
new file mode 100644
index 0000000000..1ccba106e2
--- /dev/null
+++ b/src/resources/custom-card-support.ts
@@ -0,0 +1,4 @@
+import { LitElement, html, css } from "lit-element";
+
+(LitElement.prototype as any).html = html;
+(LitElement.prototype as any).css = css;
diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts
index 106812ef79..d3ecd7b1e0 100644
--- a/src/state/connection-mixin.ts
+++ b/src/state/connection-mixin.ts
@@ -46,6 +46,7 @@ export const connectionMixin = (
         translationMetadata,
         dockedSidebar: "docked",
         moreInfoEntityId: null,
+        hassUrl: (path = "") => new URL(path, auth.data.hassUrl).toString(),
         callService: async (domain, service, serviceData = {}) => {
           if (__DEV__) {
             // tslint:disable-next-line: no-console
diff --git a/src/translations/en.json b/src/translations/en.json
index a82d4a580b..de90e209c3 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -580,10 +580,10 @@
         },
         "core": {
           "caption": "General",
-          "description": "Validate your configuration file and control the server",
+          "description": "Change your general Home Assistant configuration",
           "section": {
             "core": {
-              "header": "Configuration and Server Control",
+              "header": "General Configuration",
               "introduction": "Changing your configuration can be a tiresome process. We know. This section will try to make your life a little bit easier.",
               "core_config": {
                 "edit_requires_storage": "Editor disabled because config stored in configuration.yaml.",
@@ -599,31 +599,37 @@
                 "imperial_example": "Fahrenheit, pounds",
                 "metric_example": "Celsius, kilograms",
                 "save_button": "Save"
-              },
-              "validation": {
-                "heading": "Configuration validation",
-                "introduction": "Validate your configuration if you recently made some changes to your configuration and want to make sure that it is all valid",
-                "check_config": "Check config",
-                "valid": "Configuration valid!",
-                "invalid": "Configuration invalid"
-              },
-              "reloading": {
-                "heading": "Configuration reloading",
-                "introduction": "Some parts of Home Assistant can reload without requiring a restart. Hitting reload will unload their current configuration and load the new one.",
-                "core": "Reload core",
-                "group": "Reload groups",
-                "automation": "Reload automations",
-                "script": "Reload scripts"
-              },
-              "server_management": {
-                "heading": "Server management",
-                "introduction": "Control your Home Assistant server… from Home Assistant.",
-                "restart": "Restart",
-                "stop": "Stop"
               }
             }
           }
         },
+        "server_control": {
+          "caption": "Server Control",
+          "description": "Restart and stop the Home Assistant server",
+          "section": {
+            "validation": {
+              "heading": "Configuration validation",
+              "introduction": "Validate your configuration if you recently made some changes to your configuration and want to make sure that it is all valid",
+              "check_config": "Check config",
+              "valid": "Configuration valid!",
+              "invalid": "Configuration invalid"
+            },
+            "reloading": {
+              "heading": "Configuration reloading",
+              "introduction": "Some parts of Home Assistant can reload without requiring a restart. Hitting reload will unload their current configuration and load the new one.",
+              "core": "Reload core",
+              "group": "Reload groups",
+              "automation": "Reload automations",
+              "script": "Reload scripts"
+            },
+            "server_management": {
+              "heading": "Server management",
+              "introduction": "Control your Home Assistant server… from Home Assistant.",
+              "restart": "Restart",
+              "stop": "Stop"
+            }
+          }
+        },
         "customize": {
           "caption": "Customization",
           "description": "Customize your entities",
diff --git a/src/types.ts b/src/types.ts
index abe47b9597..81074f14b5 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -142,22 +142,20 @@ export interface HomeAssistant {
   dockedSidebar: "docked" | "always_hidden" | "auto";
   moreInfoEntityId: string | null;
   user?: CurrentUser;
-  callService: (
+  hassUrl(path?): string;
+  callService(
     domain: string,
     service: string,
     serviceData?: { [key: string]: any }
-  ) => Promise<void>;
-  callApi: <T>(
+  ): Promise<void>;
+  callApi<T>(
     method: "GET" | "POST" | "PUT" | "DELETE",
     path: string,
     parameters?: { [key: string]: any }
-  ) => Promise<T>;
-  fetchWithAuth: (
-    path: string,
-    init?: { [key: string]: any }
-  ) => Promise<Response>;
-  sendWS: (msg: MessageBase) => void;
-  callWS: <T>(msg: MessageBase) => Promise<T>;
+  ): Promise<T>;
+  fetchWithAuth(path: string, init?: { [key: string]: any }): Promise<Response>;
+  sendWS(msg: MessageBase): void;
+  callWS<T>(msg: MessageBase): Promise<T>;
 }
 
 export type LightEntity = HassEntityBase & {
diff --git a/translations/af.json b/translations/af.json
index 79372685fa..f82a3831f3 100644
--- a/translations/af.json
+++ b/translations/af.json
@@ -8,7 +8,7 @@
         "mailbox": "Posbus",
         "shopping_list": "Inkopielys",
         "dev-info": "Info",
-        "developer_tools": "Ontwikkelaar gereedskap",
+        "developer_tools": "Ontwikkelaar Hulpmiddels",
         "calendar": "Kalender",
         "profile": "Profiel"
     },
@@ -26,8 +26,8 @@
             "armed_away": "Gewapend weg",
             "armed_night": "Gewapend nag",
             "pending": "Hangende",
-            "arming": "Bewapen",
-            "disarming": "Ontwapen",
+            "arming": "Bewapen Tans",
+            "disarming": "Ontwapen Tans",
             "triggered": "Geaktiveer",
             "armed_custom_bypass": "Gewapende pasgemaakte omseil"
         },
@@ -77,7 +77,7 @@
                 "on": "Onveilige"
             },
             "presence": {
-                "off": "Afwesig",
+                "off": "Elders",
                 "on": "Tuis"
             },
             "battery": {
@@ -139,9 +139,10 @@
             "electric": "Elektries",
             "performance": "Prestasie",
             "high_demand": "Hoë aanvraag",
-            "heat_pump": "Hitte pomp",
+            "heat_pump": "Hittepomp",
             "gas": "Gas",
-            "manual": "Handmatig"
+            "manual": "Handmatig",
+            "heat_cool": "Verhit\/Verkoel"
         },
         "configurator": {
             "configure": "Stel op",
@@ -156,7 +157,7 @@
         },
         "device_tracker": {
             "home": "Tuis",
-            "not_home": "Afwesig"
+            "not_home": "Elders"
         },
         "fan": {
             "off": "Af",
@@ -166,7 +167,7 @@
             "off": "Af",
             "on": "Aan",
             "home": "Tuis",
-            "not_home": "Afwesig",
+            "not_home": "Elders",
             "open": "Oop",
             "opening": "Opening",
             "closed": "Toe",
@@ -192,10 +193,10 @@
         "media_player": {
             "off": "Af",
             "on": "Aan",
-            "playing": "Speel",
+            "playing": "Speel Tans",
             "paused": "Onderbreek",
             "idle": "Ledig",
-            "standby": "Staan by"
+            "standby": "Gereed"
         },
         "plant": {
             "ok": "OK",
@@ -264,12 +265,12 @@
         },
         "timer": {
             "active": "aktief",
-            "idle": "onaktiewe",
+            "idle": "onaktief",
             "paused": "Onderbreek"
         },
         "person": {
             "home": "Tuis",
-            "not_home": "Afwesig"
+            "not_home": "Elders"
         }
     },
     "state_badge": {
@@ -286,18 +287,18 @@
             "armed_away": "Gewapen",
             "armed_night": "Gewapen",
             "pending": "Hangend",
-            "arming": "Bewapen",
+            "arming": "Bewapen Tans",
             "disarming": "Ontwapen",
             "triggered": "Aktief",
             "armed_custom_bypass": "Gewapen"
         },
         "device_tracker": {
             "home": "Tuis",
-            "not_home": "Afwesig"
+            "not_home": "Elders"
         },
         "person": {
             "home": "Tuis",
-            "not_home": "Afwesig"
+            "not_home": "Elders"
         }
     },
     "ui": {
@@ -323,6 +324,9 @@
                     },
                     "mqtt": {
                         "title": "MQTT"
+                    },
+                    "info": {
+                        "title": "Inligting"
                     }
                 }
             },
@@ -350,6 +354,23 @@
                         "core": {
                             "header": "Opstellings en bedienerbeheer",
                             "introduction": "As u opstellings verander, kan dit 'n vermoeiende proses wees. Ons weet. Hierdie afdeling sal probeer om u lewe 'n bietjie makliker te maak.",
+                            "core_config": {
+                                "edit_requires_storage": "Redakteur is gedeaktiveer omdat konfigurasie gestoor is in configuration.yaml.",
+                                "location_name": "Naam van u Home Assistant installasie",
+                                "latitude": "Breedtegraad",
+                                "longitude": "Lengtegraad",
+                                "elevation": "Hoogte",
+                                "elevation_meters": "Meter",
+                                "time_zone": "Tydsone",
+                                "unit_system": "Eenheidstelsel",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metrieke",
+                                "imperial_example": "Fahrenheit, pond",
+                                "metric_example": "Celsius, kilogram",
+                                "save_button": "Stoor"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Opstellings validering",
                                 "introduction": "Verifieer u opstellings as u onlangs 'n paar veranderinge aan u opstellings gemaak het en wil seker maak dat dit alles geldig is",
@@ -379,7 +400,7 @@
                     "description": "Pas u entiteite aan",
                     "picker": {
                         "header": "Pasgemaakte Instellings",
-                        "introduction": "Verfyn per-entiteit eienskappe. Bygevoegde \/ gewysigde aanpassings sal onmiddellik in werking tree. Verwyderde aanpassings sal in werkin tree wanneer die entiteit opgedateer word."
+                        "introduction": "Verfyn per-entiteit eienskappe. Bygevoegde \/ gewysigde aanpassings sal onmiddellik in werking tree. Verwyderde aanpassings sal in werking tree wanneer die entiteit opgedateer word."
                     }
                 },
                 "automation": {
@@ -525,7 +546,7 @@
                                     "zone": "Sone"
                                 }
                             },
-                            "learn_more": "Kom meer te wete oor die voorwaardes"
+                            "learn_more": "Kom meer te wete oor voorwaardes"
                         },
                         "actions": {
                             "header": "Aksies",
@@ -560,7 +581,9 @@
                                 }
                             },
                             "learn_more": "Kom meer te wete oor aksies"
-                        }
+                        },
+                        "load_error_not_editable": "Slegs outomatisasies in automations.yaml kan verander word.",
+                        "load_error_unknown": "Kon nie outomatisering laai nie ({err_no})."
                     }
                 },
                 "script": {
@@ -569,7 +592,39 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Bestuur u Z-Wave netwerk"
+                    "description": "Bestuur u Z-Wave netwerk",
+                    "network_management": {
+                        "header": "Bestuur Z-Wave Netwerk",
+                        "introduction": "Begin opdragte wat die Z-Wave-netwerk beïnvloed. U sal nie terugvoer kry of meeste opdragte slaag nie, maar u kan die OZW-logboek nagaan om dit uit te vind."
+                    },
+                    "network_status": {
+                        "network_stopped": "Z-Wave Netwerk het Gestop",
+                        "network_starting": "Skakel Tans Z-Wave Netwerk Aan...",
+                        "network_starting_note": "Afhangend van die grootte van u netwerk, kan dit 'n rukkie duur.",
+                        "network_started": "Z-Wave Netwerk is Aangeskakel",
+                        "network_started_note_some_queried": "Aktiewe Knooppunte is nagevra. Slapende Knooppunte sal nagevra word sodra hulle ontwaak.",
+                        "network_started_note_all_queried": "Alle knooppunte is nagevra"
+                    },
+                    "services": {
+                        "start_network": "Skakel Netwerk Aan",
+                        "stop_network": "Stop Netwerk",
+                        "heal_network": "Herstel Netwerk",
+                        "test_network": "Toets Netwerk",
+                        "soft_reset": "Sagte Herstel",
+                        "save_config": "Stoor Instellings",
+                        "add_node_secure": "Voeg Veilige Knooppunt By",
+                        "add_node": "Voeg Knooppunt By",
+                        "remove_node": "Verwyder Knooppunt",
+                        "cancel_command": "Kanselleer Opdrag"
+                    },
+                    "common": {
+                        "value": "Waarde",
+                        "instance": "Aktiwiteit",
+                        "index": "Indeks"
+                    },
+                    "values": {
+                        "header": "Knooppuntwaardes"
+                    }
                 },
                 "users": {
                     "caption": "Gebruikers",
@@ -617,7 +672,14 @@
                         "firmware": "Fermware: {version}",
                         "device_unavailable": "toestel nie beskikbaar nie",
                         "entity_unavailable": "entiteit nie beskikbaar nie",
-                        "no_area": "Geen Gebied"
+                        "no_area": "Geen Gebied",
+                        "hub": "Gekonnekteer via"
+                    },
+                    "config_flow": {
+                        "external_step": {
+                            "description": "Hierdie stap vereis dat u 'n eksterne webwerf besoek om voltooi te word.",
+                            "open_site": "Maak webwerf oop"
+                        }
                     }
                 },
                 "zha": {
@@ -644,7 +706,7 @@
                     "description": "Oorsig van alle gebiede in u huis.",
                     "picker": {
                         "header": "Gebiedsregister",
-                        "introduction": "Gebiede word gebruik om toestelle te organiseer gebaseer op waar hulle is. Hierdie inligting sal deur die Home Assistant gebruik word om u te help om u koppelvlak, toestemmings en integrasies met ander stelsels te organiseer.",
+                        "introduction": "Gebiede word gebruik om toestelle te organiseer gebaseer op waar hulle is. Hierdie inligting sal regdeur Home Assistant gebruik word om u te help om u koppelvlak, toestemmings en integrasies met ander stelsels te organiseer.",
                         "introduction2": "Om toestelle in 'n gebied te plaas, gebruik die skakel hieronder om na die integrasies bladsy toe te gaan en klik dan op 'n opgestelde integrasie om na die toestelkaarte toe te gaan.",
                         "integrations_page": "Integrasies bladsy",
                         "no_areas": "Dit lyk asof u nog geen gebiede het nie!",
@@ -755,6 +817,11 @@
                     "step_done": "Opstelling gedoen vir {step}",
                     "close": "Toe",
                     "submit": "Dien in"
+                },
+                "logout": "Meld af",
+                "force_narrow": {
+                    "header": "Steek die sybalk altyd weg",
+                    "description": "Dit sal die sybalk by aanvang verberg, soortgelyk aan die mobiele ervaring."
                 }
             },
             "page-authorize": {
@@ -869,6 +936,19 @@
                         "required_fields": "Vul al die vereiste velde in",
                         "password_not_match": "Wagwoorde stem nie ooreen nie"
                     }
+                },
+                "integration": {
+                    "intro": "Toestelle en dienste word as integrasies in Home Assistant voorgestel. U kan dit nou opstel, of dit later doen vanaf die instellingskerm.",
+                    "more_integrations": "Meer",
+                    "finish": "Klaar"
+                },
+                "core-config": {
+                    "intro": "Hallo {name}, welkom by Home Assistant. Hoe wil u u huis vernoem?",
+                    "intro_location": "Ons wil graag weet waar u woon. Hierdie inligting sal help met die vertoon van inligting en die opstel van son-gebaseerde outomatisasies. Hierdie data word nooit buite u netwerk gedeel nie.",
+                    "intro_location_detect": "Ons kan u help om hierdie inligting in te vul deur 'n eenmalige versoek aan 'n eksterne diens te rig.",
+                    "location_name_default": "Tuis",
+                    "button_detect": "Ontdek",
+                    "finish": "Volgende"
                 }
             },
             "lovelace": {
@@ -927,7 +1007,7 @@
                         "raw_editor": "Plat opstellings-redigeerder"
                     },
                     "raw_editor": {
-                        "header": "Wysig Opstellings",
+                        "header": "Wysig Instellings",
                         "save": "Stoor",
                         "unsaved_changes": "Ongestoorde veranderinge",
                         "saved": "Gestoor"
@@ -942,6 +1022,54 @@
                 "warning": {
                     "entity_not_found": "Entiteit nie beskikbaar nie: {entity}",
                     "entity_non_numeric": "Entiteit is nie-numeriese: {entity}"
+                },
+                "changed_toast": {
+                    "message": "Die Lovelace-opstelling is opgedateer, wil u graag herlaai?",
+                    "refresh": "Herlaai"
+                },
+                "reload_lovelace": "Herlaai Lovelace"
+            },
+            "page-demo": {
+                "cards": {
+                    "demo": {
+                        "demo_by": "deur {name}",
+                        "next_demo": "Volgende demonstrasie",
+                        "introduction": "Welkom tuis! U het die Home Assistant demo bereik waar ons die beste UI's vertoon wat deur ons gemeenskap geskep is.",
+                        "learn_more": "Kom meer te wete oor Home Assistant"
+                    }
+                },
+                "config": {
+                    "arsaboo": {
+                        "names": {
+                            "upstairs": "Boontoe",
+                            "family_room": "Sitkamer",
+                            "kitchen": "Kombuis",
+                            "patio": "Stoep",
+                            "hallway": "Gang",
+                            "master_bedroom": "Hoofslaapkamer",
+                            "left": "Links",
+                            "right": "Regs",
+                            "mirror": "Spieël"
+                        },
+                        "labels": {
+                            "lights": "Ligte",
+                            "information": "Inligting",
+                            "morning_commute": "Oggend Pendel",
+                            "commute_home": "Pendel na die huis",
+                            "entertainment": "Vermaak",
+                            "activity": "Aktiwiteit",
+                            "hdmi_input": "HDMI-toevoer",
+                            "hdmi_switcher": "HDMI-omskakelaar",
+                            "volume": "Volume",
+                            "total_tv_time": "Totale Televisie-tyd",
+                            "turn_tv_off": "Skakel televisie af",
+                            "air": "Lug"
+                        },
+                        "unit": {
+                            "watching": "Kyk Tans",
+                            "minutes_abbr": "min"
+                        }
+                    }
                 }
             }
         },
@@ -985,7 +1113,7 @@
                     "humidity": "Humiditeit",
                     "temperature": "Temperatuur",
                     "visibility": "Sigbaarheid",
-                    "wind_speed": "Wind spoed"
+                    "wind_speed": "Windspoed"
                 },
                 "cardinal_direction": {
                     "e": "O",
@@ -1011,8 +1139,8 @@
                 "code": "Kode",
                 "clear_code": "Maak skoon",
                 "disarm": "Skakel Af",
-                "arm_home": "Skakel tuis aan",
-                "arm_away": "Skakel weg aan",
+                "arm_home": "Bewapen Huis",
+                "arm_away": "Bewapen weg",
                 "arm_night": "Nag alarm",
                 "armed_custom_bypass": "Pasgemaakte omseil",
                 "arm_custom_bypass": "Pasgemaakte omseil"
@@ -1050,7 +1178,8 @@
                 "fan_mode": "Waaier modus",
                 "swing_mode": "Swaai modus",
                 "away_mode": "Wegmodus",
-                "aux_heat": "Aanvullende hitte"
+                "aux_heat": "Aanvullende hitte",
+                "preset_mode": "Voorafbepaalde"
             },
             "lock": {
                 "code": "Kode",
@@ -1186,7 +1315,7 @@
         "weather": {
             "humidity": "Humiditeit",
             "visibility": "Sigbaarheid",
-            "wind_speed": "Wind spoed"
+            "wind_speed": "Windspoed"
         }
     },
     "state_attributes": {
@@ -1195,6 +1324,24 @@
                 "off": "Af",
                 "on": "Aan",
                 "auto": "Outomatiese"
+            },
+            "preset_mode": {
+                "none": "Geen",
+                "eco": "Eko",
+                "away": "Elders",
+                "boost": "Hupstoot",
+                "comfort": "Gemak",
+                "home": "Tuis",
+                "sleep": "Slaap",
+                "activity": "Aktiwiteit"
+            },
+            "hvac_action": {
+                "off": "Af",
+                "heating": "Verhit",
+                "cooling": "Koel Af",
+                "drying": "Droog Uit",
+                "idle": "Onaktief",
+                "fan": "Waaier"
             }
         }
     },
diff --git a/translations/ar.json b/translations/ar.json
index f9ad1621f0..abf1f463b7 100644
--- a/translations/ar.json
+++ b/translations/ar.json
@@ -331,7 +331,9 @@
                     "section": {
                         "core": {
                             "header": "التحكم بالإعدادات و الخادم",
-                            "introduction": "تغيير الإعدادات يعتبر عملية مزرية. نحن نعلم ذلك . لذا، سيحاول هذا القسم جعل حياتك أكثر سهولة.",
+                            "introduction": "تغيير الإعدادات يعتبر عملية مزرية. نحن نعلم ذلك . لذا، سيحاول هذا القسم جعل حياتك أكثر سهولة."
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "تآكيد صلاحية الإعدادات",
                                 "introduction": "التحقق من صحة الإعدادات الخاصة بك إذا قمت مؤخرا بإجراء بعض التغييرات وتريد التأكد من أن كل شيء على ما يرام",
diff --git a/translations/bg.json b/translations/bg.json
index 0d51fe6536..c8b2aeaa5f 100644
--- a/translations/bg.json
+++ b/translations/bg.json
@@ -141,7 +141,8 @@
             "high_demand": "Високо натоварване",
             "heat_pump": "Термопомпа",
             "gas": "Газ",
-            "manual": "Ръчен режим"
+            "manual": "Ръчен режим",
+            "heat_cool": "Отопление\/Охлаждане"
         },
         "configurator": {
             "configure": "Настройване",
@@ -323,6 +324,9 @@
                     },
                     "mqtt": {
                         "title": "MQTT"
+                    },
+                    "info": {
+                        "title": "Информация"
                     }
                 }
             },
@@ -350,6 +354,23 @@
                         "core": {
                             "header": "Конфигуриране и управление на сървъра",
                             "introduction": "Промяната на конфигурацията може да бъде труден процес. Знаем това. Този раздел ще се опита да направи живота Ви малко по-лесен.",
+                            "core_config": {
+                                "edit_requires_storage": "Редакторът е деактивиран, защото конфигурацията е съхранена в configuration.yaml.",
+                                "location_name": "Име на Вашия Home Assistant",
+                                "latitude": "Географска ширина",
+                                "longitude": "Географска дължина",
+                                "elevation": "Надморска височина",
+                                "elevation_meters": "метра",
+                                "time_zone": "Часова зона",
+                                "unit_system": "Система единици",
+                                "unit_system_imperial": "Имперски единици",
+                                "unit_system_metric": "Метрични единици",
+                                "imperial_example": "Фаренхайт, паунд",
+                                "metric_example": "Целзий, килограми",
+                                "save_button": "Запази"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Проверка на конфигурацията",
                                 "introduction": "Проверете конфигурацията, ако скоро сте направили промени и искате да се уверите, че всичко работи",
@@ -370,21 +391,6 @@
                                 "introduction": "Управление на Home Assistant сървъра... от Home Assistant.",
                                 "restart": "Рестарт",
                                 "stop": "Спиране"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Редакторът е деактивиран, защото конфигурацията е съхранена в configuration.yaml.",
-                                "location_name": "Име на Вашия Home Assistant",
-                                "latitude": "Географска ширина",
-                                "longitude": "Географска дължина",
-                                "elevation": "Надморска височина",
-                                "elevation_meters": "метра",
-                                "time_zone": "Часова зона",
-                                "unit_system": "Система единици",
-                                "unit_system_imperial": "Имперски единици",
-                                "unit_system_metric": "Метрични единици",
-                                "imperial_example": "Фаренхайт, паунд",
-                                "metric_example": "Целзий, килограми",
-                                "save_button": "Запази"
                             }
                         }
                     }
@@ -586,7 +592,39 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Управлявайте своята Z-Wave мрежа"
+                    "description": "Управлявайте своята Z-Wave мрежа",
+                    "network_management": {
+                        "header": "Управление на Z-Wave мрежата",
+                        "introduction": "Изпълнение на команди, които засягат Z-Wave мрежата. Няма да получите обратна информация за това дали повечето команди са успели, но можете да проверите OZW лог файла, за да се опитате да разберете."
+                    },
+                    "network_status": {
+                        "network_stopped": "Z-Wave мрежата е спряна",
+                        "network_starting": "Стартиране на Z-Wave мрежа...",
+                        "network_starting_note": "Това може да отнеме известно време в зависимост от размера на мрежата Ви.",
+                        "network_started": "Z-Wave мрежата е стартирана",
+                        "network_started_note_some_queried": "Будните устройства бяха разпитани. Спящите устройства ще бъдат разпитани, когато са на линия.",
+                        "network_started_note_all_queried": "Всички устройства бяха разпитани."
+                    },
+                    "services": {
+                        "start_network": "Стартиране на мрежата",
+                        "stop_network": "Спиране на мрежата",
+                        "heal_network": "Оздравяване на мрежата",
+                        "test_network": "Тестване на мрежата",
+                        "soft_reset": "Soft Reset",
+                        "save_config": "Запазване на конфигурацията",
+                        "add_node_secure": "Добавяне на криптирано устройство",
+                        "add_node": "Добавяне на устройство",
+                        "remove_node": "Премахване на устройство",
+                        "cancel_command": "Отмени командата"
+                    },
+                    "common": {
+                        "value": "Стойност",
+                        "instance": "Устройство",
+                        "index": "Индекс"
+                    },
+                    "values": {
+                        "header": "Стойности на устройсто"
+                    }
                 },
                 "users": {
                     "caption": "Потребители",
@@ -779,6 +817,11 @@
                     "step_done": "Настройката е извършена за {step}",
                     "close": "Затвори",
                     "submit": "Изпращане"
+                },
+                "logout": "Изход",
+                "force_narrow": {
+                    "header": "Винаги скривай страничната лента",
+                    "description": "Това ще скрие страничната лента по подразбиране, подобно на изгледа в мобилната версия."
                 }
             },
             "page-authorize": {
@@ -1135,7 +1178,8 @@
                 "fan_mode": "Режим на вентилатора",
                 "swing_mode": "Режим на люлеене",
                 "away_mode": "Режим на отсъствие",
-                "aux_heat": "Помощен нагревател"
+                "aux_heat": "Помощен нагревател",
+                "preset_mode": "Предварително-зададени настройки"
             },
             "lock": {
                 "code": "Код",
@@ -1280,6 +1324,24 @@
                 "off": "Изключен",
                 "on": "Включен",
                 "auto": "Автоматичен"
+            },
+            "preset_mode": {
+                "none": "Без",
+                "eco": "Еко",
+                "away": "Отсъства",
+                "boost": "Ускорен",
+                "comfort": "Комфорт",
+                "home": "Вкъщи",
+                "sleep": "Сън",
+                "activity": "Дейност"
+            },
+            "hvac_action": {
+                "off": "Изключен",
+                "heating": "Отопление",
+                "cooling": "Охлаждане",
+                "drying": "Изсушаване",
+                "idle": "Неработещ",
+                "fan": "Вентилатор"
             }
         }
     },
diff --git a/translations/ca.json b/translations/ca.json
index 3013df40fd..79ca355b30 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Configuració i control del servidor",
                             "introduction": "Sabem que canviar la configuració pot ser un procés molest. Aquesta secció intenta facilitar-te una mica més la vida.",
+                            "core_config": {
+                                "edit_requires_storage": "L'editor està desactivat ja que la configuració es troba a configuration.yaml.",
+                                "location_name": "Nom de la instal·lació de Home Assistant",
+                                "latitude": "Latitud",
+                                "longitude": "Longitud",
+                                "elevation": "Altitud",
+                                "elevation_meters": "metres",
+                                "time_zone": "Zona horària",
+                                "unit_system": "Sistema d'unitats",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Mètric",
+                                "imperial_example": "Fahrenheit, lliures",
+                                "metric_example": "Celsius, quilograms",
+                                "save_button": "Desa"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validació de la configuració",
                                 "introduction": "Valida la configuració si recentment has fet algun canvi a la configuració i vols assegurar-te de que no té problemes.",
@@ -374,21 +391,6 @@
                                 "introduction": "Controla el servidor de Home Assistant... des de Home Assistant.",
                                 "restart": "Reinicia",
                                 "stop": "Atura"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "L'editor està desactivat ja que la configuració es troba a configuration.yaml.",
-                                "location_name": "Nom de la instal·lació de Home Assistant",
-                                "latitude": "Latitud",
-                                "longitude": "Longitud",
-                                "elevation": "Altitud",
-                                "elevation_meters": "metres",
-                                "time_zone": "Zona horària",
-                                "unit_system": "Sistema d'unitats",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Mètric",
-                                "imperial_example": "Fahrenheit, lliures",
-                                "metric_example": "Celsius, quilograms",
-                                "save_button": "Desa"
                             }
                         }
                     }
diff --git a/translations/cs.json b/translations/cs.json
index e8643cd65b..8f7c5cc2a7 100644
--- a/translations/cs.json
+++ b/translations/cs.json
@@ -350,6 +350,23 @@
                         "core": {
                             "header": "Konfigurace a správa serveru",
                             "introduction": "Moc dobře víme, že změna konfigurace může být velmi únavným procesem. Tato sekce se proto pokusí udělat váš život alespoň trochu jednodušší.",
+                            "core_config": {
+                                "edit_requires_storage": "Editori pois käytöstä, koska asetukset on määritelty configuration.yaml:ssä",
+                                "location_name": "Název instalace Home Assistant",
+                                "latitude": "Zeměpisná šířka",
+                                "longitude": "Zeměpisná délka",
+                                "elevation": "Nadmořská výška",
+                                "elevation_meters": "metrů",
+                                "time_zone": "Časové pásmo",
+                                "unit_system": "Systém jednotek",
+                                "unit_system_imperial": "Imperiální",
+                                "unit_system_metric": "Metrický",
+                                "imperial_example": "Stupně Fahrenheita, libry",
+                                "metric_example": "Stupně Celsia, kilogramy",
+                                "save_button": "Uložit"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Ověření konfigurace",
                                 "introduction": "Pokud jste nedávno provedli změny konfigurace a chcete se ujistit, že je vše v pořádku, můžete ji zde ověřit",
@@ -370,21 +387,6 @@
                                 "introduction": "Ovládejte svůj Home Assistant server... z Home Assistant.",
                                 "restart": "Restartovat",
                                 "stop": "Zastavit"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editori pois käytöstä, koska asetukset on määritelty configuration.yaml:ssä",
-                                "location_name": "Název instalace Home Assistant",
-                                "latitude": "Zeměpisná šířka",
-                                "longitude": "Zeměpisná délka",
-                                "elevation": "Nadmořská výška",
-                                "elevation_meters": "metrů",
-                                "time_zone": "Časové pásmo",
-                                "unit_system": "Systém jednotek",
-                                "unit_system_imperial": "Imperiální",
-                                "unit_system_metric": "Metrický",
-                                "imperial_example": "Stupně Fahrenheita, libry",
-                                "metric_example": "Stupně Celsia, kilogramy",
-                                "save_button": "Uložit"
                             }
                         }
                     }
diff --git a/translations/cy.json b/translations/cy.json
index dd0174e02b..2390801659 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -338,6 +338,23 @@
                         "core": {
                             "header": "Rheoli ffurfweddu a gweinydd",
                             "introduction": "Gellir newid ffurfweddiad eich proses ddiflas. Rydym yn gwybod. Bydd yr adran hon yn ceisio gwneud eich bywyd ychydig yn haws.",
+                            "core_config": {
+                                "edit_requires_storage": "Golygydd wedi'i analluogi oherwydd bod ffurfwedd wedi'i storio mewn 'configuration.yaml'.",
+                                "location_name": "Enw eich gosodiad Home Assistant",
+                                "latitude": "Lledred",
+                                "longitude": "Hydred",
+                                "elevation": "Uchder",
+                                "elevation_meters": "metrau",
+                                "time_zone": "Parth Amser",
+                                "unit_system": "System Uned",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metrig",
+                                "imperial_example": "Fahrenheit, pwys",
+                                "metric_example": "Celsius, cilogramau",
+                                "save_button": "Arbed"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Dilysu ffurfweddu",
                                 "introduction": "Dilyswch eich ffurfweddiad os gwnaethoch rai newidiadau yn ddiweddar i'ch cyfluniad ac rydych eisiau gwneud yn siŵr ei fod yn hollol ddilys",
@@ -358,21 +375,6 @@
                                 "introduction": "Rheoli gweinydd eich Home Assistant ... o Home Assistant",
                                 "restart": "Ailgychwyn",
                                 "stop": "Stopio"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Golygydd wedi'i analluogi oherwydd bod ffurfwedd wedi'i storio mewn 'configuration.yaml'.",
-                                "location_name": "Enw eich gosodiad Home Assistant",
-                                "latitude": "Lledred",
-                                "longitude": "Hydred",
-                                "elevation": "Uchder",
-                                "elevation_meters": "metrau",
-                                "time_zone": "Parth Amser",
-                                "unit_system": "System Uned",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metrig",
-                                "imperial_example": "Fahrenheit, pwys",
-                                "metric_example": "Celsius, cilogramau",
-                                "save_button": "Arbed"
                             }
                         }
                     }
diff --git a/translations/da.json b/translations/da.json
index d9d42e24c8..85c3da1734 100644
--- a/translations/da.json
+++ b/translations/da.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Konfiguration og server kontrol",
                             "introduction": "Ændring af din konfiguration kan det være en trættende proces. Vi ved det. Dette afsnit vil forsøge at gøre dit liv en smule nemmere.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor er deaktiveret, fordi config er gemt i configuration.yaml.",
+                                "location_name": "Navn på din Home Assistant-installation",
+                                "latitude": "Breddegrad",
+                                "longitude": "Længdegrad",
+                                "elevation": "Højde",
+                                "elevation_meters": "meter",
+                                "time_zone": "Tidszone",
+                                "unit_system": "Enheds system",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metriske",
+                                "imperial_example": "Fahrenheit, pund",
+                                "metric_example": "Celsius, kg",
+                                "save_button": "Gem"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Konfigurations validering",
                                 "introduction": "Validér din konfiguration, hvis du for nylig lavede nogle ændringer i din konfiguration og vil sikre dig, at alt er validt",
@@ -374,21 +391,6 @@
                                 "introduction": "Kontroller din Home Assistant server... fra Home Assistant.",
                                 "restart": "Genstart",
                                 "stop": "Stop"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor er deaktiveret, fordi config er gemt i configuration.yaml.",
-                                "location_name": "Navn på din Home Assistant-installation",
-                                "latitude": "Breddegrad",
-                                "longitude": "Længdegrad",
-                                "elevation": "Højde",
-                                "elevation_meters": "meter",
-                                "time_zone": "Tidszone",
-                                "unit_system": "Enheds system",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metriske",
-                                "imperial_example": "Fahrenheit, pund",
-                                "metric_example": "Celsius, kg",
-                                "save_button": "Gem"
                             }
                         }
                     }
diff --git a/translations/de.json b/translations/de.json
index a1165c7a1b..691032517d 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Einstellungen und Serversteuerung",
                             "introduction": "Die Konfiguration zu ändern ist ein mühsamer Prozess. Das wissen wir. Dieser Bereich versucht dir das Leben etwas leichter zu gestalten.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor deaktiviert, da die Konfiguration in configuration.yaml gespeichert ist.",
+                                "location_name": "Name deiner Home Assistant Installation",
+                                "latitude": "Breitengrad",
+                                "longitude": "Längengrad",
+                                "elevation": "Höhe",
+                                "elevation_meters": "Meter",
+                                "time_zone": "Zeitzone",
+                                "unit_system": "Einheitensystem",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metrisch",
+                                "imperial_example": "Fahrenheit, Pfund",
+                                "metric_example": "Celsius, Kilogramm",
+                                "save_button": "Speichern"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Konfiguration überprüfen",
                                 "introduction": "Überprüfe deine Konfiguration, wenn du kürzlich Änderungen vorgenommen hast und sicherstellen möchtest, dass alles ordnungsgemäß ist",
@@ -374,21 +391,6 @@
                                 "introduction": "Verwalte den Home Assistant Server",
                                 "restart": "Neu starten",
                                 "stop": "Stoppen"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor deaktiviert, da die Konfiguration in configuration.yaml gespeichert ist.",
-                                "location_name": "Name deiner Home Assistant Installation",
-                                "latitude": "Breitengrad",
-                                "longitude": "Längengrad",
-                                "elevation": "Höhe",
-                                "elevation_meters": "Meter",
-                                "time_zone": "Zeitzone",
-                                "unit_system": "Einheitensystem",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metrisch",
-                                "imperial_example": "Fahrenheit, Pfund",
-                                "metric_example": "Celsius, Kilogramm",
-                                "save_button": "Speichern"
                             }
                         }
                     }
@@ -614,6 +616,14 @@
                         "add_node": "Knoten hinzufügen",
                         "remove_node": "Knoten entfernen",
                         "cancel_command": "Befehl abbrechen"
+                    },
+                    "common": {
+                        "value": "Wert",
+                        "instance": "Instanz",
+                        "index": "Index"
+                    },
+                    "values": {
+                        "header": "Knotenwerte"
                     }
                 },
                 "users": {
@@ -808,7 +818,11 @@
                     "close": "Schließen",
                     "submit": "Absenden"
                 },
-                "logout": "Abmelden"
+                "logout": "Abmelden",
+                "force_narrow": {
+                    "header": "Verstecke die Seitenleiste immer",
+                    "description": "Dies blendet die Seitenleiste standardmäßig aus, ähnlich der Nutzung auf Mobilgeräten."
+                }
             },
             "page-authorize": {
                 "initializing": "Initialisieren",
@@ -1320,6 +1334,14 @@
                 "home": "Zuhause",
                 "sleep": "Schlafen",
                 "activity": "Aktivität"
+            },
+            "hvac_action": {
+                "off": "Aus",
+                "heating": "Heizung",
+                "cooling": "Kühlung",
+                "drying": "Trocknen",
+                "idle": "Leerlauf",
+                "fan": "Ventilator"
             }
         }
     },
diff --git a/translations/el.json b/translations/el.json
index a2b7b98c94..dec7feffb0 100644
--- a/translations/el.json
+++ b/translations/el.json
@@ -350,6 +350,23 @@
                         "core": {
                             "header": "Ρύθμιση παραμέτρων και Έλεγχος του διακομιστή",
                             "introduction": "Αλλάζοντας τις ρυθμίσεις σας μπορεί να είναι μια κουραστική διαδικασία. Το γνωρίζουμε. Σε αυτή την ενότητα θα προσπαθήσουμε να κάνουμε τη ζωή σας λίγο πιο εύκολη.",
+                            "core_config": {
+                                "edit_requires_storage": "Ο επεξεργαστής απενεργοποιήθηκε επειδή οι ρυθμίσεις παραμέτρων αποθηκεύτηκαν στο αρχείο configuration.yaml.",
+                                "location_name": "Όνομα της εγκατάστασης του Home Assistant",
+                                "latitude": "Γεωγραφικό πλάτος",
+                                "longitude": "Γεωγραφικό μήκος",
+                                "elevation": "Ανύψωση",
+                                "elevation_meters": "μέτρα",
+                                "time_zone": "Ζώνη Ώρας",
+                                "unit_system": "Μονάδα Συστήματος",
+                                "unit_system_imperial": "Αυτοκρατορικός",
+                                "unit_system_metric": "Μετρικό",
+                                "imperial_example": "Φαρενάιτ, λίρες",
+                                "metric_example": "Κελσίου, κιλά",
+                                "save_button": "Αποθήκευση"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Επαλήθευση ρυθμίσεων",
                                 "introduction": "Επαληθεύστε τις ρυθμίσεις σας εάν κάνατε πρόσφατα κάποιες αλλαγές και θέλετε να βεβαιωθείτε ότι είναι όλες έγκυρες",
@@ -370,21 +387,6 @@
                                 "introduction": "Έλεγχος του διακομιστή Home Assistant... απο τον Home Assistant",
                                 "restart": "Επανεκκίνηση",
                                 "stop": "Στοπ"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Ο επεξεργαστής απενεργοποιήθηκε επειδή οι ρυθμίσεις παραμέτρων αποθηκεύτηκαν στο αρχείο configuration.yaml.",
-                                "location_name": "Όνομα της εγκατάστασης του Home Assistant",
-                                "latitude": "Γεωγραφικό πλάτος",
-                                "longitude": "Γεωγραφικό μήκος",
-                                "elevation": "Ανύψωση",
-                                "elevation_meters": "μέτρα",
-                                "time_zone": "Ζώνη Ώρας",
-                                "unit_system": "Μονάδα Συστήματος",
-                                "unit_system_imperial": "Αυτοκρατορικός",
-                                "unit_system_metric": "Μετρικό",
-                                "imperial_example": "Φαρενάιτ, λίρες",
-                                "metric_example": "Κελσίου, κιλά",
-                                "save_button": "Αποθήκευση"
                             }
                         }
                     }
diff --git a/translations/en.json b/translations/en.json
index 445eb9ba78..1bed1c80d0 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -349,11 +349,28 @@
                 "introduction": "Here it is possible to configure your components and Home Assistant. Not everything is possible to configure from the UI yet, but we're working on it.",
                 "core": {
                     "caption": "General",
-                    "description": "Validate your configuration file and control the server",
+                    "description": "Change your general Home Assistant configuration",
                     "section": {
                         "core": {
-                            "header": "Configuration and Server Control",
+                            "header": "General Configuration",
                             "introduction": "Changing your configuration can be a tiresome process. We know. This section will try to make your life a little bit easier.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor disabled because config stored in configuration.yaml.",
+                                "location_name": "Name of your Home Assistant installation",
+                                "latitude": "Latitude",
+                                "longitude": "Longitude",
+                                "elevation": "Elevation",
+                                "elevation_meters": "meters",
+                                "time_zone": "Time Zone",
+                                "unit_system": "Unit System",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metric",
+                                "imperial_example": "Fahrenheit, pounds",
+                                "metric_example": "Celsius, kilograms",
+                                "save_button": "Save"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Configuration validation",
                                 "introduction": "Validate your configuration if you recently made some changes to your configuration and want to make sure that it is all valid",
@@ -374,21 +391,6 @@
                                 "introduction": "Control your Home Assistant server… from Home Assistant.",
                                 "restart": "Restart",
                                 "stop": "Stop"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor disabled because config stored in configuration.yaml.",
-                                "location_name": "Name of your Home Assistant installation",
-                                "latitude": "Latitude",
-                                "longitude": "Longitude",
-                                "elevation": "Elevation",
-                                "elevation_meters": "meters",
-                                "time_zone": "Time Zone",
-                                "unit_system": "Unit System",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metric",
-                                "imperial_example": "Fahrenheit, pounds",
-                                "metric_example": "Celsius, kilograms",
-                                "save_button": "Save"
                             }
                         }
                     }
@@ -745,6 +747,33 @@
                         "device_tracker_picked": "Track Device",
                         "device_tracker_pick": "Pick device to track"
                     }
+                },
+                "server_control": {
+                    "caption": "Server Control",
+                    "description": "Restart and stop the Home Assistant server",
+                    "section": {
+                        "validation": {
+                            "heading": "Configuration validation",
+                            "introduction": "Validate your configuration if you recently made some changes to your configuration and want to make sure that it is all valid",
+                            "check_config": "Check config",
+                            "valid": "Configuration valid!",
+                            "invalid": "Configuration invalid"
+                        },
+                        "reloading": {
+                            "heading": "Configuration reloading",
+                            "introduction": "Some parts of Home Assistant can reload without requiring a restart. Hitting reload will unload their current configuration and load the new one.",
+                            "core": "Reload core",
+                            "group": "Reload groups",
+                            "automation": "Reload automations",
+                            "script": "Reload scripts"
+                        },
+                        "server_management": {
+                            "heading": "Server management",
+                            "introduction": "Control your Home Assistant server… from Home Assistant.",
+                            "restart": "Restart",
+                            "stop": "Stop"
+                        }
+                    }
                 }
             },
             "profile": {
diff --git a/translations/es-419.json b/translations/es-419.json
index 63f66811b1..b624043637 100644
--- a/translations/es-419.json
+++ b/translations/es-419.json
@@ -350,6 +350,23 @@
                         "core": {
                             "header": "Configuración y control del servidor",
                             "introduction": "Cambiar su configuración puede ser un proceso tedioso. Lo sabemos. Esta sección tratará de hacer su vida un poco más fácil.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor desactivado porque config está almacenado en configuration.yaml.",
+                                "location_name": "Nombre de la instalación de tu Home Assistant",
+                                "latitude": "Latitud",
+                                "longitude": "Longitud",
+                                "elevation": "Elevación",
+                                "elevation_meters": "metros",
+                                "time_zone": "Zona horaria",
+                                "unit_system": "Sistema de unidades",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Métrico",
+                                "imperial_example": "Fahrenheit, libras",
+                                "metric_example": "Centígrados, kilogramos",
+                                "save_button": "Guardar"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validación de la configuración",
                                 "introduction": "Valide su configuración si recientemente realizó algunos cambios en su configuración y quiere asegurarse de que sea válida",
@@ -370,21 +387,6 @@
                                 "introduction": "Controle su servidor Home Assistant ... desde Home Assistant.",
                                 "restart": "Reiniciar",
                                 "stop": "Detener"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor desactivado porque config está almacenado en configuration.yaml.",
-                                "location_name": "Nombre de la instalación de tu Home Assistant",
-                                "latitude": "Latitud",
-                                "longitude": "Longitud",
-                                "elevation": "Elevación",
-                                "elevation_meters": "metros",
-                                "time_zone": "Zona horaria",
-                                "unit_system": "Sistema de unidades",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Métrico",
-                                "imperial_example": "Fahrenheit, libras",
-                                "metric_example": "Centígrados, kilogramos",
-                                "save_button": "Guardar"
                             }
                         }
                     }
diff --git a/translations/es.json b/translations/es.json
index 78c9e586c6..898ef911cb 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Configuración y control del servidor",
                             "introduction": "Cambiar tu configuración puede ser un proceso tedioso. Lo sabemos. Esta sección tratará de hacer tu vida un poco más fácil.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor deshabilitado debido a la configuración almacenada en configuration.yaml.",
+                                "location_name": "Nombre de tu instalación de Home Assistant",
+                                "latitude": "Latitud",
+                                "longitude": "Longitud",
+                                "elevation": "Altitud",
+                                "elevation_meters": "metros",
+                                "time_zone": "Zona horaria",
+                                "unit_system": "Sistema de unidades",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Métrico",
+                                "imperial_example": "Fahrenheit, libras",
+                                "metric_example": "Celsius, kilogramos",
+                                "save_button": "Guardar"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validación de la configuración",
                                 "introduction": "Valida tu configuración si has realizado cambios recientemente y quieres asegurarte de que son correctos",
@@ -374,21 +391,6 @@
                                 "introduction": "Controla tu servidor de Home Assistant ... desde Home Assistant.",
                                 "restart": "Reiniciar",
                                 "stop": "Detener"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor deshabilitado debido a la configuración almacenada en configuration.yaml.",
-                                "location_name": "Nombre de tu instalación de Home Assistant",
-                                "latitude": "Latitud",
-                                "longitude": "Longitud",
-                                "elevation": "Altitud",
-                                "elevation_meters": "metros",
-                                "time_zone": "Zona horaria",
-                                "unit_system": "Sistema de unidades",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Métrico",
-                                "imperial_example": "Fahrenheit, libras",
-                                "metric_example": "Celsius, kilogramos",
-                                "save_button": "Guardar"
                             }
                         }
                     }
@@ -816,7 +818,11 @@
                     "close": "Cerrar",
                     "submit": "Enviar"
                 },
-                "logout": "Cerrar sesión"
+                "logout": "Cerrar sesión",
+                "force_narrow": {
+                    "header": "Ocultar siempre la barra lateral",
+                    "description": "Esto ocultará la barra lateral de forma predeterminada, similar a la experiencia móvil."
+                }
             },
             "page-authorize": {
                 "initializing": "Inicializando",
@@ -1323,10 +1329,19 @@
                 "none": "Ninguno",
                 "eco": "Eco",
                 "away": "Fuera de casa",
+                "boost": "Impulso",
                 "comfort": "Confort",
                 "home": "En casa",
                 "sleep": "Dormir",
                 "activity": "Actividad"
+            },
+            "hvac_action": {
+                "off": "Apagado",
+                "heating": "Calentando",
+                "cooling": "Enfriando",
+                "drying": "Secando",
+                "idle": "Inactivo",
+                "fan": "Ventilador"
             }
         }
     },
diff --git a/translations/et.json b/translations/et.json
index 5b286aaebb..469040dc40 100644
--- a/translations/et.json
+++ b/translations/et.json
@@ -349,6 +349,22 @@
                         "core": {
                             "header": "Seadete ja serveri kontroll",
                             "introduction": "Seadete muutmine võib olla väsitav tegevus. Me teame. See osa püüab su elu natuke hõlpsamaks teha.",
+                            "core_config": {
+                                "location_name": "Sinu Home Assistant paigalduse nimi",
+                                "latitude": "Laius",
+                                "longitude": "Pikkus",
+                                "elevation": "Kõrgus",
+                                "elevation_meters": "meetrit",
+                                "time_zone": "Ajavöönd",
+                                "unit_system": "Ühikute süsteem",
+                                "unit_system_imperial": "Imperiaalne süsteem",
+                                "unit_system_metric": "Meetermõõdustik",
+                                "imperial_example": "Fahrenheit, naelad",
+                                "metric_example": "Celsius, kilogrammid",
+                                "save_button": "Salvesta"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Seadete kontrollimine",
                                 "introduction": "Kontrolli oma seadeid kui oled neis hiljuti muutusi teinud ja tahad veenduda, et kõik on korrektne",
@@ -369,20 +385,6 @@
                                 "introduction": "Kontrolli oma Home Assistant serverit... Home Assistant-ist.",
                                 "restart": "Taaskäivita",
                                 "stop": "Peata"
-                            },
-                            "core_config": {
-                                "location_name": "Sinu Home Assistant paigalduse nimi",
-                                "latitude": "Laius",
-                                "longitude": "Pikkus",
-                                "elevation": "Kõrgus",
-                                "elevation_meters": "meetrit",
-                                "time_zone": "Ajavöönd",
-                                "unit_system": "Ühikute süsteem",
-                                "unit_system_imperial": "Imperiaalne süsteem",
-                                "unit_system_metric": "Meetermõõdustik",
-                                "imperial_example": "Fahrenheit, naelad",
-                                "metric_example": "Celsius, kilogrammid",
-                                "save_button": "Salvesta"
                             }
                         }
                     }
diff --git a/translations/eu.json b/translations/eu.json
index 834398a8a5..ee64e427eb 100644
--- a/translations/eu.json
+++ b/translations/eu.json
@@ -263,7 +263,7 @@
                 "core": {
                     "caption": "Orokorra",
                     "section": {
-                        "core": {
+                        "server_control": {
                             "reloading": {
                                 "core": "Nukleoa birkargatu",
                                 "group": "Taldeak birkargatu",
@@ -275,7 +275,9 @@
                                 "introduction": "Zure Home Assistant zerbitzaria... Home Assistantetik kontrolatu",
                                 "restart": "Berrabiarazi",
                                 "stop": "Gelditu"
-                            },
+                            }
+                        },
+                        "core": {
                             "core_config": {
                                 "location_name": "Zure Home Assistant instalazioaren izena",
                                 "latitude": "Latitudea",
diff --git a/translations/fa.json b/translations/fa.json
index 378a2b2384..5501be4934 100644
--- a/translations/fa.json
+++ b/translations/fa.json
@@ -330,21 +330,6 @@
                         "core": {
                             "header": "پیکربندی و کنترل سرور",
                             "introduction": "تغییر پیکربندی شما می تواند یک روند خسته کننده باشد. ما میدانیم. این بخش سعی خواهد کرد زندگی شما را کمی ساده تر کند.",
-                            "validation": {
-                                "heading": "تایید  پیکربندی",
-                                "check_config": "بررسی پیکربندی"
-                            },
-                            "reloading": {
-                                "heading": "بارگذاری مجدد پیکربندی",
-                                "introduction": "برخی از قسمت های Home Assistant می توانند بدون نیاز به راه اندازی مجدد مجدد بارگیری شوند. برای بارگذاری مجدد ضربه بزنید. پیکربندی کنونی خود را بارگیری و اطلاعات جدید را بارگذاری می کند.",
-                                "core": "بارگذاری مجدد ",
-                                "group": "بارگذاری مجدد گروه ها",
-                                "automation": "بازنگری automations",
-                                "script": "بازنگری اسکریپت"
-                            },
-                            "server_management": {
-                                "introduction": "صفحه اصلی home assistant سرور خود را کنترل کنید ... از  home assistant"
-                            },
                             "core_config": {
                                 "edit_requires_storage": "ویرایشگر غیرفعال شده است چون پیکربندی ذخیره شده در configuration.yaml.",
                                 "location_name": "نام برای نصب صفحه اصلی دستیار شما",
@@ -360,6 +345,23 @@
                                 "metric_example": "سانتیگراد، کیلوگرم",
                                 "save_button": "ذخیره"
                             }
+                        },
+                        "server_control": {
+                            "validation": {
+                                "heading": "تایید  پیکربندی",
+                                "check_config": "بررسی پیکربندی"
+                            },
+                            "reloading": {
+                                "heading": "بارگذاری مجدد پیکربندی",
+                                "introduction": "برخی از قسمت های Home Assistant می توانند بدون نیاز به راه اندازی مجدد مجدد بارگیری شوند. برای بارگذاری مجدد ضربه بزنید. پیکربندی کنونی خود را بارگیری و اطلاعات جدید را بارگذاری می کند.",
+                                "core": "بارگذاری مجدد ",
+                                "group": "بارگذاری مجدد گروه ها",
+                                "automation": "بازنگری automations",
+                                "script": "بازنگری اسکریپت"
+                            },
+                            "server_management": {
+                                "introduction": "صفحه اصلی home assistant سرور خود را کنترل کنید ... از  home assistant"
+                            }
                         }
                     }
                 },
diff --git a/translations/fi.json b/translations/fi.json
index 1c5964f5f9..2c8eb88ca9 100644
--- a/translations/fi.json
+++ b/translations/fi.json
@@ -135,13 +135,14 @@
             "auto": "Automaatilla",
             "dry": "Kuivaus",
             "fan_only": "Tuuletus",
-            "eco": "Eko",
+            "eco": "Ekonominen",
             "electric": "Sähköinen",
             "performance": "Tehokas",
             "high_demand": "Täysi teho",
             "heat_pump": "Lämpöpumppu",
             "gas": "Kaasu",
-            "manual": "käsisäätöinen"
+            "manual": "käsisäätöinen",
+            "heat_cool": "Lämmitys\/jäähdytys"
         },
         "configurator": {
             "configure": "Määrittele",
@@ -237,20 +238,20 @@
             }
         },
         "weather": {
-            "clear-night": "Selkeää yöllä",
+            "clear-night": "Yö, selkeää",
             "cloudy": "Pilvistä",
             "fog": "Sumuista",
-            "hail": "Raekuuro",
-            "lightning": "Ukkosvaara",
+            "hail": "Raekuuroja",
+            "lightning": "Ukkoskuuroja",
             "lightning-rainy": "Ukkosvaara, sateista",
             "partlycloudy": "Osittain pilvistä",
-            "pouring": "Tihkuista",
+            "pouring": "Kaatosadetta",
             "rainy": "Sateista",
             "snowy": "Lumisadetta",
             "snowy-rainy": "Räntäsadetta",
-            "sunny": "Aurinkoinen",
-            "windy": "Tuulinen",
-            "windy-variant": "Tuulinen"
+            "sunny": "Aurinkoista",
+            "windy": "Tuulista",
+            "windy-variant": "Tuulista"
         },
         "vacuum": {
             "cleaning": "Imuroi",
@@ -350,6 +351,23 @@
                         "core": {
                             "header": "Asetusten ja palvelimen hallinta",
                             "introduction": "Tiedämme, että asetusten muuttaminen saattaa olla työlästä. Täältä löydät työkaluja, jotka toivottavasti helpottavat elämääsi.",
+                            "core_config": {
+                                "edit_requires_storage": "Editori on poistettu käytöstä, koska asetuksia on annettu configuration.yaml:ssa.",
+                                "location_name": "Home Assistant -järjestelmäsi nimi",
+                                "latitude": "Leveysaste",
+                                "longitude": "Pituusaste",
+                                "elevation": "Korkeus merenpinnasta",
+                                "elevation_meters": "metriä",
+                                "time_zone": "Aikavyöhyke",
+                                "unit_system": "Yksikköjärjestelmä",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metrinen",
+                                "imperial_example": "Fahrenheit, paunaa",
+                                "metric_example": "Celsius, kilogrammat",
+                                "save_button": "Tallenna"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Asetusten tarkistus",
                                 "introduction": "Voit tarkistaa asetuksesi varmistuaksesi, että niissä ei ole virheitä",
@@ -370,21 +388,6 @@
                                 "introduction": "Hallitse Home Assistantia... suoraan Home Assistantista",
                                 "restart": "Käynnistä uudelleen",
                                 "stop": "Pysäytä"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editori on poistettu käytöstä, koska asetuksia on annettu configuration.yaml:ssa.",
-                                "location_name": "Home Assistant -järjestelmäsi nimi",
-                                "latitude": "Leveysaste",
-                                "longitude": "Pituusaste",
-                                "elevation": "Korkeus merenpinnasta",
-                                "elevation_meters": "metriä",
-                                "time_zone": "Aikavyöhyke",
-                                "unit_system": "Yksikköjärjestelmä",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metrinen",
-                                "imperial_example": "Fahrenheit, paunaa",
-                                "metric_example": "Celsius, kilogrammat",
-                                "save_button": "Tallenna"
                             }
                         }
                     }
@@ -586,7 +589,12 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Z-Wave -verkon asetukset"
+                    "description": "Z-Wave -verkon asetukset",
+                    "services": {
+                        "test_network": "Testaa verkkoyhteys",
+                        "save_config": "Tallenna asetukset",
+                        "cancel_command": "Peruuta komento"
+                    }
                 },
                 "users": {
                     "caption": "Käyttäjät",
@@ -640,7 +648,7 @@
                     "config_flow": {
                         "external_step": {
                             "description": "Tämä vaihe edellyttää, että vierailet ulkopuolisella verkkosivustolla.",
-                            "open_site": "Avaa verkkosivua"
+                            "open_site": "Avaa verkkosivusto"
                         }
                     }
                 },
@@ -665,7 +673,7 @@
                 },
                 "area_registry": {
                     "caption": "Aluerekisteri",
-                    "description": "Yleiskatsaus kaikki kotisi alueista.",
+                    "description": "Yleiskuva kaikista kotisi alueista.",
                     "picker": {
                         "header": "Aluekisteri",
                         "introduction": "Alueita käytetään laitteiden järjestämiseen. Näitä tietoja käytetään Home Assistantissa käyttöliittymän ja käyttöoikeuksien järjestämiseen sekä integroinnin muihin järjestelmiin.",
@@ -779,6 +787,10 @@
                     "step_done": "Asetus tehty {step}",
                     "close": "Sulje",
                     "submit": "Lähetä"
+                },
+                "logout": "Kirjaudu ulos",
+                "force_narrow": {
+                    "header": "Piilota sivupalkki aina"
                 }
             },
             "page-authorize": {
@@ -1070,25 +1082,25 @@
                     "humidity": "Kosteus",
                     "temperature": "Lämpötila",
                     "visibility": "Näkyvyys",
-                    "wind_speed": "Tuulennopeus"
+                    "wind_speed": "Tuuli"
                 },
                 "cardinal_direction": {
-                    "e": "E",
-                    "ene": "ENE",
-                    "ese": "ESE",
-                    "n": "N",
-                    "ne": "NE",
-                    "nne": "NNE",
-                    "nw": "NW",
-                    "nnw": "NNW",
-                    "s": "S",
-                    "se": "SE",
-                    "sse": "SSE",
-                    "ssw": "SSW",
-                    "sw": "SW",
-                    "w": "Länsi",
-                    "wnw": "WNW",
-                    "wsw": "WSW"
+                    "e": "itä",
+                    "ene": "itäkoillinen",
+                    "ese": "itäkaakko",
+                    "n": "pohjoinen",
+                    "ne": "koillinen",
+                    "nne": "pohjoiskoillinen",
+                    "nw": "luode",
+                    "nnw": "pohjoisluode",
+                    "s": "etelä",
+                    "se": "kaakko",
+                    "sse": "eteläkaakko",
+                    "ssw": "etelälounas",
+                    "sw": "lounas",
+                    "w": "länsi",
+                    "wnw": "länsiluode",
+                    "wsw": "länsilounas"
                 },
                 "forecast": "Sääennuste"
             },
@@ -1135,7 +1147,8 @@
                 "fan_mode": "Tuuletustila",
                 "swing_mode": "Heilutustila",
                 "away_mode": "Poissa kotoa -tila",
-                "aux_heat": "Lisälämpö"
+                "aux_heat": "Lisälämpö",
+                "preset_mode": "Esiasetus"
             },
             "lock": {
                 "code": "Koodi",
@@ -1271,15 +1284,30 @@
         "weather": {
             "humidity": "Kosteus",
             "visibility": "Näkyvyys",
-            "wind_speed": "Tuulennopeus"
+            "wind_speed": "Tuuli"
         }
     },
     "state_attributes": {
         "climate": {
             "fan_mode": {
-                "off": "Pois päältä",
+                "off": "Sammutettu",
                 "on": "Päällä",
                 "auto": "Auto"
+            },
+            "preset_mode": {
+                "none": "Asettamatta",
+                "eco": "Ekonominen",
+                "away": "Poissa",
+                "home": "Kotona",
+                "sleep": "Nukkumassa"
+            },
+            "hvac_action": {
+                "off": "Sammutettu",
+                "heating": "Lämmitys",
+                "cooling": "Jäähdytys",
+                "drying": "Kuivaus",
+                "idle": "Lepotilassa",
+                "fan": "Tuuletin"
             }
         }
     },
diff --git a/translations/fr.json b/translations/fr.json
index c9f61faad7..3f38518776 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Configuration et contrôle du serveur",
                             "introduction": "Changer votre configuration peut être un processus fastidieux. Nous le savons. Cette section va essayer de vous rendre la vie un peu plus facile.",
+                            "core_config": {
+                                "edit_requires_storage": "L'éditeur est désactivé car la configuration est stockée dans configuration.yaml.",
+                                "location_name": "Nom de votre installation Home Assistant",
+                                "latitude": "Latitude",
+                                "longitude": "Longitude",
+                                "elevation": "Élévation",
+                                "elevation_meters": "mètres",
+                                "time_zone": "Fuseau horaire",
+                                "unit_system": "Système d'unité",
+                                "unit_system_imperial": "Impérial",
+                                "unit_system_metric": "Métrique",
+                                "imperial_example": "Fahrenheit, livres",
+                                "metric_example": "Celsius, kilogrammes",
+                                "save_button": "Enregistrer"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validation de la configuration",
                                 "introduction": "Validez votre configuration si vous l'avez récemment modifiée et que vous voulez vous assurer que tout est valide",
@@ -374,21 +391,6 @@
                                 "introduction": "Contrôlez votre serveur Home Assistant... depuis Home Assistant.",
                                 "restart": "Redémarrer",
                                 "stop": "Arrêter"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "L'éditeur est désactivé car la configuration est stockée dans configuration.yaml.",
-                                "location_name": "Nom de votre installation Home Assistant",
-                                "latitude": "Latitude",
-                                "longitude": "Longitude",
-                                "elevation": "Élévation",
-                                "elevation_meters": "mètres",
-                                "time_zone": "Fuseau horaire",
-                                "unit_system": "Système d'unité",
-                                "unit_system_imperial": "Impérial",
-                                "unit_system_metric": "Métrique",
-                                "imperial_example": "Fahrenheit, livres",
-                                "metric_example": "Celsius, kilogrammes",
-                                "save_button": "Enregistrer"
                             }
                         }
                     }
diff --git a/translations/gsw.json b/translations/gsw.json
index 59074d5669..1495e544fe 100644
--- a/translations/gsw.json
+++ b/translations/gsw.json
@@ -274,7 +274,7 @@
             "config": {
                 "core": {
                     "section": {
-                        "core": {
+                        "server_control": {
                             "server_management": {
                                 "restart": "Neustart",
                                 "stop": "Stop"
diff --git a/translations/he.json b/translations/he.json
index 5c3448361e..fec5bb97dc 100644
--- a/translations/he.json
+++ b/translations/he.json
@@ -350,6 +350,23 @@
                         "core": {
                             "header": "שליטה על הקונפיגורציה ועל השרת",
                             "introduction": "שינוי התצורה שלך יכול להיות תהליך מייגע. אנחנו יודעים. חלק זה ינסה להפוך את החיים שלך קצת יותר קלים.",
+                            "core_config": {
+                                "edit_requires_storage": "עורך מושבת משום שתצורה מאוחסנת ב- configuration.yaml.",
+                                "location_name": "שם ההתקנה של הבית שלך",
+                                "latitude": "קו רוחב",
+                                "longitude": "קו אורך",
+                                "elevation": "גובה",
+                                "elevation_meters": "מטר",
+                                "time_zone": "איזור זמן",
+                                "unit_system": "יחידת מידה",
+                                "unit_system_imperial": "אימפריאלי",
+                                "unit_system_metric": "מטרי",
+                                "imperial_example": "פרנהייט, פאונד",
+                                "metric_example": "צלזיוס, ק\"ג",
+                                "save_button": "שמור"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "בדיקת הקונפיגורציה",
                                 "introduction": "אמת את הקונפיגורציה שלך אם ביצעת לאחרונה שינויים מסוימים וברצונך לוודא שהיא תקניה",
@@ -370,21 +387,6 @@
                                 "introduction": "לשלוט על שרת הHome Assistant שלך... מHome Assistant.",
                                 "restart": "הפעלה מחדש",
                                 "stop": "עצור"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "עורך מושבת משום שתצורה מאוחסנת ב- configuration.yaml.",
-                                "location_name": "שם ההתקנה של הבית שלך",
-                                "latitude": "קו רוחב",
-                                "longitude": "קו אורך",
-                                "elevation": "גובה",
-                                "elevation_meters": "מטר",
-                                "time_zone": "איזור זמן",
-                                "unit_system": "יחידת מידה",
-                                "unit_system_imperial": "אימפריאלי",
-                                "unit_system_metric": "מטרי",
-                                "imperial_example": "פרנהייט, פאונד",
-                                "metric_example": "צלזיוס, ק\"ג",
-                                "save_button": "שמור"
                             }
                         }
                     }
diff --git a/translations/hr.json b/translations/hr.json
index d683367254..e9353c4116 100644
--- a/translations/hr.json
+++ b/translations/hr.json
@@ -323,7 +323,9 @@
                     "caption": "Općenito",
                     "section": {
                         "core": {
-                            "header": "Konfiguracija i kontrola poslužitelja",
+                            "header": "Konfiguracija i kontrola poslužitelja"
+                        },
+                        "server_control": {
                             "validation": {
                                 "check_config": "Provjerite konfiguraciju",
                                 "valid": "Konfiguracija valjana!",
diff --git a/translations/hu.json b/translations/hu.json
index ea51d434d3..a573efd697 100644
--- a/translations/hu.json
+++ b/translations/hu.json
@@ -141,7 +141,8 @@
             "high_demand": "Magas igénybevétel",
             "heat_pump": "Hőszivattyú",
             "gas": "Gáz",
-            "manual": "Manuális"
+            "manual": "Manuális",
+            "heat_cool": "Fűtés\/Hűtés"
         },
         "configurator": {
             "configure": "Beállítás",
@@ -319,10 +320,13 @@
                         "title": "Események"
                     },
                     "templates": {
-                        "title": "Sablonok"
+                        "title": "Sablon"
                     },
                     "mqtt": {
                         "title": "MQTT"
+                    },
+                    "info": {
+                        "title": "Infó"
                     }
                 }
             },
@@ -350,6 +354,23 @@
                         "core": {
                             "header": "Konfiguráció és szerver vezérlés",
                             "introduction": "Tudjuk, hogy a konfiguráció módosítása fárasztó folyamat lehet. Ez a rész megpróbálja egy kicsit könnyebbé tenni az életed.",
+                            "core_config": {
+                                "edit_requires_storage": "A szerkesztő le van tiltva, mert a konfiguráció a configuration.yaml fájlban van tárolva.",
+                                "location_name": "A Home Assistant rendszered neve",
+                                "latitude": "Szélesség",
+                                "longitude": "Hosszúság",
+                                "elevation": "Magasság",
+                                "elevation_meters": "méter",
+                                "time_zone": "Időzóna",
+                                "unit_system": "Egységrendszer",
+                                "unit_system_imperial": "Angolszász",
+                                "unit_system_metric": "Metrikus",
+                                "imperial_example": "Fahrenheit, font",
+                                "metric_example": "Celsius, kilogramm",
+                                "save_button": "Mentés"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Konfiguráció érvényesítés",
                                 "introduction": "Érvényesítsd a konfigurációt, ha nemrégiben módosítottad azt, és meg szeretnél bizonyosodni róla, hogy minden érvényes",
@@ -370,21 +391,6 @@
                                 "introduction": "Home Assistant szerver vezérlése... a Home Assistant-ból.",
                                 "restart": "Újraindítás",
                                 "stop": "Leállítás"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "A szerkesztő le van tiltva, mert a konfiguráció a configuration.yaml fájlban van tárolva.",
-                                "location_name": "A Home Assistant rendszered neve",
-                                "latitude": "Szélesség",
-                                "longitude": "Hosszúság",
-                                "elevation": "Magasság",
-                                "elevation_meters": "méter",
-                                "time_zone": "Időzóna",
-                                "unit_system": "Egységrendszer",
-                                "unit_system_imperial": "Angolszász",
-                                "unit_system_metric": "Metrikus",
-                                "imperial_example": "Fahrenheit, font",
-                                "metric_example": "Celsius, kilogramm",
-                                "save_button": "Mentés"
                             }
                         }
                     }
@@ -586,7 +592,36 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Z-Wave hálózat kezelése"
+                    "description": "Z-Wave hálózat kezelése",
+                    "network_management": {
+                        "header": "Z-Wave hálózat menedzsment"
+                    },
+                    "network_status": {
+                        "network_stopped": "Z-Wave hálózat leállt",
+                        "network_starting": "Z-Wave hálózat indítása...",
+                        "network_starting_note": "Ez eltarthat egy ideig a hálózat méretétől függően.",
+                        "network_started": "Z-Wave hálózat elindult",
+                        "network_started_note_some_queried": "Az elérhető csomópontok le lettek kérdezve. Az alvó csomópontok akkor lesznek lekérdezve, ha elérhetővé válnak.",
+                        "network_started_note_all_queried": "Minden csomópont le lett kérdezve."
+                    },
+                    "services": {
+                        "start_network": "Hálózat indítása",
+                        "stop_network": "Hálózat leállítása",
+                        "test_network": "Hálózat tesztelése",
+                        "save_config": "Konfiguráció mentése",
+                        "add_node_secure": "Biztonságos csomópont hozzáadása",
+                        "add_node": "Csomópont hozzáadása",
+                        "remove_node": "Csomópont eltávolítása",
+                        "cancel_command": "Parancs megszakítása"
+                    },
+                    "common": {
+                        "value": "Érték",
+                        "instance": "Példány",
+                        "index": "Index"
+                    },
+                    "values": {
+                        "header": "Csomópont értékek"
+                    }
                 },
                 "users": {
                     "caption": "Felhasználók",
@@ -779,6 +814,11 @@
                     "step_done": "{step} beállítás elvégezve",
                     "close": "Bezárás",
                     "submit": "Küldés"
+                },
+                "logout": "Kijelentkezés",
+                "force_narrow": {
+                    "header": "Mindig rejtse el az oldalsávot",
+                    "description": "Ez alapértelmezés szerint elrejti az oldalsávot, hasonlóan a mobil verzióhoz."
                 }
             },
             "page-authorize": {
@@ -1291,6 +1331,14 @@
                 "home": "Otthon",
                 "sleep": "Alvás",
                 "activity": "Tevékenység"
+            },
+            "hvac_action": {
+                "off": "Ki",
+                "heating": "Fűtés",
+                "cooling": "Hűtés",
+                "drying": "Szárítás",
+                "idle": "Tétlen",
+                "fan": "Ventilátor"
             }
         }
     },
diff --git a/translations/id.json b/translations/id.json
index 3428462df3..ead891769d 100644
--- a/translations/id.json
+++ b/translations/id.json
@@ -342,6 +342,11 @@
                         "core": {
                             "header": "Konfigurasi dan kontrol server",
                             "introduction": "Merubah konfigurasi bisa menjadi proses yang melelahkan. Kami tahu. Bagian ini akan mencoba membuatnya menjadi sedikit lebih mudah.",
+                            "core_config": {
+                                "save_button": "Simpan"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validasi konfigurasi",
                                 "introduction": "Validasikan konfigurasi anda jika anda baru saja membuat beberapa perubahan pada konfigurasi anda dan ingin memastikan semuanya valid",
@@ -362,9 +367,6 @@
                                 "introduction": "Kontrol server Home Assistant anda ... dari Home Assistant.",
                                 "restart": "Ulang kembali",
                                 "stop": "Berhenti"
-                            },
-                            "core_config": {
-                                "save_button": "Simpan"
                             }
                         }
                     }
diff --git a/translations/is.json b/translations/is.json
index f776658328..3bc6c8e374 100644
--- a/translations/is.json
+++ b/translations/is.json
@@ -314,6 +314,23 @@
                         "core": {
                             "header": "Stillingar og stjórnun þjóns",
                             "introduction": "Að breyta stillingum getur verið þreytandi ferli og við vitum það. Þetta svæði mun reyna að létta þér lífið hvað það varðar.",
+                            "core_config": {
+                                "edit_requires_storage": "Ritill er óvirkur af því að stillingar eru vistaðar í configuration.yaml.",
+                                "location_name": "Nafnið á Home Assistant uppsetningunni",
+                                "latitude": "Breiddargráða",
+                                "longitude": "Lengdargráða",
+                                "elevation": "Hækkun",
+                                "elevation_meters": "metrar",
+                                "time_zone": "Tímabelti",
+                                "unit_system": "Einingarkerfi",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metra",
+                                "imperial_example": "Fahrenheit, pund",
+                                "metric_example": "Celsíus, kílógrömm",
+                                "save_button": "Vista"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Staðfesta stillingar",
                                 "introduction": "Staðfestu stillingarnar þínar ef þú hefur gert breytingar á stillingum og vilt ganga úr skugga um að þær séu í lagi",
@@ -334,21 +351,6 @@
                                 "introduction": "Stjórna Home Assistant miðlara... frá Home Assistant.",
                                 "restart": "Endurræsa",
                                 "stop": "Stöðva"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Ritill er óvirkur af því að stillingar eru vistaðar í configuration.yaml.",
-                                "location_name": "Nafnið á Home Assistant uppsetningunni",
-                                "latitude": "Breiddargráða",
-                                "longitude": "Lengdargráða",
-                                "elevation": "Hækkun",
-                                "elevation_meters": "metrar",
-                                "time_zone": "Tímabelti",
-                                "unit_system": "Einingarkerfi",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metra",
-                                "imperial_example": "Fahrenheit, pund",
-                                "metric_example": "Celsíus, kílógrömm",
-                                "save_button": "Vista"
                             }
                         }
                     }
@@ -452,7 +454,7 @@
                                     "leave": "Brottför"
                                 }
                             },
-                            "learn_more": "Læra meira um gikki"
+                            "learn_more": "Læra meira um kveikjur"
                         },
                         "conditions": {
                             "header": "Skilyrði",
@@ -856,6 +858,7 @@
                     }
                 },
                 "integration": {
+                    "intro": "Tæki og þjónustur koma fram í Home Assistant sem samþættingar. Þú getur farið í uppsetningu á þeim núna eða síðar í gegnum stillingar skjáinn.",
                     "more_integrations": "Meira",
                     "finish": "Ljúka"
                 },
diff --git a/translations/it.json b/translations/it.json
index f093f9128d..4e9d85df5c 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -141,7 +141,8 @@
             "high_demand": "Forte richiesta",
             "heat_pump": "Pompa di calore",
             "gas": "Gas",
-            "manual": "Manuale"
+            "manual": "Manuale",
+            "heat_cool": "Caldo\/Freddo"
         },
         "configurator": {
             "configure": "Configura",
@@ -350,6 +351,23 @@
                         "core": {
                             "header": "Configurazione e controllo del server",
                             "introduction": "Cambiare la configurazione può essere un processo faticoso. Lo sappiamo. Questa sezione cercherà di semplificarti la vita.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor disabilitato perché la configurazione è memorizzata in configuration.yaml.",
+                                "location_name": "Nome della tua installazione di Home Assistant",
+                                "latitude": "Latitudine",
+                                "longitude": "Logitudine",
+                                "elevation": "Altitudine",
+                                "elevation_meters": "Metri",
+                                "time_zone": "Fuso orario",
+                                "unit_system": "Unità di misura",
+                                "unit_system_imperial": "Imperiale",
+                                "unit_system_metric": "metrico",
+                                "imperial_example": "Fahrenheit, libbre",
+                                "metric_example": "Celsius, chilogrammi",
+                                "save_button": "Salva"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Convalida della configurazione",
                                 "introduction": "Convalidare la configurazione se di recente sono state apportate alcune modifiche alla configurazione e si desidera assicurarsi che sia tutto valido",
@@ -370,21 +388,6 @@
                                 "introduction": "Controllare il server Home Assistant... da Home Assistant.",
                                 "restart": "Riavviare",
                                 "stop": "Stop"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor disabilitato perché la configurazione è memorizzata in configuration.yaml.",
-                                "location_name": "Nome della tua installazione di Home Assistant",
-                                "latitude": "Latitudine",
-                                "longitude": "Logitudine",
-                                "elevation": "Altitudine",
-                                "elevation_meters": "Metri",
-                                "time_zone": "Fuso orario",
-                                "unit_system": "Unità di misura",
-                                "unit_system_imperial": "Imperiale",
-                                "unit_system_metric": "metrico",
-                                "imperial_example": "Fahrenheit, libbre",
-                                "metric_example": "Celsius, chilogrammi",
-                                "save_button": "Salva"
                             }
                         }
                     }
@@ -586,7 +589,11 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Gestisci la tua rete Z-Wave"
+                    "description": "Gestisci la tua rete Z-Wave",
+                    "network_status": {
+                        "network_starting": "Inizializzazione della rete Z-Wave...",
+                        "network_started": "Rete Z-Wave inizializzata"
+                    }
                 },
                 "users": {
                     "caption": "Utenti",
@@ -779,6 +786,11 @@
                     "step_done": "Installazione completata per {step}",
                     "close": "Chiudi",
                     "submit": "Invia"
+                },
+                "logout": "Disconnetti",
+                "force_narrow": {
+                    "header": "Nascondi sempre la barra laterale",
+                    "description": "Questo nasconderà la barra laterale per impostazione predefinita, in modo simile all'esperienza mobile"
                 }
             },
             "page-authorize": {
@@ -1288,6 +1300,13 @@
                 "home": "Casa",
                 "sleep": "Sleep",
                 "activity": "Attività"
+            },
+            "hvac_action": {
+                "off": "Spento",
+                "cooling": "Raffreddamento",
+                "drying": "Asciugatura",
+                "idle": "Inattivo",
+                "fan": "Ventilatore"
             }
         }
     },
diff --git a/translations/ja.json b/translations/ja.json
index adb041387f..e75dc0f5da 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -202,7 +202,7 @@
                     "caption": "一般",
                     "description": "設定ファイルの検証とサーバーの操作",
                     "section": {
-                        "core": {
+                        "server_control": {
                             "validation": {
                                 "heading": "設定の検証",
                                 "check_config": "設定を確認",
diff --git a/translations/ko.json b/translations/ko.json
index c3fdc34de4..7dbb033404 100644
--- a/translations/ko.json
+++ b/translations/ko.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "구성 내용 설정 및 서버 제어",
                             "introduction": "구성 내용의 설정을 변경하는 것은 때때로 난해하고 귀찮은 작업입니다. 여기서 설정 변경을 좀 더 쉽게 하실 수 있습니다.",
+                            "core_config": {
+                                "edit_requires_storage": "구성내용이 configuration.yaml 에 저장되어 있기 때문에 편집기가 비활성화 되었습니다.",
+                                "location_name": "Home Assistant 이름",
+                                "latitude": "위도",
+                                "longitude": "경도",
+                                "elevation": "고도",
+                                "elevation_meters": "미터",
+                                "time_zone": "시간대",
+                                "unit_system": "단위",
+                                "unit_system_imperial": "야드파운드법",
+                                "unit_system_metric": "미터법",
+                                "imperial_example": "화씨, 파운드",
+                                "metric_example": "섭씨, 킬로그램",
+                                "save_button": "저장"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "구성 내용 유효성 검사",
                                 "introduction": "최근에 구성 내용을 추가 혹은 변경하셨다면, 설정 확인 버튼을 눌러 구성 내용이 올바른지 검사하고 Home Assistant 가 정상 작동 되는지 확인하실 수 있습니다.",
@@ -374,21 +391,6 @@
                                 "introduction": "Home Assistant 서버를 제어합니다",
                                 "restart": "재시작",
                                 "stop": "중지"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "구성내용이 configuration.yaml 에 저장되어 있기 때문에 편집기가 비활성화 되었습니다.",
-                                "location_name": "Home Assistant 이름",
-                                "latitude": "위도",
-                                "longitude": "경도",
-                                "elevation": "고도",
-                                "elevation_meters": "미터",
-                                "time_zone": "시간대",
-                                "unit_system": "단위",
-                                "unit_system_imperial": "야드파운드법",
-                                "unit_system_metric": "미터법",
-                                "imperial_example": "화씨, 파운드",
-                                "metric_example": "섭씨, 킬로그램",
-                                "save_button": "저장"
                             }
                         }
                     }
@@ -398,7 +400,7 @@
                     "description": "구성요소를 사용자화 합니다",
                     "picker": {
                         "header": "사용자화",
-                        "introduction": "구성요소의 속성값을 입맛에 맞게 변경할 수 있습니다. 추가 혹은 수정 된 사용자 정의 내용은 즉시 적용되지만, 제거 된 내용은 구성요소가 업데이트 될 때 적용됩니다."
+                        "introduction": "구성요소의 속성값을 입맛에 맞게 변경할 수 있습니다. 추가 혹은 수정된 사용자 정의 내용은 즉시 적용되지만, 제거된 내용은 구성요소가 업데이트 될 때 적용됩니다."
                     }
                 },
                 "automation": {
@@ -406,7 +408,7 @@
                     "description": "자동화를 만들고 편집합니다",
                     "picker": {
                         "header": "자동화 편집",
-                        "introduction": "자동화 편집기를 사용하여 자동화를 작성하고 편집 할 수 있습니다. 아래 링크를 따라 안내사항을 읽고 Home Assistant 를 올바르게 구성했는지 확인해보세요.",
+                        "introduction": "자동화 편집기를 사용하여 자동화를 작성하고 편집할 수 있습니다. 아래 링크를 따라 안내사항을 읽고 Home Assistant 를 올바르게 구성했는지 확인해보세요.",
                         "pick_automation": "편집할 자동화 선택",
                         "no_automations": "편집 가능한 자동화를 찾을 수 없습니다",
                         "add_automation": "자동화 추가하기",
@@ -580,7 +582,7 @@
                             },
                             "learn_more": "동작에 대해 더 알아보기"
                         },
-                        "load_error_not_editable": "automations.yaml 의 자동화만 편집 할 수 있습니다.",
+                        "load_error_not_editable": "automations.yaml 의 자동화만 편집할 수 있습니다.",
                         "load_error_unknown": "자동화를 읽어오는 도중 오류가 발생했습니다 ({err_no})."
                     }
                 },
@@ -704,7 +706,7 @@
                     "description": "영역을 만들고 편집합니다",
                     "picker": {
                         "header": "영역 등록",
-                        "introduction": "영역은 기기가 있는 위치를 설정하는데 사용합니다. 이 정보는 Home Assistant 의 인터페이스 정리, 권한 및 다른 시스템과의 통합 구성에 도움을 줍니다.",
+                        "introduction": "영역은 기기가 있는 위치를 설정하는데 사용합니다. 이 정보는 인터페이스와 권한 그리고 다른 시스템과의 통합을 구성하는 데 도움이 되도록 Home Assistant 에 사용됩니다.",
                         "introduction2": "특정 영역에 기기를 배치하려면 아래 링크를 따라 통합 구성요소 페이지로 이동 한 다음, 설정된 구성요소의 기기를 클릭하여 영역을 설정해주세요.",
                         "integrations_page": "통합 구성요소 페이지",
                         "no_areas": "등록된 영역이 없습니다. 거실, 침실과 같이 영역을 등록해보세요!",
@@ -726,7 +728,7 @@
                         "header": "구성요소",
                         "unavailable": "(사용불가)",
                         "introduction": "Home Assistant 는 구성요소의 식별을 위해 모든 구성요소에 고유한 레지스트리를 부여합니다. 각각의 구성요소들은 자신만의 고유한 구성요소 ID 를 가집니다.",
-                        "introduction2": "구성요소를 편집하여 이름을 대체하거나 구성요소 ID를 변경하고 Home Assistant 에서 항목을 제거하실수도 있습니다. 단, 구성요소 편집창에서 구성요소를 삭제해도 구성요소가 완전히 제거되는것은 아닙니다. 완전히 제거하려면, 아래 링크를 따라 통합 구성요소 페이지에서 제거해주세요.",
+                        "introduction2": "구성요소를 편집하여 이름을 대체하거나 구성요소 ID를 변경하고 Home Assistant 에서 항목을 제거할 수 있습니다. 단, 구성요소 편집창에서 구성요소를 삭제해도 구성요소가 완전히 제거되는 것은 아닙니다. 완전히 제거하려면, 아래 링크를 따라 통합 구성요소 페이지에서 제거해주세요.",
                         "integrations_page": "통합 구성요소 페이지"
                     },
                     "editor": {
@@ -750,11 +752,11 @@
             "profile": {
                 "push_notifications": {
                     "header": "푸시 알림",
-                    "description": "이 기기에 알림 보내기",
+                    "description": "이 기기에 알림을 보냅니다.",
                     "error_load_platform": "notify.html5 를 구성해주세요.",
                     "error_use_https": "SSL 을 통한 보안 연결된 환경이 필요합니다.",
                     "push_notifications": "푸시 알림",
-                    "link_promo": "더 알아보기"
+                    "link_promo": "알림에 대해 더 알아보기"
                 },
                 "language": {
                     "header": "언어",
@@ -764,7 +766,7 @@
                 "themes": {
                     "header": "테마",
                     "error_no_theme": "사용할 수 있는 테마가 없습니다.",
-                    "link_promo": "테마에 대해 알아보기",
+                    "link_promo": "테마에 대해 더 알아보기",
                     "dropdown_label": "테마"
                 },
                 "refresh_tokens": {
@@ -819,7 +821,7 @@
                 "logout": "로그아웃",
                 "force_narrow": {
                     "header": "항상 사이드바 숨기기",
-                    "description": "모바일 환경과 마찬가지로 기본적으로 사이드 바를 숨깁니다."
+                    "description": "모바일 환경과 마찬가지로 기본적으로 사이드 바가 숨겨집니다."
                 }
             },
             "page-authorize": {
@@ -1327,10 +1329,10 @@
                 "none": "없음",
                 "eco": "절전",
                 "away": "외출",
-                "boost": "부스트",
+                "boost": "쾌속",
                 "comfort": "쾌적",
                 "home": "재실",
-                "sleep": "수면",
+                "sleep": "취침",
                 "activity": "활동"
             },
             "hvac_action": {
diff --git a/translations/lb.json b/translations/lb.json
index 99a7e007ae..e8ca12e030 100644
--- a/translations/lb.json
+++ b/translations/lb.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Konfiguratioun an Server Kontroll",
                             "introduction": "D'Ännere vun der Konfiguratioun kann e lästege Prozess sinn. Mir wëssen dat. Dës Sektioun probéiert fir Äert Liewen e bësse méi einfach ze maachen.",
+                            "core_config": {
+                                "edit_requires_storage": "Editeur ass desaktivéiert well d'Konfiguratioun an der configuration.yaml gespäichert ass.",
+                                "location_name": "Numm vun der Home Assistant Installatioun",
+                                "latitude": "Breedegrad",
+                                "longitude": "Längegrad",
+                                "elevation": "Héicht",
+                                "elevation_meters": "Meter",
+                                "time_zone": "Zäitzone",
+                                "unit_system": "Eenheetesystem",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metresch",
+                                "imperial_example": "Fahrenheit, Pënner",
+                                "metric_example": "Celsius, Kilogramm",
+                                "save_button": "Späicheren"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validatioun vun der Konfiguratioun",
                                 "introduction": "Validéiert är Konfiguratioun wann Dir viru kuerzem e puer Ännerungen an ärer Konfiguratioun gemaacht hutt a wëllt sécher sinn datt alles gëlteg ass",
@@ -374,21 +391,6 @@
                                 "introduction": "Kontrolléiert ären Home Assistant Server ... vun Home Assistant aus.",
                                 "restart": "Neistart",
                                 "stop": "Stop"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editeur ass desaktivéiert well d'Konfiguratioun an der configuration.yaml gespäichert ass.",
-                                "location_name": "Numm vun der Home Assistant Installatioun",
-                                "latitude": "Breedegrad",
-                                "longitude": "Längegrad",
-                                "elevation": "Héicht",
-                                "elevation_meters": "Meter",
-                                "time_zone": "Zäitzone",
-                                "unit_system": "Eenheetesystem",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metresch",
-                                "imperial_example": "Fahrenheit, Pënner",
-                                "metric_example": "Celsius, Kilogramm",
-                                "save_button": "Späicheren"
                             }
                         }
                     }
@@ -816,7 +818,11 @@
                     "close": "Zoumaachen",
                     "submit": "Ofschécken"
                 },
-                "logout": "Ausloggen"
+                "logout": "Ausloggen",
+                "force_narrow": {
+                    "header": "Säiteleescht ëmmer verstoppen",
+                    "description": "Dës Optioun verstoppt d'Säiteleescht, esou wéi op engem mobillen Apparat."
+                }
             },
             "page-authorize": {
                 "initializing": "Initialiséiert",
@@ -1328,6 +1334,14 @@
                 "home": "Doheem",
                 "sleep": "Schlofen",
                 "activity": "Aktivitéit"
+            },
+            "hvac_action": {
+                "off": "Aus",
+                "heating": "Hëtzen",
+                "cooling": "Ofkillen",
+                "drying": "Dréchnen",
+                "idle": "Waart",
+                "fan": "Ventilator"
             }
         }
     },
diff --git a/translations/lv.json b/translations/lv.json
index 38ba4c69c5..2a62aaddf5 100644
--- a/translations/lv.json
+++ b/translations/lv.json
@@ -334,6 +334,21 @@
                         "core": {
                             "header": "Konfigurācijas un servera pārvaldība",
                             "introduction": "Izmaiņas konfigurācijā var būt nogurdinošs process. Mēs zinām. Šai sadaļai vajadzētu padarīt dzīvi mazliet vieglāku.",
+                            "core_config": {
+                                "edit_requires_storage": "Redaktors ir atspējots, jo konfigurācija ir definēta configuration.yaml.",
+                                "location_name": "Jūsu Home Assistant instalācijas nosaukums",
+                                "elevation": "Augstums",
+                                "elevation_meters": "metri",
+                                "time_zone": "Laika josla",
+                                "unit_system": "Mērvienību sistēma",
+                                "unit_system_imperial": "Imperiālā",
+                                "unit_system_metric": "Metriskā",
+                                "imperial_example": "Fārenheita, mārciņas",
+                                "metric_example": "Celsija, kilogrami",
+                                "save_button": "Saglabāt"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Konfigurācijas pārbaude",
                                 "introduction": "Veiciet konfigurācijas pārbaudi, ja nesen esat veicis izmaiņas konfigurācijā un vēlaties pārliecināties, ka tā ir korekta.",
@@ -354,19 +369,6 @@
                                 "introduction": "Pārvaldiet Home Assistant serveri no Home Assistant saskarnes.",
                                 "restart": "Restartēt",
                                 "stop": "Apturēt"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Redaktors ir atspējots, jo konfigurācija ir definēta configuration.yaml.",
-                                "location_name": "Jūsu Home Assistant instalācijas nosaukums",
-                                "elevation": "Augstums",
-                                "elevation_meters": "metri",
-                                "time_zone": "Laika josla",
-                                "unit_system": "Mērvienību sistēma",
-                                "unit_system_imperial": "Imperiālā",
-                                "unit_system_metric": "Metriskā",
-                                "imperial_example": "Fārenheita, mārciņas",
-                                "metric_example": "Celsija, kilogrami",
-                                "save_button": "Saglabāt"
                             }
                         }
                     }
diff --git a/translations/nb.json b/translations/nb.json
index 8426048ddb..390d5bad5e 100644
--- a/translations/nb.json
+++ b/translations/nb.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Konfigurasjon og serverkontroll",
                             "introduction": "Endring av konfigurasjonen kan være en slitsom prosess, det vet vi. Denne delen vil forsøke å gjøre livet ditt litt lettere.",
+                            "core_config": {
+                                "edit_requires_storage": "Redigering deaktivert da konfigurasjonen er lagret i configuration.yaml.",
+                                "location_name": "Navn på installasjonen av Home Assistant",
+                                "latitude": "Breddegrad",
+                                "longitude": "Lengdegrad",
+                                "elevation": "Høyde",
+                                "elevation_meters": "meter",
+                                "time_zone": "Tidssone",
+                                "unit_system": "Enhetssystem",
+                                "unit_system_imperial": "Imperisk",
+                                "unit_system_metric": "Metrisk",
+                                "imperial_example": "Fahrenheit, pund",
+                                "metric_example": "Celsius, kilogram",
+                                "save_button": "Lagre"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Konfigurasjonsvalidering",
                                 "introduction": "Sjekk konfigurasjon din hvis du nylig har gjort noen endringer og ønsker å være sikker på at den er gyldig ved å kjøre en valideringstest",
@@ -374,21 +391,6 @@
                                 "introduction": "Kontroller din Home Assistant server... fra Home Assistant.",
                                 "restart": "Start på nytt",
                                 "stop": "Stopp"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Redigering deaktivert da konfigurasjonen er lagret i configuration.yaml.",
-                                "location_name": "Navn på installasjonen av Home Assistant",
-                                "latitude": "Breddegrad",
-                                "longitude": "Lengdegrad",
-                                "elevation": "Høyde",
-                                "elevation_meters": "meter",
-                                "time_zone": "Tidssone",
-                                "unit_system": "Enhetssystem",
-                                "unit_system_imperial": "Imperisk",
-                                "unit_system_metric": "Metrisk",
-                                "imperial_example": "Fahrenheit, pund",
-                                "metric_example": "Celsius, kilogram",
-                                "save_button": "Lagre"
                             }
                         }
                     }
@@ -614,6 +616,14 @@
                         "add_node": "Legg til node",
                         "remove_node": "Fjern node",
                         "cancel_command": "Avbryt kommando"
+                    },
+                    "common": {
+                        "value": "Verdi",
+                        "instance": "Forekomst",
+                        "index": "Indeks"
+                    },
+                    "values": {
+                        "header": "Nodeverdier"
                     }
                 },
                 "users": {
@@ -808,7 +818,11 @@
                     "close": "Lukk",
                     "submit": "Send inn"
                 },
-                "logout": "Logg ut"
+                "logout": "Logg ut",
+                "force_narrow": {
+                    "header": "Skjul alltid sidepanelet",
+                    "description": "Dette vil skjule sidepanelet som standard, tilsvarende opplevelsen på en mobil."
+                }
             },
             "page-authorize": {
                 "initializing": "Initialiserer",
@@ -1320,6 +1334,14 @@
                 "home": "Hjem",
                 "sleep": "Sove",
                 "activity": "Aktivitet"
+            },
+            "hvac_action": {
+                "off": "Av",
+                "heating": "Oppvarming",
+                "cooling": "Kjøling",
+                "drying": "Tørking",
+                "idle": "Inaktiv",
+                "fan": "Vifte"
             }
         }
     },
diff --git a/translations/nl.json b/translations/nl.json
index a2d7254cd7..92cb0cc502 100644
--- a/translations/nl.json
+++ b/translations/nl.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Configuratie en serverbeheer",
                             "introduction": "Het aanpassen van je configuratie kan een moeizaam proces zijn. Dat weten we. Dit onderdeel probeert je het leven iets makkelijker te maken.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor uitgeschakeld omdat de configuratie is opgeslagen in configuration.yaml",
+                                "location_name": "Naam van Home Assistant installatie",
+                                "latitude": "Breedtegraad",
+                                "longitude": "Lengtegraad",
+                                "elevation": "Hoogte",
+                                "elevation_meters": "meter",
+                                "time_zone": "Tijdzone",
+                                "unit_system": "Maatsysteem",
+                                "unit_system_imperial": "Imperiaal",
+                                "unit_system_metric": "Metrisch",
+                                "imperial_example": "Fahrenheit, ponden",
+                                "metric_example": "Celsius, kilogram",
+                                "save_button": "Opslaan"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Valideer configuratie",
                                 "introduction": "Controleer je configuratie als je onlangs wijzigingen hebt aangebracht en zeker wilt weten dat ze geldig zijn",
@@ -374,21 +391,6 @@
                                 "introduction": "Beheer je Home Assistant-server ... vanuit Home Assistant.",
                                 "restart": "Herstarten",
                                 "stop": "Stop"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor uitgeschakeld omdat de configuratie is opgeslagen in configuration.yaml",
-                                "location_name": "Naam van Home Assistant installatie",
-                                "latitude": "Breedtegraad",
-                                "longitude": "Lengtegraad",
-                                "elevation": "Hoogte",
-                                "elevation_meters": "meter",
-                                "time_zone": "Tijdzone",
-                                "unit_system": "Maatsysteem",
-                                "unit_system_imperial": "Imperiaal",
-                                "unit_system_metric": "Metrisch",
-                                "imperial_example": "Fahrenheit, ponden",
-                                "metric_example": "Celsius, kilogram",
-                                "save_button": "Opslaan"
                             }
                         }
                     }
@@ -600,7 +602,7 @@
                         "network_starting": "Z-Wave netwerk starten...",
                         "network_starting_note": "Dit kan een tijdje duren, afhankelijk van de grootte van uw netwerk.",
                         "network_started": "Z-Wave netwerk gestart",
-                        "network_started_note_some_queried": "Alle wakkere nodes zijn opgevraagd. Slapende nodes worden opgevraagd wanneer ze wakker worden.",
+                        "network_started_note_some_queried": "Alle actieve nodes zijn opgevraagd. Inactieve nodes worden opgevraagd wanneer ze actiefworden.",
                         "network_started_note_all_queried": "Alle nodes zijn opgevraagd."
                     },
                     "services": {
@@ -610,7 +612,7 @@
                         "test_network": "Test Netwerk",
                         "soft_reset": "Soft Reset",
                         "save_config": "Configuratie Opslaan",
-                        "add_node_secure": "Knooppunt veilig toevoegen",
+                        "add_node_secure": "Secure Node toevoegen",
                         "add_node": "Node toevoegen",
                         "remove_node": "Node verwijderen",
                         "cancel_command": "Opdracht annuleren"
@@ -816,7 +818,11 @@
                     "close": "Sluiten",
                     "submit": "Verzenden"
                 },
-                "logout": "Uitloggen"
+                "logout": "Uitloggen",
+                "force_narrow": {
+                    "header": "Zijbalk altijd verbergen",
+                    "description": "De zijbalk standaard verbergen, vergelijkbaar met de mobiele ervaring."
+                }
             },
             "page-authorize": {
                 "initializing": "Initialiseren",
@@ -1288,7 +1294,7 @@
         "notify": "Notificeer",
         "plant": "Plant",
         "proximity": "Nabijheid",
-        "remote": "Extern",
+        "remote": "Afstandsbediening",
         "scene": "Scène",
         "script": "Script",
         "sensor": "Sensor",
@@ -1328,6 +1334,14 @@
                 "home": "Thuis",
                 "sleep": "Slapen",
                 "activity": "Activiteit"
+            },
+            "hvac_action": {
+                "off": "Uit",
+                "heating": "Verwarmen",
+                "cooling": "Koelen",
+                "drying": "Ontvochtigen",
+                "idle": "Inactief",
+                "fan": "Ventilator"
             }
         }
     },
diff --git a/translations/nn.json b/translations/nn.json
index dcee8f2c1d..cb39456a4e 100644
--- a/translations/nn.json
+++ b/translations/nn.json
@@ -350,6 +350,22 @@
                         "core": {
                             "header": "Konfigurasjon og serverkontroll",
                             "introduction": "Vi veit at endringar i konfigurasjonen kan vere ein slitsam prosess. Denne delen vil forsøke å gjere livet ditt litt lettare.",
+                            "core_config": {
+                                "location_name": "Namnet på din Home Assistant installasjon",
+                                "latitude": "Breiddegrad",
+                                "longitude": "Lengdegrad",
+                                "elevation": "Høgde",
+                                "elevation_meters": "Meter",
+                                "time_zone": "Tidssone",
+                                "unit_system": "Måleining",
+                                "unit_system_imperial": "Imperisk",
+                                "unit_system_metric": "Metrisk",
+                                "imperial_example": "Fahrenheit, pund",
+                                "metric_example": "Celsius, kilogram",
+                                "save_button": "Spare"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Konfigurasjonsvalidering",
                                 "introduction": "Sjekk konfigurasjonen din dersom du nyleg har gjort endringar og ønsker å vere sikker på at den er gyldig ved å køyre ein valideringstest",
@@ -370,20 +386,6 @@
                                 "introduction": "Kontroller Home Assistant-serveren din... frå Home Assistant.",
                                 "restart": "Omstart",
                                 "stop": "Stopp"
-                            },
-                            "core_config": {
-                                "location_name": "Namnet på din Home Assistant installasjon",
-                                "latitude": "Breiddegrad",
-                                "longitude": "Lengdegrad",
-                                "elevation": "Høgde",
-                                "elevation_meters": "Meter",
-                                "time_zone": "Tidssone",
-                                "unit_system": "Måleining",
-                                "unit_system_imperial": "Imperisk",
-                                "unit_system_metric": "Metrisk",
-                                "imperial_example": "Fahrenheit, pund",
-                                "metric_example": "Celsius, kilogram",
-                                "save_button": "Spare"
                             }
                         }
                     }
diff --git a/translations/pl.json b/translations/pl.json
index 8d8dd40e0d..7957ada8be 100644
--- a/translations/pl.json
+++ b/translations/pl.json
@@ -265,7 +265,7 @@
         },
         "timer": {
             "active": "aktywny",
-            "idle": "bezczynny",
+            "idle": "nieaktywny",
             "paused": "wstrzymany"
         },
         "person": {
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Konfiguracja i kontrola serwera",
                             "introduction": "Zmiana konfiguracji może być męczącym procesem. Wiemy. Ta sekcja postara się ułatwić Ci życie.",
+                            "core_config": {
+                                "edit_requires_storage": "Edytor wyłączony, ponieważ konfiguracja jest przechowywana w pliku configuration.yaml.",
+                                "location_name": "Nazwa instalacji Home Assistant",
+                                "latitude": "Szerokość geograficzna",
+                                "longitude": "Długość geograficzna",
+                                "elevation": "Wysokość",
+                                "elevation_meters": "metry\/-ów",
+                                "time_zone": "Strefa czasowa",
+                                "unit_system": "System metryczny",
+                                "unit_system_imperial": "Imperialny",
+                                "unit_system_metric": "Metryczny",
+                                "imperial_example": "stopnie Fahrenheita, funty",
+                                "metric_example": "stopnie Celsjusza, kilogramy",
+                                "save_button": "Zapisz"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Sprawdzanie konfiguracji",
                                 "introduction": "Jeśli ostatnio wprowadzono zmiany w konfiguracji i chcesz się upewnić, że jest ona poprawna, kliknij Sprawdź konfigurację",
@@ -374,21 +391,6 @@
                                 "introduction": "Kontroluj swój serwer Home Assistant",
                                 "restart": "Uruchom ponownie",
                                 "stop": "Zatrzymaj"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Edytor wyłączony, ponieważ konfiguracja jest przechowywana w pliku configuration.yaml.",
-                                "location_name": "Nazwa instalacji Home Assistant",
-                                "latitude": "Szerokość geograficzna",
-                                "longitude": "Długość geograficzna",
-                                "elevation": "Wysokość",
-                                "elevation_meters": "metry\/-ów",
-                                "time_zone": "Strefa czasowa",
-                                "unit_system": "System metryczny",
-                                "unit_system_imperial": "Imperialny",
-                                "unit_system_metric": "Metryczny",
-                                "imperial_example": "stopnie Fahrenheita, funty",
-                                "metric_example": "stopnie Celsjusza, kilogramy",
-                                "save_button": "Zapisz"
                             }
                         }
                     }
@@ -816,7 +818,11 @@
                     "close": "Zamknij",
                     "submit": "Zatwierdź"
                 },
-                "logout": "Wyloguj"
+                "logout": "Wyloguj",
+                "force_narrow": {
+                    "header": "Zawsze ukrywaj pasek boczny",
+                    "description": "Spowoduje to domyślne ukrycie paska bocznego, podobnie jak w przypadku urządzeń przenośnych."
+                }
             },
             "page-authorize": {
                 "initializing": "Inicjowanie",
@@ -1328,6 +1334,14 @@
                 "home": "w domu",
                 "sleep": "sen",
                 "activity": "aktywność"
+            },
+            "hvac_action": {
+                "off": "wyłączony",
+                "heating": "grzanie",
+                "cooling": "chłodzenie",
+                "drying": "osuszanie",
+                "idle": "nieaktywny",
+                "fan": "wentylator"
             }
         }
     },
diff --git a/translations/pt-BR.json b/translations/pt-BR.json
index e2afff81f4..c8fa0628f9 100644
--- a/translations/pt-BR.json
+++ b/translations/pt-BR.json
@@ -141,7 +141,8 @@
             "high_demand": "Alta demanda",
             "heat_pump": "Bomba de calor",
             "gas": "Gás",
-            "manual": "Manual"
+            "manual": "Manual",
+            "heat_cool": "Quente\/Frio"
         },
         "configurator": {
             "configure": "Configurar",
@@ -297,7 +298,7 @@
         },
         "person": {
             "home": "Home",
-            "not_home": "Longe"
+            "not_home": "Ausente"
         }
     },
     "ui": {
@@ -353,6 +354,23 @@
                         "core": {
                             "header": "Configuração e Controle do Servidor",
                             "introduction": "Alterar sua configuração pode ser um processo cansativo. Nós sabemos. Esta seção tentará tornar sua vida um pouco mais fácil.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor desativado porque a configuração está armazenada em configuration.yaml.",
+                                "location_name": "Nome da sua instalação do Home Assistant",
+                                "latitude": "Latitude",
+                                "longitude": "Longitude",
+                                "elevation": "Elevação",
+                                "elevation_meters": "metros",
+                                "time_zone": "Fuso horário",
+                                "unit_system": "Sistema de unidade",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Métrico",
+                                "imperial_example": "Fahrenheit, libras",
+                                "metric_example": "Celsius, quilogramas",
+                                "save_button": "Salvar"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validação de configuração",
                                 "introduction": "Valide seu código se você recentemente fez algumas mudanças na sua configuração e quer certificar-se de que tudo está correto.",
@@ -373,21 +391,6 @@
                                 "introduction": "Controle seu servidor do Home Assistant... A partir do Home Assistant.",
                                 "restart": "Reiniciar",
                                 "stop": "Parar"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor desativado porque config armazenado em configuration.yaml.",
-                                "location_name": "Nome da sua instalação do Home Assistant",
-                                "latitude": "Latitude",
-                                "longitude": "Longitude",
-                                "elevation": "Elevação",
-                                "elevation_meters": "metros",
-                                "time_zone": "Fuso horário",
-                                "unit_system": "Sistema de unidade",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Métrico",
-                                "imperial_example": "Fahrenheit, libras",
-                                "metric_example": "Celsius, quilogramas",
-                                "save_button": "Salvar"
                             }
                         }
                     }
@@ -605,7 +608,7 @@
                     "services": {
                         "start_network": "Iniciar Rede",
                         "stop_network": "Parar Rede",
-                        "heal_network": "Curar rede",
+                        "heal_network": "Reparar rede",
                         "test_network": "Teste de rede",
                         "soft_reset": "Soft Reset",
                         "save_config": "Salvar Configuração",
@@ -613,6 +616,14 @@
                         "add_node": "Adicionar Nó",
                         "remove_node": "Remover Nó",
                         "cancel_command": "Cancelar Comando"
+                    },
+                    "common": {
+                        "value": "Valor",
+                        "instance": "Instância",
+                        "index": "Índice"
+                    },
+                    "values": {
+                        "header": "Valores de nó"
                     }
                 },
                 "users": {
@@ -641,7 +652,7 @@
                     "caption": "Home Assistant Cloud",
                     "description_login": "Conectado como {email}",
                     "description_not_login": "Não logado",
-                    "description_features": "Controle fora de casa, integrar com Alexa e Google Assistant."
+                    "description_features": "Controle mesmo longe de casa, integrar com Alexa e Google Assistant."
                 },
                 "integrations": {
                     "caption": "Integrações",
@@ -666,7 +677,7 @@
                     },
                     "config_flow": {
                         "external_step": {
-                            "description": "Esta etapa exige que você visite um site externo para ser concluído.",
+                            "description": "Esta etapa exige que você visite um site externo para ser concluída.",
                             "open_site": "Abrir site"
                         }
                     }
@@ -676,17 +687,17 @@
                     "description": "Gerenciamento de rede Zigbee Home Automation",
                     "services": {
                         "reconfigure": "Reconfigure o dispositivo ZHA (curar dispositivo). Use isto se você estiver tendo problemas com o dispositivo. Se o dispositivo em questão for um dispositivo alimentado por bateria, certifique-se de que ele esteja ativo e aceitando comandos ao usar esse serviço.",
-                        "updateDeviceName": "Definir um nome personalizado para este dispositivo no registro do dispositivo.",
+                        "updateDeviceName": "Definir um nome personalizado para este dispositivo no registro de dispositivos.",
                         "remove": "Remova um dispositivo da rede ZigBee."
                     },
                     "device_card": {
                         "device_name_placeholder": "Nome dado pelo usuário",
                         "area_picker_label": "Área",
-                        "update_name_button": "Atualizar nome"
+                        "update_name_button": "Atualizar Nome"
                     },
                     "add_device_page": {
                         "header": "Zigbee Home Automation - Adicionar dispositivos",
-                        "spinner": "Procurando por dispositivos ZHA Zigbee ...",
+                        "spinner": "Procurando por dispositivos ZHA Zigbee…",
                         "discovery_text": "Dispositivos descobertos serão exibidos aqui. Siga as instruções para o(s) seu(s) dispositivo(s) e coloque o(s) dispositivo(s) no modo de emparelhamento."
                     }
                 },
@@ -717,7 +728,7 @@
                         "header": "Registro de Entidade",
                         "unavailable": "(indisponível)",
                         "introduction": "O Home Assistant mantém um registro de todas as entidades que já viu e que podem ser identificadas exclusivamente. Cada uma dessas entidades terá um ID de entidade atribuído, que será reservado apenas para essa entidade.",
-                        "introduction2": "Use o registro da entidade para substituir o nome, alterar o ID da entidade ou remover a entrada do Assistente Inicial. Observe que a remoção da entrada do registro de entidade não removerá a entidade. Para fazer isso, siga o link abaixo e remova-o da página de integrações.",
+                        "introduction2": "Use o registro da entidade para substituir o nome, alterar o ID da entidade ou remover a entrada do Home Assistant. Observe que a remoção do registro de entidade não removerá a entidade totalmente. Para fazer isso, siga o link abaixo e remova-o da página de integrações.",
                         "integrations_page": "Página de integrações"
                     },
                     "editor": {
@@ -807,7 +818,11 @@
                     "close": "Fechar",
                     "submit": "Enviar"
                 },
-                "logout": "Sair"
+                "logout": "Sair",
+                "force_narrow": {
+                    "header": "Sempre ocultar a barra lateral",
+                    "description": "Isto irá ocultar a barra lateral por padrão, semelhante à experiência móvel."
+                }
             },
             "page-authorize": {
                 "initializing": "Iniciando",
@@ -919,7 +934,7 @@
                     "create_account": "Criar Conta",
                     "error": {
                         "required_fields": "Preencha todos os campos obrigatórios",
-                        "password_not_match": "As senhas não correspondem"
+                        "password_not_match": "As senhas não coincidem"
                     }
                 },
                 "integration": {
@@ -1009,7 +1024,7 @@
                     "entity_non_numeric": "Entidade não é numérica: {entity}"
                 },
                 "changed_toast": {
-                    "message": "A configuração do Lovelace foi atualizada, você gostaria de atualizar?",
+                    "message": "A configuração do Lovelace foi atualizada, você gostaria de recarregar?",
                     "refresh": "Atualizar"
                 },
                 "reload_lovelace": "Recarregar Lovelace"
@@ -1027,7 +1042,7 @@
                     "arsaboo": {
                         "names": {
                             "upstairs": "Andar de cima",
-                            "family_room": "Quarto Familiar",
+                            "family_room": "Quarto da Família",
                             "kitchen": "Cozinha",
                             "patio": "Pátio",
                             "hallway": "Corredor",
@@ -1039,15 +1054,15 @@
                         "labels": {
                             "lights": "Luzes",
                             "information": "Informação",
-                            "morning_commute": "Comutação da manhã",
-                            "commute_home": "Comutar para casa",
+                            "morning_commute": "Indo para o Trabalho",
+                            "commute_home": "Indo para Casa",
                             "entertainment": "Entretenimento",
                             "activity": "Atividade",
                             "hdmi_input": "Entrada HDMI",
                             "hdmi_switcher": "Comutador HDMI",
                             "volume": "Volume",
                             "total_tv_time": "Tempo total de TV",
-                            "turn_tv_off": "Desligue a televisão",
+                            "turn_tv_off": "Desligar televisão",
                             "air": "Ar"
                         },
                         "unit": {
@@ -1319,6 +1334,14 @@
                 "home": "Home",
                 "sleep": "Suspender",
                 "activity": "Atividade"
+            },
+            "hvac_action": {
+                "off": "Desligado",
+                "heating": "Aquecimento",
+                "cooling": "Resfriamento",
+                "drying": "Secagem",
+                "idle": "Oscioso",
+                "fan": "Ventilador"
             }
         }
     },
diff --git a/translations/pt.json b/translations/pt.json
index 96ad42681f..82a10eeec2 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -350,6 +350,23 @@
                         "core": {
                             "header": "Configuração e controlo do servidor",
                             "introduction": "Alterar a configuração pode ser um processo repetitivo. Nós sabemos. Esta secção pretende tornar a sua vida um pouco mais fácil.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor desativado por causa da configuração existente em configuration.yaml.",
+                                "location_name": "Nome da instalação do seu Home Assistant",
+                                "latitude": "Latitude",
+                                "longitude": "Longitude",
+                                "elevation": "Elevação",
+                                "elevation_meters": "metros",
+                                "time_zone": "Fuso horário",
+                                "unit_system": "Unidades do Sistema",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Métrico",
+                                "imperial_example": "Fahrenheit, libras",
+                                "metric_example": "Celsius, quilogramas",
+                                "save_button": "Guardar"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validar a configuração",
                                 "introduction": "Valide a sua configuração caso a tenha alterado recentemente e quiser certificar-se de que tudo está válido",
@@ -370,21 +387,6 @@
                                 "introduction": "Controle o seu servidor Home Assistant... a partir do Home Assistant",
                                 "restart": "Reiniciar",
                                 "stop": "Parar"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor desativado por causa da configuração existente em configuration.yaml.",
-                                "location_name": "Nome da instalação do seu Home Assistant",
-                                "latitude": "Latitude",
-                                "longitude": "Longitude",
-                                "elevation": "Elevação",
-                                "elevation_meters": "metros",
-                                "time_zone": "Fuso horário",
-                                "unit_system": "Unidades do Sistema",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Métrico",
-                                "imperial_example": "Fahrenheit, libras",
-                                "metric_example": "Celsius, quilogramas",
-                                "save_button": "Guardar"
                             }
                         }
                     }
diff --git a/translations/ro.json b/translations/ro.json
index 47a257eb74..6c043b5466 100644
--- a/translations/ro.json
+++ b/translations/ro.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Configurație și control server",
                             "introduction": "Modificarea configurației poate fi un proces obositor. Noi stim. Această secțiune va încerca să vă facă viața un pic mai ușoară.",
+                            "core_config": {
+                                "edit_requires_storage": "Editorul a fost dezactivat deoarece configurația a fost stocata în configuration.yaml.",
+                                "location_name": "Numele instalarii Home Assistant",
+                                "latitude": "Latitudine",
+                                "longitude": "Longitudine",
+                                "elevation": "Altitudine",
+                                "elevation_meters": "metri",
+                                "time_zone": "Fus orar",
+                                "unit_system": "Unitatea De Sistem",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metric",
+                                "imperial_example": "Fahrenheit, livre",
+                                "metric_example": "Celsius, kilograme",
+                                "save_button": "Salvați"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validare configurație",
                                 "introduction": "Validați configurația dvs, dacă ați făcut recent unele modificări și doriți să vă asigurați că aceasta este validă.",
@@ -374,21 +391,6 @@
                                 "introduction": "Controlează-ți serverul Home Assistant ... chiar din Home Assistant.",
                                 "restart": "Repornire",
                                 "stop": "Oprire"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editorul a fost dezactivat deoarece configurația a fost stocata în configuration.yaml.",
-                                "location_name": "Numele instalarii Home Assistant",
-                                "latitude": "Latitudine",
-                                "longitude": "Longitudine",
-                                "elevation": "Altitudine",
-                                "elevation_meters": "metri",
-                                "time_zone": "Fus orar",
-                                "unit_system": "Unitatea De Sistem",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metric",
-                                "imperial_example": "Fahrenheit, livre",
-                                "metric_example": "Celsius, kilograme",
-                                "save_button": "Salvați"
                             }
                         }
                     }
diff --git a/translations/ru.json b/translations/ru.json
index f9630f1f73..d681a3a3ef 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "Конфигурация и управление сервером",
                             "introduction": "Изменение конфигурации может быть утомительным процессом. Мы знаем. Этот раздел может немного упростить эту задачу.",
+                            "core_config": {
+                                "edit_requires_storage": "Редактор отключен, поскольку конфигурация уже хранится в файле configuration.yaml.",
+                                "location_name": "Название для Вашего Home Assistant",
+                                "latitude": "Широта",
+                                "longitude": "Долгота",
+                                "elevation": "Высота",
+                                "elevation_meters": "метров",
+                                "time_zone": "Часовой пояс",
+                                "unit_system": "Система мер",
+                                "unit_system_imperial": "Имперская",
+                                "unit_system_metric": "Метрическая",
+                                "imperial_example": "Градус Фаренгейта, фунт",
+                                "metric_example": "Градус Цельсия, килограмм",
+                                "save_button": "Сохранить"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Проверка конфигурации",
                                 "introduction": "Проверьте свою конфигурацию, если вы внесли в нее некоторые изменения и хотите убедиться в ее работоспособности",
@@ -374,21 +391,6 @@
                                 "introduction": "Управляйте Вашим сервером Home Assistant... из Home Assistant",
                                 "restart": "Перезапустить",
                                 "stop": "Остановить"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Редактор отключен, поскольку конфигурация уже хранится в файле configuration.yaml.",
-                                "location_name": "Название для Вашего Home Assistant",
-                                "latitude": "Широта",
-                                "longitude": "Долгота",
-                                "elevation": "Высота",
-                                "elevation_meters": "метров",
-                                "time_zone": "Часовой пояс",
-                                "unit_system": "Система мер",
-                                "unit_system_imperial": "Имперская",
-                                "unit_system_metric": "Метрическая",
-                                "imperial_example": "Градус Фаренгейта, фунт",
-                                "metric_example": "Градус Цельсия, килограмм",
-                                "save_button": "Сохранить"
                             }
                         }
                     }
@@ -524,8 +526,8 @@
                                     "label": "Солнце",
                                     "before": "До:",
                                     "after": "После:",
-                                    "before_offset": "Смещение до (опционально)",
-                                    "after_offset": "Смещение после (опционально)",
+                                    "before_offset": "Смещение (опционально)",
+                                    "after_offset": "Смещение (опционально)",
                                     "sunrise": "Восхода",
                                     "sunset": "Заката"
                                 },
@@ -558,7 +560,7 @@
                             "type": {
                                 "service": {
                                     "label": "Вызов службы",
-                                    "service_data": "Данные службы"
+                                    "service_data": "Данные"
                                 },
                                 "delay": {
                                     "label": "Задержка",
@@ -575,7 +577,7 @@
                                 "event": {
                                     "label": "Создание события",
                                     "event": "Событие:",
-                                    "service_data": "Данные службы"
+                                    "service_data": "Данные"
                                 }
                             },
                             "learn_more": "Узнайте больше о действиях"
@@ -819,7 +821,7 @@
                 "logout": "Выйти",
                 "force_narrow": {
                     "header": "Всегда скрывать боковую панель",
-                    "description": "По умолчанию боковая панель будет скрыта, аналогично мобильному интерфейсу."
+                    "description": "Боковая панель будет скрыта, аналогично мобильному интерфейсу."
                 }
             },
             "page-authorize": {
diff --git a/translations/sk.json b/translations/sk.json
index 8ef0ab5ca1..9b619b10ad 100644
--- a/translations/sk.json
+++ b/translations/sk.json
@@ -350,6 +350,23 @@
                         "core": {
                             "header": "Konfigurácia a ovládanie servera",
                             "introduction": "Zmena konfigurácie môže byť ťažkým procesom. My vieme. Táto sekcia sa Vám pokúsi zjednodušiť život.",
+                            "core_config": {
+                                "edit_requires_storage": "Editor je zablokovaný, pretože konfigurácia je uložená v configuration.yaml",
+                                "location_name": "Názov vašej Home Assistant inštalácie",
+                                "latitude": "Zemepisná šírka",
+                                "longitude": "Zemepisná dĺžka",
+                                "elevation": "Nadmorská výška",
+                                "elevation_meters": "metrov",
+                                "time_zone": "Časové pásmo",
+                                "unit_system": "Jednotková sústava",
+                                "unit_system_imperial": "Imperiálny",
+                                "unit_system_metric": "metrický",
+                                "imperial_example": "Fahrenheita, libry",
+                                "metric_example": "Celsia, kilogramy",
+                                "save_button": "Uložiť"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Kontrola konfigurácie",
                                 "introduction": "Overte svoju konfiguráciu, ak ste nedávno vykonali nejaké zmeny v konfigurácii a chcete sa uistiť, že je to všetko v poriadku",
@@ -370,21 +387,6 @@
                                 "introduction": "Ovládajte Váš Home Assistant server... z aplikácie Home Assistant.",
                                 "restart": "Reštartovať",
                                 "stop": "Zastaviť"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Editor je zablokovaný, pretože konfigurácia je uložená v configuration.yaml",
-                                "location_name": "Názov vašej Home Assistant inštalácie",
-                                "latitude": "Zemepisná šírka",
-                                "longitude": "Zemepisná dĺžka",
-                                "elevation": "Nadmorská výška",
-                                "elevation_meters": "metrov",
-                                "time_zone": "Časové pásmo",
-                                "unit_system": "Jednotková sústava",
-                                "unit_system_imperial": "Imperiálny",
-                                "unit_system_metric": "metrický",
-                                "imperial_example": "Fahrenheita, libry",
-                                "metric_example": "Celsia, kilogramy",
-                                "save_button": "Uložiť"
                             }
                         }
                     }
@@ -779,7 +781,8 @@
                     "step_done": "Nastavenie dokončené krok {step}",
                     "close": "Zavrieť",
                     "submit": "Odoslať"
-                }
+                },
+                "logout": "Logga ut"
             },
             "page-authorize": {
                 "initializing": "Inicializácia",
diff --git a/translations/sl.json b/translations/sl.json
index 003dc433d1..53b849e2b9 100644
--- a/translations/sl.json
+++ b/translations/sl.json
@@ -141,7 +141,8 @@
             "high_demand": "Visoka poraba",
             "heat_pump": "Toplotna črpalka",
             "gas": "Plin",
-            "manual": "Ročno"
+            "manual": "Ročno",
+            "heat_cool": "Gretje\/Hlajenje"
         },
         "configurator": {
             "configure": "Konfiguriraj",
@@ -323,6 +324,9 @@
                     },
                     "mqtt": {
                         "title": "MQTT"
+                    },
+                    "info": {
+                        "title": "Info"
                     }
                 }
             },
@@ -350,6 +354,23 @@
                         "core": {
                             "header": "Konfiguracija in nadzor strežnika",
                             "introduction": "Spreminjanje konfiguracije je lahko zapleten proces. Vemo. Ta del bo poskušal narediti vaše življenje malo lažje.",
+                            "core_config": {
+                                "edit_requires_storage": "Urejevalnik je onemogočen, ker je konfiguracija shranjena v config.yaml.",
+                                "location_name": "Ime vašega instalacije vašega Home Assistant-a.",
+                                "latitude": "Zemljepisna širina",
+                                "longitude": "Zemljepisna dolžina",
+                                "elevation": "Nadmorska višina",
+                                "elevation_meters": "metrov",
+                                "time_zone": "Časovni pas",
+                                "unit_system": "Sistem enot",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metrično",
+                                "imperial_example": "Fahrenheit, funtov",
+                                "metric_example": "Celzija, kilogramov",
+                                "save_button": "Shrani"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Preverjanje konfiguracije",
                                 "introduction": "Potrdite svojo konfiguracijo, če ste nedavno spremenili svojo konfiguracijo in se prepričajte, da je vse veljavno",
@@ -370,21 +391,6 @@
                                 "introduction": "Nadzirajte strežnik Home Assistant ... iz Home Assistanta",
                                 "restart": "Ponovni zagon",
                                 "stop": "Ustavi"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Urejevalnik je onemogočen, ker je konfiguracija shranjena v config.yaml.",
-                                "location_name": "Ime vašega instalacije vašega Home Assistant-a.",
-                                "latitude": "Zemljepisna širina",
-                                "longitude": "Zemljepisna dolžina",
-                                "elevation": "Nadmorska višina",
-                                "elevation_meters": "metrov",
-                                "time_zone": "Časovni pas",
-                                "unit_system": "Sistem enot",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metrično",
-                                "imperial_example": "Fahrenheit, funtov",
-                                "metric_example": "Celzija, kilogramov",
-                                "save_button": "Shrani"
                             }
                         }
                     }
@@ -610,6 +616,14 @@
                         "add_node": "Dodaj vozlišče",
                         "remove_node": "Odstrani vozlišče",
                         "cancel_command": "Prekliči ukaz"
+                    },
+                    "common": {
+                        "value": "Vrednost",
+                        "instance": "Instanca",
+                        "index": "Indeks"
+                    },
+                    "values": {
+                        "header": "Vrednosti vozlišča"
                     }
                 },
                 "users": {
@@ -803,6 +817,11 @@
                     "step_done": "Nastavitev je bila opravljena za {step}",
                     "close": "Zapri",
                     "submit": "Pošlji"
+                },
+                "logout": "Odjava",
+                "force_narrow": {
+                    "header": "Vedno skrij stransko vrstico",
+                    "description": "To bo privzeto skrilo stransko vrstico, podobno kot pri mobilnih napravah."
                 }
             },
             "page-authorize": {
@@ -1315,6 +1334,14 @@
                 "home": "Doma",
                 "sleep": "Spanje",
                 "activity": "Dejavnost"
+            },
+            "hvac_action": {
+                "off": "Izključen",
+                "heating": "Ogrevanje",
+                "cooling": "Hlajenje",
+                "drying": "Sušenje",
+                "idle": "V pripravljenosti",
+                "fan": "Ventilator"
             }
         }
     },
diff --git a/translations/sv.json b/translations/sv.json
index 21ac2f24fb..3912929292 100644
--- a/translations/sv.json
+++ b/translations/sv.json
@@ -141,7 +141,8 @@
             "high_demand": "Stort behov",
             "heat_pump": "Värmepump",
             "gas": "Gas",
-            "manual": "Manuell"
+            "manual": "Manuell",
+            "heat_cool": "Värme\/Kyla"
         },
         "configurator": {
             "configure": "Konfigurera",
@@ -323,6 +324,9 @@
                     },
                     "mqtt": {
                         "title": "MQTT"
+                    },
+                    "info": {
+                        "title": "Info"
                     }
                 }
             },
@@ -350,6 +354,23 @@
                         "core": {
                             "header": "Konfiguration och serverhantering",
                             "introduction": "Att ändra din konfiguration kan vara en tröttsam process. Vi vet. Den här avdelningen försöker göra ditt liv lite enklare.",
+                            "core_config": {
+                                "edit_requires_storage": "Redigeraren är inaktiverad eftersom konfigurationen lagras i configuration.yaml.",
+                                "location_name": "Namn på din Home Assistant installation",
+                                "latitude": "Latitud",
+                                "longitude": "Longitud",
+                                "elevation": "Höjd över havet",
+                                "elevation_meters": "meter",
+                                "time_zone": "Tidszon",
+                                "unit_system": "Enhets system",
+                                "unit_system_imperial": "Imperial",
+                                "unit_system_metric": "Metrisk",
+                                "imperial_example": "Fahrenheit, pounds",
+                                "metric_example": "Celsius, kilogram",
+                                "save_button": "Spara"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Validering av konfiguration",
                                 "introduction": "Kontrollera din konfiguration om du nyligen gjort ändringar och vill säkerställa att den fortfarande är giltig",
@@ -370,21 +391,6 @@
                                 "introduction": "Hantera din Home Assistant server... från Home Assistant.",
                                 "restart": "Starta om",
                                 "stop": "Stoppa"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "Redigeraren är inaktiverad eftersom konfigurationen lagras i configuration.yaml.",
-                                "location_name": "Namn på din Home Assistant installation",
-                                "latitude": "Latitud",
-                                "longitude": "Longitud",
-                                "elevation": "Höjd över havet",
-                                "elevation_meters": "meter",
-                                "time_zone": "Tidszon",
-                                "unit_system": "Enhets system",
-                                "unit_system_imperial": "Imperial",
-                                "unit_system_metric": "Metrisk",
-                                "imperial_example": "Fahrenheit, pounds",
-                                "metric_example": "Celsius, kilogram",
-                                "save_button": "Spara"
                             }
                         }
                     }
@@ -586,7 +592,23 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Hantera ditt Z-Wave nätverk"
+                    "description": "Hantera ditt Z-Wave nätverk",
+                    "network_status": {
+                        "network_stopped": "Z-Wave-nätverk stoppat",
+                        "network_starting": "Startar Z-Wave-nätverk...",
+                        "network_starting_note": "Detta kan ta ett tag beroende på storleken på ditt nätverk.",
+                        "network_started": "Z-Wave nätverk startat"
+                    },
+                    "services": {
+                        "start_network": "Starta Nätverket",
+                        "stop_network": "Stoppa nätverket",
+                        "cancel_command": "Avbryt kommandot"
+                    },
+                    "common": {
+                        "value": "Värde",
+                        "instance": "Instans",
+                        "index": "Index"
+                    }
                 },
                 "users": {
                     "caption": "Användare",
@@ -779,6 +801,11 @@
                     "step_done": "Inställningen klar för {step}",
                     "close": "Stäng",
                     "submit": "Skicka"
+                },
+                "logout": "Logga ut",
+                "force_narrow": {
+                    "header": "Göm alltid sidofältet",
+                    "description": "Detta kommer att dölja sidofältet som standard, liknande mobilupplevelsen."
                 }
             },
             "page-authorize": {
@@ -1280,6 +1307,20 @@
                 "off": "Av",
                 "on": "På",
                 "auto": "Auto"
+            },
+            "preset_mode": {
+                "away": "Borta",
+                "home": "Hemma",
+                "sleep": "Sover",
+                "activity": "Aktivitet"
+            },
+            "hvac_action": {
+                "off": "Av",
+                "heating": "Uppvärmning",
+                "cooling": "Kyla",
+                "drying": "Avfuktning",
+                "idle": "Inaktiv",
+                "fan": "Fläkt"
             }
         }
     },
diff --git a/translations/te.json b/translations/te.json
index 1a6fe5a872..3d1bfd15c3 100644
--- a/translations/te.json
+++ b/translations/te.json
@@ -314,7 +314,7 @@
                 "header": "కాన్ఫిగర్ Home Assistant",
                 "core": {
                     "section": {
-                        "core": {
+                        "server_control": {
                             "validation": {
                                 "check_config": "కాన్ఫిగరేషన్ను తనిఖీ చేయండి",
                                 "valid": "మంచి కాన్ఫిగరేషన్!",
diff --git a/translations/th.json b/translations/th.json
index c23e3e6fef..e66a62b11b 100644
--- a/translations/th.json
+++ b/translations/th.json
@@ -350,6 +350,23 @@
                         "core": {
                             "header": "การกำหนดค่าและควบคุมเซิร์ฟเวอร์",
                             "introduction": "เรารู้นะว่าการตั้งค่าเนี่ยมันน่าเบื่อขนาดไหน ในส่วนนี้มันจะช่วยทำให้ชีวิตคุณง่ายขึ้นนิดหน่อย",
+                            "core_config": {
+                                "edit_requires_storage": "ตัวช่วยแก้ไขถูกปิดใช้งาน เนื่องจากการกำหนดค่าถูกกำหนดไว้ในไฟล์ configuration.yaml",
+                                "location_name": "ชื่อในการติดตั้ง Home Assistant ของคุณ",
+                                "latitude": "ละติจูด",
+                                "longitude": "ลองจิจูด",
+                                "elevation": "มุมเงย",
+                                "elevation_meters": "เมตร",
+                                "time_zone": "เขตเวลา",
+                                "unit_system": "ระบบหน่วย",
+                                "unit_system_imperial": "ของจักรพรรดิ",
+                                "unit_system_metric": "เมตริก",
+                                "imperial_example": "ฟาเรนไฮต์, ปอนด์",
+                                "metric_example": "เซลเซียส, กิโลกรัม",
+                                "save_button": "บันทึก"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "ตรวจสอบการกำหนดค่า",
                                 "introduction": "ตรวจสอบความถูกต้องการกำหนดค่าของคุณหากคุณเพิ่งทำการเปลี่ยนแปลงบางอย่างกับการกำหนดค่าของคุณและต้องการตรวจสอบให้แน่ใจว่าถูกต้องทั้งหมด",
@@ -370,21 +387,6 @@
                                 "introduction": "สำหรับควบคุมเซิร์ฟเวอร์ Home Assistant อีกทีนึงจาก Home Assistant อีกที",
                                 "restart": "เริ่มต้นใหม่",
                                 "stop": "หยุด"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "ตัวช่วยแก้ไขถูกปิดใช้งาน เนื่องจากการกำหนดค่าถูกกำหนดไว้ในไฟล์ configuration.yaml",
-                                "location_name": "ชื่อในการติดตั้ง Home Assistant ของคุณ",
-                                "latitude": "ละติจูด",
-                                "longitude": "ลองจิจูด",
-                                "elevation": "มุมเงย",
-                                "elevation_meters": "เมตร",
-                                "time_zone": "เขตเวลา",
-                                "unit_system": "ระบบหน่วย",
-                                "unit_system_imperial": "ของจักรพรรดิ",
-                                "unit_system_metric": "เมตริก",
-                                "imperial_example": "ฟาเรนไฮต์, ปอนด์",
-                                "metric_example": "เซลเซียส, กิโลกรัม",
-                                "save_button": "บันทึก"
                             }
                         }
                     }
diff --git a/translations/tr.json b/translations/tr.json
index aa649a80dc..3f94136b88 100644
--- a/translations/tr.json
+++ b/translations/tr.json
@@ -327,7 +327,9 @@
                     "section": {
                         "core": {
                             "header": "Yapılandırma ve sunucu kontrolü",
-                            "introduction": "Yapılandırmanızı değiştirmek, yorucu bir işlem olabilir. Biliyoruz. Bu bölüm hayatınızı biraz daha kolay hale getirmeye çalışacaktır.",
+                            "introduction": "Yapılandırmanızı değiştirmek, yorucu bir işlem olabilir. Biliyoruz. Bu bölüm hayatınızı biraz daha kolay hale getirmeye çalışacaktır."
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Yapılandırma doğrulaması",
                                 "introduction": "Yapılandırmanızda yakın bir zamanda değişiklikler yaptıysanız ve tümünün geçerli olduğundan emin olmak istiyorsanız yapılandırmanızı doğrulayın",
diff --git a/translations/uk.json b/translations/uk.json
index 48f2134b90..df076956fe 100644
--- a/translations/uk.json
+++ b/translations/uk.json
@@ -309,7 +309,7 @@
             "developer-tools": {
                 "tabs": {
                     "services": {
-                        "title": "Послуги"
+                        "title": "Сервіси"
                     },
                     "states": {
                         "title": "Стан"
@@ -322,6 +322,9 @@
                     },
                     "mqtt": {
                         "title": "MQTT"
+                    },
+                    "info": {
+                        "title": "Інфо"
                     }
                 }
             },
@@ -348,7 +351,9 @@
                     "section": {
                         "core": {
                             "header": "Конфігурація та керування сервером",
-                            "introduction": "Зміна вашої конфігурації може бути неабияким процесом. Ми знаємо. Цей розділ намагатиметься полегшити ваше життя.",
+                            "introduction": "Зміна вашої конфігурації може бути неабияким процесом. Ми знаємо. Цей розділ намагатиметься полегшити ваше життя."
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Перевірка конфігурації",
                                 "introduction": "Перевірте вашу конфігурацію, якщо ви нещодавно внесли деякі зміни у вашу конфігурацію та хочете переконатися, що вона є дійсною",
@@ -530,7 +535,7 @@
                             "type": {
                                 "service": {
                                     "label": "Викликати сервіс",
-                                    "service_data": "Дані послуги "
+                                    "service_data": "Дані сервісу"
                                 },
                                 "delay": {
                                     "label": "Затримка",
@@ -547,7 +552,7 @@
                                 "event": {
                                     "label": "Викликати подію",
                                     "event": "Подія:",
-                                    "service_data": "Дані послуги"
+                                    "service_data": "Дані сервісу"
                                 }
                             },
                             "learn_more": "Докладніше про дії"
@@ -841,6 +846,9 @@
                         "title": "Ласкаво просимо додому",
                         "no_devices": "Ця сторінка дозволяє керувати пристроями, однак, схоже, у вас ще немає налаштованих пристроїв. Щоб почати, перейдіть на сторінку інтеграції.",
                         "go_to_integrations_page": "Перейти на сторінку інтеграцій."
+                    },
+                    "picture-elements": {
+                        "call_service": "Викликати сервіс {name}"
                     }
                 },
                 "editor": {
@@ -1054,7 +1062,7 @@
             "entity_turned_on": "Увімкнено {entity}.",
             "entity_turned_off": "Вимкнено {entity}.",
             "service_called": "Служба {service} викликається.",
-            "service_call_failed": "Не вдалося викликати службу {service}.",
+            "service_call_failed": "Не вдалося викликати сервіс {service}.",
             "connection_lost": "З'єднання втрачено. Повторне підключення..."
         },
         "dialogs": {
diff --git a/translations/vi.json b/translations/vi.json
index 698050b0ec..dd1ec8630a 100644
--- a/translations/vi.json
+++ b/translations/vi.json
@@ -141,7 +141,8 @@
             "high_demand": "Nhu cầu cao",
             "heat_pump": "Bơm nhiệt",
             "gas": "Khí",
-            "manual": "Hướng dẫn"
+            "manual": "Hướng dẫn",
+            "heat_cool": "Nóng\/Lạnh"
         },
         "configurator": {
             "configure": "Cấu hình",
@@ -275,7 +276,8 @@
     "state_badge": {
         "default": {
             "unknown": "KB",
-            "unavailable": "KKD"
+            "unavailable": "KKD",
+            "error": "Lỗi"
         },
         "alarm_control_panel": {
             "armed": "VT",
@@ -321,6 +323,9 @@
                     },
                     "mqtt": {
                         "title": "MQTT"
+                    },
+                    "info": {
+                        "title": "Thông tin"
                     }
                 }
             },
@@ -348,6 +353,23 @@
                         "core": {
                             "header": "Cấu hình và kiểm soát máy chủ",
                             "introduction": "Thay đổi cấu hình của bạn có thể là một quá trình mệt mỏi. Chúng tôi biết. Phần này sẽ cố gắng làm cho việc đó dễ dàng hơn.",
+                            "core_config": {
+                                "edit_requires_storage": "Trình chỉnh sửa bị vô hiệu hóa do cấu hình được lưu trữ trong configure.yaml.",
+                                "location_name": "Tên cài đặt Home Assistant của bạn",
+                                "latitude": "Vĩ độ",
+                                "longitude": "Kinh độ",
+                                "elevation": "Độ cao",
+                                "elevation_meters": "mét",
+                                "time_zone": "Múi giờ",
+                                "unit_system": "Hệ thống đơn vị",
+                                "unit_system_imperial": "Hệ inch",
+                                "unit_system_metric": "Hệ mét",
+                                "imperial_example": "Độ F, pound",
+                                "metric_example": "Độ C, kilôgam",
+                                "save_button": "Lưu"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "Xác nhận cấu hình",
                                 "introduction": "Xác thực cấu hình của bạn nếu gần đây bạn đã thực hiện một số thay đổi đối với cấu hình của bạn và muốn đảm bảo rằng nó là hợp lệ",
@@ -437,6 +459,7 @@
                                 },
                                 "sun": {
                                     "label": "Mặt trời",
+                                    "event": "Sự kiện:",
                                     "sunrise": "Bình minh",
                                     "sunset": "Hoàng hôn",
                                     "offset": "Bù đắp (tùy chọn)"
@@ -557,7 +580,9 @@
                                 }
                             },
                             "learn_more": "Tìm hiểu thêm về Hành động"
-                        }
+                        },
+                        "load_error_not_editable": "Chỉ tự động hóa trong automations.yaml là có thể chỉnh sửa.",
+                        "load_error_unknown": "Lỗi tải tự động hóa ({err_no})."
                     }
                 },
                 "script": {
@@ -566,7 +591,14 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "Quản lý mạng Z-Wave"
+                    "description": "Quản lý mạng Z-Wave",
+                    "services": {
+                        "save_config": "Lưu cấu hình"
+                    },
+                    "common": {
+                        "value": "Giá trị",
+                        "index": "Mục lục"
+                    }
                 },
                 "users": {
                     "caption": "Người dùng",
@@ -614,13 +646,20 @@
                         "device_unavailable": "Thiết bị không khả dụng",
                         "entity_unavailable": "Thiết bị không khả dụng",
                         "no_area": "Không có khu vực"
+                    },
+                    "config_flow": {
+                        "external_step": {
+                            "description": "Bước này yêu cầu bạn truy cập một trang web bên ngoài để hoàn thành.",
+                            "open_site": "Mở trang web"
+                        }
                     }
                 },
                 "zha": {
                     "caption": "ZHA",
                     "description": "Quản lý mạng ZigBee Home Automation",
                     "services": {
-                        "reconfigure": "Cấu hình lại thiết bị ZHA (chữa thiết bị). Sử dụng điều này nếu bạn gặp vấn đề với thiết bị. Nếu thiết bị được đề cập là thiết bị chạy bằng pin, vui lòng đảm bảo thiết bị đã hoạt động và chấp nhận lệnh khi bạn sử dụng dịch vụ này."
+                        "reconfigure": "Cấu hình lại thiết bị ZHA (chữa thiết bị). Sử dụng điều này nếu bạn gặp vấn đề với thiết bị. Nếu thiết bị được đề cập là thiết bị chạy bằng pin, vui lòng đảm bảo thiết bị đã hoạt động và chấp nhận lệnh khi bạn sử dụng dịch vụ này.",
+                        "updateDeviceName": "Đặt tên tùy chỉnh cho thiết bị này trong sổ đăng ký thiết bị."
                     }
                 },
                 "area_registry": {
@@ -630,7 +669,9 @@
                         "header": "Đăng ký Khu vực",
                         "introduction": "Các khu vực được sử dụng để phân loại các thiết bị. Thông tin này sẽ được sử dụng trong toàn bộ Home Assistant để giúp bạn tổ chức giao diện, quyền và tích hợp với các hệ thống khác.",
                         "introduction2": "Để đặt các thiết bị trong một khu vực, hãy sử dụng liên kết bên dưới để điều hướng đến trang tích hợp và sau đó nhấp vào tích hợp được định cấu hình để truy cập vào thẻ thiết bị.",
-                        "integrations_page": "Trang tích hợp"
+                        "integrations_page": "Trang tích hợp",
+                        "no_areas": "Hình như bạn chưa có Khu vực nào!",
+                        "create_area": "TẠO KHU VỰC"
                     },
                     "no_areas": "Hình như bạn chưa có khu vực nào!",
                     "create_area": "TẠO KHU VỰC",
@@ -737,6 +778,11 @@
                     "step_done": "Đã hoàn tất thiết lập cho {step}",
                     "close": "Đóng",
                     "submit": "Gửi đi"
+                },
+                "logout": "Đăng xuất",
+                "force_narrow": {
+                    "header": "Luôn ẩn thanh bên",
+                    "description": "Điều này sẽ ẩn thanh bên theo mặc định, tương tự như trải nghiệm di động."
                 }
             },
             "page-authorize": {
@@ -843,12 +889,25 @@
                     "data": {
                         "name": "Tên",
                         "username": "Tên đăng nhập",
-                        "password": "Mật khẩu"
+                        "password": "Mật khẩu",
+                        "password_confirm": "Xác nhận mật khẩu"
                     },
                     "create_account": "Tạo tài khoản",
                     "error": {
-                        "required_fields": "Điền vào tất cả các trường bắt buộc"
+                        "required_fields": "Điền vào tất cả các trường bắt buộc",
+                        "password_not_match": "Mật khẩu không khớp"
                     }
+                },
+                "integration": {
+                    "intro": "Các thiết bị và dịch vụ được trình bày trong Home Assistant dưới dạng tích hợp. Bạn có thể thiết lập chúng ngay bây giờ hoặc thực hiện sau từ màn hình Cấu hình.",
+                    "more_integrations": "Thêm",
+                    "finish": "Hoàn thành"
+                },
+                "core-config": {
+                    "intro": "Xin chào {name} , chào mừng bạn đến với Home Assistant. Bạn muốn đặt tên nhà của bạn thế nào?",
+                    "intro_location": "Chúng tôi muốn biết nơi bạn sống. Thông tin này sẽ giúp hiển thị thông tin và thiết lập tự động dựa trên mặt trời. Dữ liệu này không bao giờ được chia sẻ bên ngoài mạng của bạn.",
+                    "intro_location_detect": "Chúng tôi có thể giúp bạn điền thông tin này bằng cách yêu cầu một lần cho dịch vụ bên ngoài.",
+                    "location_name_default": "Nhà"
                 }
             },
             "lovelace": {
@@ -862,6 +921,13 @@
                         "title": "Chào mừng về nhà",
                         "no_devices": "Trang này cho phép bạn điều khiển các thiết bị của mình, tuy nhiên có vẻ như bạn chưa có thiết bị nào được thiết lập. Đi đến trang tích hợp để bắt đầu.",
                         "go_to_integrations_page": "Chuyển đến trang tích hợp."
+                    },
+                    "picture-elements": {
+                        "tap": "Nhấn:",
+                        "navigate_to": "Điều hướng đến {location}",
+                        "toggle": "Chuyển đổi {name}",
+                        "call_service": "Gọi dịch vụ {name}",
+                        "more_info": "Hiển thị thêm thông tin: {name}"
                     }
                 },
                 "editor": {
@@ -915,10 +981,29 @@
                     "entity_not_found": "Thực thể không có sẵn: {entity}",
                     "entity_non_numeric": "Thực thể không phải là số: {entity}"
                 }
+            },
+            "page-demo": {
+                "cards": {
+                    "demo": {
+                        "learn_more": "Tìm hiểu thêm về Home Assistant"
+                    }
+                },
+                "config": {
+                    "arsaboo": {
+                        "names": {
+                            "upstairs": "Tầng trên",
+                            "family_room": "Phòng Gia đình",
+                            "kitchen": "Phòng bếp",
+                            "patio": "Sân trong",
+                            "hallway": "Hành lang"
+                        }
+                    }
+                }
             }
         },
         "sidebar": {
-            "log_out": "Đăng xuất"
+            "log_out": "Đăng xuất",
+            "external_app_configuration": "Cấu hình ứng dụng"
         },
         "common": {
             "loading": "Đang tải",
@@ -1166,7 +1251,28 @@
                 "off": "Tắt",
                 "on": "Bật",
                 "auto": "Tự động"
+            },
+            "preset_mode": {
+                "none": "Không",
+                "eco": "Tiết kiệm",
+                "away": "Đi vắng",
+                "boost": "Tăng cường",
+                "comfort": "Thoải mái",
+                "home": "Ở nhà"
+            },
+            "hvac_action": {
+                "off": "Tắt",
+                "heating": "Làm ấm",
+                "cooling": "Làm mát",
+                "drying": "Làm khô",
+                "idle": "Nhàn rỗi",
+                "fan": "Quạt"
             }
         }
+    },
+    "groups": {
+        "system-admin": "Quản trị viên",
+        "system-users": "Người dùng",
+        "system-read-only": "Người dùng chỉ đọc"
     }
 }
\ No newline at end of file
diff --git a/translations/zh-Hans.json b/translations/zh-Hans.json
index b249bd8476..447bd5fdd7 100644
--- a/translations/zh-Hans.json
+++ b/translations/zh-Hans.json
@@ -141,7 +141,8 @@
             "high_demand": "高需求",
             "heat_pump": "热泵",
             "gas": "燃气",
-            "manual": "手动"
+            "manual": "手动",
+            "heat_cool": "制热\/制冷"
         },
         "configurator": {
             "configure": "设置",
@@ -323,6 +324,9 @@
                     },
                     "mqtt": {
                         "title": "MQTT"
+                    },
+                    "info": {
+                        "title": "信息"
                     }
                 }
             },
@@ -350,6 +354,23 @@
                         "core": {
                             "header": "配置及服务器控制",
                             "introduction": "更改配置的过程可能有些抓狂，我们懂的。这部分将帮助你减轻一些工作。",
+                            "core_config": {
+                                "edit_requires_storage": "编辑器已禁用，因为配置存储于 configuration.yaml。",
+                                "location_name": "Home Assistant 安装的名称",
+                                "latitude": "纬度",
+                                "longitude": "经度",
+                                "elevation": "海拔",
+                                "elevation_meters": "米",
+                                "time_zone": "时区",
+                                "unit_system": "单位制",
+                                "unit_system_imperial": "英制",
+                                "unit_system_metric": "公制",
+                                "imperial_example": "华氏、磅",
+                                "metric_example": "摄氏、千克",
+                                "save_button": "保存"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "配置检查",
                                 "introduction": "此处可以帮助你检验最新修改的配置文件有效性",
@@ -370,21 +391,6 @@
                                 "introduction": "在这里即可控制 Home Assistant 服务。",
                                 "restart": "重启服务",
                                 "stop": "停止服务"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "编辑器已禁用，因为配置存储于 configuration.yaml。",
-                                "location_name": "Home Assistant 安装的名称",
-                                "latitude": "纬度",
-                                "longitude": "经度",
-                                "elevation": "海拔",
-                                "elevation_meters": "米",
-                                "time_zone": "时区",
-                                "unit_system": "单位制",
-                                "unit_system_imperial": "英制",
-                                "unit_system_metric": "公制",
-                                "imperial_example": "华氏、磅",
-                                "metric_example": "摄氏、千克",
-                                "save_button": "保存"
                             }
                         }
                     }
@@ -561,8 +567,8 @@
                                     "delay": "延迟"
                                 },
                                 "wait_template": {
-                                    "label": "延时",
-                                    "wait_template": "延时自定义值",
+                                    "label": "等待",
+                                    "wait_template": "等待模板",
                                     "timeout": "超时（可选）"
                                 },
                                 "condition": {
@@ -586,7 +592,20 @@
                 },
                 "zwave": {
                     "caption": "Z-Wave",
-                    "description": "管理 Z-Wave 网络"
+                    "description": "管理 Z-Wave 网络",
+                    "network_management": {
+                        "header": "Z-Wave网络管理"
+                    },
+                    "services": {
+                        "save_config": "保存配置",
+                        "add_node": "添加节点",
+                        "remove_node": "删除节点",
+                        "cancel_command": "取消命令"
+                    },
+                    "common": {
+                        "value": "值",
+                        "instance": "实例"
+                    }
                 },
                 "users": {
                     "caption": "用户",
@@ -779,6 +798,11 @@
                     "step_done": "{step} 设置完成",
                     "close": "关闭",
                     "submit": "提交"
+                },
+                "logout": "退出",
+                "force_narrow": {
+                    "header": "始终隐藏侧边栏",
+                    "description": "这将默认隐藏侧边栏，类似于移动设备上的体验。"
                 }
             },
             "page-authorize": {
@@ -1291,6 +1315,14 @@
                 "home": "在家",
                 "sleep": "睡眠",
                 "activity": "活动"
+            },
+            "hvac_action": {
+                "off": "关闭",
+                "heating": "制热",
+                "cooling": "制冷",
+                "drying": "除湿",
+                "idle": "空闲",
+                "fan": "风扇"
             }
         }
     },
diff --git a/translations/zh-Hant.json b/translations/zh-Hant.json
index 9b45142b7d..9e0341aa1b 100644
--- a/translations/zh-Hant.json
+++ b/translations/zh-Hant.json
@@ -354,6 +354,23 @@
                         "core": {
                             "header": "設定和服務器控制",
                             "introduction": "更改設定常是個惱人過程。此區域將盡可能協助您，讓事情變得更輕鬆一些。",
+                            "core_config": {
+                                "edit_requires_storage": "由於 configuration.yaml 內已儲存設定，編輯功能已關閉。",
+                                "location_name": "Home Assistant 安裝名稱",
+                                "latitude": "緯度",
+                                "longitude": "經度",
+                                "elevation": "海拔",
+                                "elevation_meters": "公尺",
+                                "time_zone": "時區",
+                                "unit_system": "單位系統",
+                                "unit_system_imperial": "英制",
+                                "unit_system_metric": "公制",
+                                "imperial_example": "華氏、磅",
+                                "metric_example": "攝氏、公斤",
+                                "save_button": "儲存"
+                            }
+                        },
+                        "server_control": {
                             "validation": {
                                 "heading": "設定驗證",
                                 "introduction": "如果您對設定進行了一些更改，並且想要確保這些設定有無錯誤\n可以選擇先驗證您的設定內容。",
@@ -374,21 +391,6 @@
                                 "introduction": "控制 Home Assistant 伺服器。",
                                 "restart": "重啟",
                                 "stop": "停止"
-                            },
-                            "core_config": {
-                                "edit_requires_storage": "由於 configuration.yaml 內已儲存設定，編輯功能已關閉。",
-                                "location_name": "Home Assistant 安裝名稱",
-                                "latitude": "緯度",
-                                "longitude": "經度",
-                                "elevation": "海拔",
-                                "elevation_meters": "公尺",
-                                "time_zone": "時區",
-                                "unit_system": "單位系統",
-                                "unit_system_imperial": "英制",
-                                "unit_system_metric": "公制",
-                                "imperial_example": "華氏、磅",
-                                "metric_example": "攝氏、公斤",
-                                "save_button": "儲存"
                             }
                         }
                     }
@@ -816,7 +818,11 @@
                     "close": "關閉",
                     "submit": "傳送"
                 },
-                "logout": "登出"
+                "logout": "登出",
+                "force_narrow": {
+                    "header": "總是隱藏側邊列",
+                    "description": "將預設隱藏側邊列，類似於手機 App 使用方式。"
+                }
             },
             "page-authorize": {
                 "initializing": "初始化中",
@@ -1328,6 +1334,14 @@
                 "home": "在家",
                 "sleep": "睡眠",
                 "activity": "活動"
+            },
+            "hvac_action": {
+                "off": "關閉",
+                "heating": "暖氣",
+                "cooling": "冷氣",
+                "drying": "除濕",
+                "idle": "閒置",
+                "fan": "風速"
             }
         }
     },
diff --git a/yarn.lock b/yarn.lock
index f76fcadabc..a151976961 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1570,6 +1570,16 @@
   resolved "https://registry.yarnpkg.com/@types/chalk/-/chalk-0.4.31.tgz#a31d74241a6b1edbb973cf36d97a2896834a51f9"
   integrity sha1-ox10JBprHtu5c8822XooloNKUfk=
 
+"@types/chromecast-caf-receiver@^3.0.12":
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@types/chromecast-caf-receiver/-/chromecast-caf-receiver-3.0.12.tgz#0172edc5e43a0b4f426b21a614a58e04e3df009d"
+  integrity sha512-GdR9nGOENDWYhF40FasB0Xnsy3c+e68K90sGVBZx1W1N3LP1NGOmCtaxgUpxk4IuHYmzGrW7I57zWZIbT3D5BQ==
+
+"@types/chromecast-caf-sender@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/chromecast-caf-sender/-/chromecast-caf-sender-1.0.1.tgz#da0047c41c2a7ecf2d5348715b27c4542ed9b579"
+  integrity sha512-/JuG+zrS+KCPwEiOrK9O7WrIMyiUEF7Ev9ywbzXcCOPkXin9tLX7w9zxCmxtnOPdgH9lZbtOvgo5IA4cEJknRg==
+
 "@types/clean-css@*":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.1.tgz#cb0134241ec5e6ede1b5344bc829668fd9871a8d"
@@ -7303,10 +7313,10 @@ hoek@6.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
   integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==
 
-home-assistant-js-websocket@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-4.2.2.tgz#e13b058a9e200bc56080e1b48fdeaaf1ed2e4e5f"
-  integrity sha512-4mXYbn2DCiDVBYGZROUSWLBDerSoDRJulw1GiQbhKEyrDhzFs5KQkcLdIu6k3CSDYQiiKQez5uAhOfb0Hr/M0A==
+home-assistant-js-websocket@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-4.3.1.tgz#be320672b070cb4fcae2f1709a0eba1845ef7b31"
+  integrity sha512-eVIRdisSmcIzYKNSgB3gqUCrZpQkSUKlluYTsM0NqpUc4W0hHmF2vd8bShl3URWJXPOI5XPdeHuAPPqc0gUj+Q==
 
 homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
   version "1.0.3"